]> www.infradead.org Git - nvme.git/commitdiff
firmware: psci: Fix return value from psci_system_suspend()
authorSudeep Holla <sudeep.holla@arm.com>
Wed, 15 May 2024 09:55:28 +0000 (10:55 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2024 20:58:40 +0000 (22:58 +0200)
Currently we return the value from invoke_psci_fn() directly as return
value from psci_system_suspend(). It is wrong to send the PSCI interface
return value directly. psci_to_linux_errno() provide the mapping from
PSCI return value to the one that can be returned to the callers within
the kernel.

Use psci_to_linux_errno() to convert and return the correct value from
psci_system_suspend().

Fixes: faf7ec4a92c0 ("drivers: firmware: psci: add system suspend support")
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Link: https://lore.kernel.org/r/20240515095528.1949992-1-sudeep.holla@arm.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/firmware/psci/psci.c

index d9629ff8786199c33500b154616584013c8d1d1e..2328ca58bba61fdb677ac20a1a7447882cd0cf22 100644 (file)
@@ -497,10 +497,12 @@ int psci_cpu_suspend_enter(u32 state)
 
 static int psci_system_suspend(unsigned long unused)
 {
+       int err;
        phys_addr_t pa_cpu_resume = __pa_symbol(cpu_resume);
 
-       return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
+       err = invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
                              pa_cpu_resume, 0, 0);
+       return psci_to_linux_errno(err);
 }
 
 static int psci_system_suspend_enter(suspend_state_t state)