Re: [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume

[Laura Abbott]

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: ff80085db280 
(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 

Re: [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume

[Will Deacon]

On Tue, Jan 24, 2017 at 03:33:51PM +, 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: ff80085db280 
> > (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 
> 
> Argh, I should have spotted this. :(
> 
> Acked-by: Mark Rutland 
> 
> 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

Re: [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume

[Mark Rutland]

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: ff80085db280 
> (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 

Argh, I should have spotted this. :(

Acked-by: Mark Rutland 

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
> 

[PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume

[Geert Uytterhoeven]

If CONFIG_DEBUG_VIRTUAL=y, during s2ram:

virt_to_phys used for non-linear address: ff80085db280 
(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)
-- 
1.9.1