From mboxrd@z Thu Jan 1 00:00:00 1970 From: labbott@redhat.com (Laura Abbott) Date: Wed, 25 Jan 2017 10:30:16 +0100 Subject: [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume In-Reply-To: <1485271819-2977-1-git-send-email-geert+renesas@glider.be> References: <1485271819-2977-1-git-send-email-geert+renesas@glider.be> Message-ID: <7231fdec-7582-b330-fa8d-db194effa622@redhat.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 01/24/2017 04:30 PM, Geert Uytterhoeven wrote: > If CONFIG_DEBUG_VIRTUAL=y, during s2ram: > > virt_to_phys used for non-linear address: ffffff80085db280 (cpu_resume+0x0/0x20) > ------------[ cut here ]------------ > WARNING: CPU: 0 PID: 1628 at arch/arm64/mm/physaddr.c:14 __virt_to_phys+0x28/0x60 > ... > [] __virt_to_phys+0x28/0x60 > [] psci_system_suspend+0x20/0x44 > [] cpu_suspend+0x3c/0x68 > [] psci_system_suspend_enter+0x18/0x20 > [] suspend_devices_and_enter+0x3f8/0x7e8 > [] pm_suspend+0x544/0x5f4 > > Fixes: 1a08e3d9e0ac4577 ("drivers: firmware: psci: Use __pa_symbol for kernel symbol") > Signed-off-by: Geert Uytterhoeven > --- > drivers/firmware/psci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c > index 66a8793f3b3793ff..493a56a4cfc4a836 100644 > --- a/drivers/firmware/psci.c > +++ b/drivers/firmware/psci.c > @@ -419,7 +419,7 @@ int psci_cpu_suspend_enter(unsigned long index) > static int psci_system_suspend(unsigned long unused) > { > return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND), > - virt_to_phys(cpu_resume), 0, 0); > + __pa_symbol(cpu_resume), 0, 0); > } > > static int psci_system_suspend_enter(suspend_state_t state) > (thought I sent this yesterday but SMTP was not set correctly) Acked-by: Laura Abbott