* [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume
@ 2017-01-24 15:30 Geert Uytterhoeven
2017-01-24 15:33 ` Mark Rutland
2017-01-25 9:30 ` Laura Abbott
0 siblings, 2 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2017-01-24 15:30 UTC (permalink / raw)
To: linux-arm-kernel
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
...
[<ffffff800809abb4>] __virt_to_phys+0x28/0x60
[<ffffff80084a0c38>] psci_system_suspend+0x20/0x44
[<ffffff8008095b28>] cpu_suspend+0x3c/0x68
[<ffffff80084a0b48>] psci_system_suspend_enter+0x18/0x20
[<ffffff80080ea3e0>] suspend_devices_and_enter+0x3f8/0x7e8
[<ffffff80080ead14>] pm_suspend+0x544/0x5f4
Fixes: 1a08e3d9e0ac4577 ("drivers: firmware: psci: Use __pa_symbol for kernel symbol")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
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)
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume
2017-01-24 15:30 [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume Geert Uytterhoeven
@ 2017-01-24 15:33 ` Mark Rutland
2017-01-24 15:58 ` Will Deacon
2017-01-25 9:30 ` Laura Abbott
1 sibling, 1 reply; 4+ messages in thread
From: Mark Rutland @ 2017-01-24 15:33 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 24, 2017 at 04:30:19PM +0100, 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
> ...
> [<ffffff800809abb4>] __virt_to_phys+0x28/0x60
> [<ffffff80084a0c38>] psci_system_suspend+0x20/0x44
> [<ffffff8008095b28>] cpu_suspend+0x3c/0x68
> [<ffffff80084a0b48>] psci_system_suspend_enter+0x18/0x20
> [<ffffff80080ea3e0>] suspend_devices_and_enter+0x3f8/0x7e8
> [<ffffff80080ead14>] pm_suspend+0x544/0x5f4
>
> Fixes: 1a08e3d9e0ac4577 ("drivers: firmware: psci: Use __pa_symbol for kernel symbol")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Argh, I should have spotted this. :(
Acked-by: Mark Rutland <mark.rutland@arm.com>
This should go via the arm64 tree -- Will, could you pick this up?
Thanks,
Mark.
> ---
> 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)
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume
2017-01-24 15:33 ` Mark Rutland
@ 2017-01-24 15:58 ` Will Deacon
0 siblings, 0 replies; 4+ messages in thread
From: Will Deacon @ 2017-01-24 15:58 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 24, 2017 at 03:33:51PM +0000, Mark Rutland wrote:
> On Tue, Jan 24, 2017 at 04:30:19PM +0100, 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
> > ...
> > [<ffffff800809abb4>] __virt_to_phys+0x28/0x60
> > [<ffffff80084a0c38>] psci_system_suspend+0x20/0x44
> > [<ffffff8008095b28>] cpu_suspend+0x3c/0x68
> > [<ffffff80084a0b48>] psci_system_suspend_enter+0x18/0x20
> > [<ffffff80080ea3e0>] suspend_devices_and_enter+0x3f8/0x7e8
> > [<ffffff80080ead14>] pm_suspend+0x544/0x5f4
> >
> > Fixes: 1a08e3d9e0ac4577 ("drivers: firmware: psci: Use __pa_symbol for kernel symbol")
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Argh, I should have spotted this. :(
>
> Acked-by: Mark Rutland <mark.rutland@arm.com>
>
> This should go via the arm64 tree -- Will, could you pick this up?
Yup, I'll queue this along with the other __pa_symbol fix.
Cheers,
Will
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume
2017-01-24 15:30 [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume Geert Uytterhoeven
2017-01-24 15:33 ` Mark Rutland
@ 2017-01-25 9:30 ` Laura Abbott
1 sibling, 0 replies; 4+ messages in thread
From: Laura Abbott @ 2017-01-25 9:30 UTC (permalink / raw)
To: linux-arm-kernel
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
> ...
> [<ffffff800809abb4>] __virt_to_phys+0x28/0x60
> [<ffffff80084a0c38>] psci_system_suspend+0x20/0x44
> [<ffffff8008095b28>] cpu_suspend+0x3c/0x68
> [<ffffff80084a0b48>] psci_system_suspend_enter+0x18/0x20
> [<ffffff80080ea3e0>] suspend_devices_and_enter+0x3f8/0x7e8
> [<ffffff80080ead14>] pm_suspend+0x544/0x5f4
>
> Fixes: 1a08e3d9e0ac4577 ("drivers: firmware: psci: Use __pa_symbol for kernel symbol")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> 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 <labbott@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-25 9:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-24 15:30 [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume Geert Uytterhoeven
2017-01-24 15:33 ` Mark Rutland
2017-01-24 15:58 ` Will Deacon
2017-01-25 9:30 ` Laura Abbott
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).