Arm FF-A fix for v7.0

Fix removing the vm_id argument from ffa_rxtx_unmap(), as the FF-A
 specification mandates this field be zero in all contexts except a
 non-secure physical FF-A instance, where the ID is inherently 0.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEunHlEgbzHrJD3ZPhAEG6vDF+4pgFAmm5AUcACgkQAEG6vDF+
 4piAGQ//VXwuSykQ6bwTP2GgfJY3SqJK7rDsyqlyZ0klUqlNTHasip1CPpnZ2sN6
 PYPiiz9yD75EVEF46DPctND8fLyjZQrVPuHC2rzF8UdF+ddN/rPrS2NNuBHua4rw
 NE3Hh0tLUQ9nTUdrOaWhXkMNIuvQiW55cg7/vzstULqJoMtqKSO+GKyvPGyn99cA
 fG+z0WKVOSDs5yp4DSi2BNbXMwmKlV9k+Kzu1oOiRM0RNqxpgiewuaLNnu438itN
 +rkbbDOzIeo7W6ZFsiXNBSDhp0J75kGDGfvbpFCekPFqb/PvAG8cJRAn+IL4zWRd
 zh+95lJTTzuizl0d0bFpYW9Lndp1wYJGA1ja/bolsdPxBPG04bKUV2iv83NWzEr4
 eiqcIAgiaYE3Vm0N8qtftrV4Jw4blaBoCaGvFui80pPAkrLj44/0vsF/YUjZtGhJ
 Sf87LIIrid/1FzGyKR0pP/t/P4Cj9/14seVCZDdmxHCFfRSCeMpEbOVbIrNDT1nf
 KxeMFTzzxmkHDYNlUZekyaesYGw8ZKDiVqRzu652aQ8ZZI9/o917ZEdQks5WfC5y
 6mz+7nPA6AhMOKp2itJ5Nc0Co7pJBfYg59cLXNQaj9vqbk7PH6/FGUTFKvnOA0Y9
 6HuCODAWzCasmVk3h9K+DK60Hm0jamgoGBcVDMHGyCp+qSK0JYc=
 =WsMV
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmm6ox0ACgkQmmx57+YA
 GNkTtQ//XY2A8qrCnC3Eo4YZN/X39bLcZpt8QyRPXpnle8B+fg8mYtIu58u+ACms
 xfqMW36+RioW30KrpfZahWEikgtZPIz8o0PxgtvaZSqCXb+puDz0TdWdEItTENR0
 bmG5JKE/Y2Mtn4gK81jSxu7wQTtR5ob5r1avKpn7W5cYYxy7F7cYfEzJj4jxccXu
 23tgxINITMAi+35iiLQFDAuf7687fJmptfC0GlyiHWH/gVJSh1LFlW8YrNbyQXc6
 liT06uwQyFBiib1z/zIpfB0QdqXJ/R/162p9bm2iupofUUS1ybOEvhB/KxVw/3H0
 YRJS0ToOuR0pyYPgHrNcbF5dHeyUFbaal0enZH153xS0av9mUVe5gM1nROYd8hQt
 f+iHZQ1MaTw4Th6TCj2g/RFlacH1jAdsRSz19Pf6yV9PgpFPs8Q/BcgiKzNGXkZG
 nyNviHfdya3xDM5yMOEXF8yxTAMlG+4KZwiJQG8bjx1HuioXTbLqndZT/Tt1O0Om
 62W+G4/Ifb7JPiPUW9atzWE7t2vv93gvsbQ6ztIBsPz35bybfIj3/XvV5X1lgcCi
 XiNcKyPFVDJiYUPK5oPZzWllLlgE+VQ1ChXz+Q4rgKYfVN77TOlnlFDQNpSg0wln
 Txi4wXFmEnn/qagPrIanUKPOJ07KR9kLHTldLRBY+CPZlQdyzwc=
 =XQHV
 -----END PGP SIGNATURE-----

Merge tag 'ffa-fix-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes

Arm FF-A fix for v7.0

Fix removing the vm_id argument from ffa_rxtx_unmap(), as the FF-A
specification mandates this field be zero in all contexts except a
non-secure physical FF-A instance, where the ID is inherently 0.

* tag 'ffa-fix-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_ffa: Remove vm_id argument in ffa_rxtx_unmap()

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-03-18 14:05:30 +01:00
commit dfc80d650b

View File

@ -205,12 +205,12 @@ static int ffa_rxtx_map(phys_addr_t tx_buf, phys_addr_t rx_buf, u32 pg_cnt)
return 0;
}
static int ffa_rxtx_unmap(u16 vm_id)
static int ffa_rxtx_unmap(void)
{
ffa_value_t ret;
invoke_ffa_fn((ffa_value_t){
.a0 = FFA_RXTX_UNMAP, .a1 = PACK_TARGET_INFO(vm_id, 0),
.a0 = FFA_RXTX_UNMAP,
}, &ret);
if (ret.a0 == FFA_ERROR)
@ -2097,7 +2097,7 @@ static int __init ffa_init(void)
pr_err("failed to setup partitions\n");
ffa_notifications_cleanup();
ffa_rxtx_unmap(drv_info->vm_id);
ffa_rxtx_unmap();
free_pages:
if (drv_info->tx_buffer)
free_pages_exact(drv_info->tx_buffer, rxtx_bufsz);
@ -2112,7 +2112,7 @@ static void __exit ffa_exit(void)
{
ffa_notifications_cleanup();
ffa_partitions_cleanup();
ffa_rxtx_unmap(drv_info->vm_id);
ffa_rxtx_unmap();
free_pages_exact(drv_info->tx_buffer, drv_info->rxtx_bufsz);
free_pages_exact(drv_info->rx_buffer, drv_info->rxtx_bufsz);
kfree(drv_info);