The platform core invokes a driver's shutdown callback, rather than its
remove callback, while preparing devices for a normal kexec. Without a
shutdown callback, the FF-A driver leaves notifications, partition devices,
and the RX/TX mapping active before the replacement kernel is booted.

Use ffa_remove() for shutdown so the existing cleanup runs before a normal
kexec and other orderly system shutdowns.

Reported-by: Nat Gurumoorthy <natg@google.com>
Closes: https://lore.kernel.org/all/20260729162731.1383875-1-natg@google.com/
Reported-by: Carol L Soto <csoto@nvidia.com>
Closes: https://lore.kernel.org/all/20260818224404.3694580-1-csoto@nvidia.com
Reported-by: Maxi Saparov <masaparov@coreweave.com>
Closes: https://lore.kernel.org/all/20260826222337.73480-1-maxi.saparov@gmail.com
Signed-off-by: Sudeep Holla <sudeep.holla@kernel.org>
---
 drivers/firmware/arm_ffa/driver.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c
index 0121bd0a7e01..7f42ffe79f22 100644
--- a/drivers/firmware/arm_ffa/driver.c
+++ b/drivers/firmware/arm_ffa/driver.c
@@ -2271,6 +2271,7 @@ static void ffa_remove(struct platform_device *pdev)
 static struct platform_driver ffa_driver = {
 	.probe = ffa_probe,
 	.remove = ffa_remove,
+	.shutdown = ffa_remove,
 	.driver = {
 		.name = FFA_PLATFORM_NAME,
 	},
-- 
2.43.0

On Tue, 01 Sep 2026 14:11:12 +0100, Sudeep Holla wrote:
> The platform core invokes a driver's shutdown callback, rather than its
> remove callback, while preparing devices for a normal kexec. Without a
> shutdown callback, the FF-A driver leaves notifications, partition devices,
> and the RX/TX mapping active before the replacement kernel is booted.
> 
> Use ffa_remove() for shutdown so the existing cleanup runs before a normal
> kexec and other orderly system shutdowns.
> 
> [...]

Applied to sudeep.holla/linux (for-next/ffa/fixes), thanks!

[1/1] firmware: arm_ffa: Tear down driver during shutdown
      https://git.kernel.org/sudeep.holla/c/3bb3e80faf21
-- 
Regards,
Sudeep

On 9/1/26 8:11 AM, Sudeep Holla wrote:
> The platform core invokes a driver's shutdown callback, rather than its
> remove callback, while preparing devices for a normal kexec. Without a
> shutdown callback, the FF-A driver leaves notifications, partition devices,
> and the RX/TX mapping active before the replacement kernel is booted.
>
> Use ffa_remove() for shutdown so the existing cleanup runs before a normal
> kexec and other orderly system shutdowns.
>
> Reported-by: Nat Gurumoorthy <natg@google.com>
> Closes: https://lore.kernel.org/all/20260729162731.1383875-1-natg@google.com/
> Reported-by: Carol L Soto <csoto@nvidia.com>
> Closes: https://lore.kernel.org/all/20260818224404.3694580-1-csoto@nvidia.com
> Reported-by: Maxi Saparov <masaparov@coreweave.com>
> Closes: https://lore.kernel.org/all/20260826222337.73480-1-maxi.saparov@gmail.com
> Signed-off-by: Sudeep Holla <sudeep.holla@kernel.org>
> ---
>   drivers/firmware/arm_ffa/driver.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c
> index 0121bd0a7e01..7f42ffe79f22 100644
> --- a/drivers/firmware/arm_ffa/driver.c
> +++ b/drivers/firmware/arm_ffa/driver.c
> @@ -2271,6 +2271,7 @@ static void ffa_remove(struct platform_device *pdev)
>   static struct platform_driver ffa_driver = {
>   	.probe = ffa_probe,
>   	.remove = ffa_remove,
> +	.shutdown = ffa_remove,
>   	.driver = {
>   		.name = FFA_PLATFORM_NAME,
>   	},

Thanks, I tested this solution and it works for me.
Tested-by: Carol L Soto <csoto@nvidia.com>