drivers: firmware: psci: Use __pa_symbol for kernel symbol

labbott · wildea01 · commit 1a08e3d9e0ac · 2017-01-11T13:56:50.000Z
__pa_symbol is technically the macro that should be used for kernel
symbols. Switch to this as a pre-requisite for DEBUG_VIRTUAL which
will do bounds checking.

Reviewed-by: Mark Rutland &lt;mark.rutland@arm.com&gt;
Tested-by: Mark Rutland &lt;mark.rutland@arm.com&gt;
Signed-off-by: Laura Abbott &lt;labbott@redhat.com&gt;
Signed-off-by: Will Deacon &lt;will.deacon@arm.com&gt;
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
@@ -383,7 +383,7 @@ static int psci_suspend_finisher(unsigned long index)
 	u32 *state = __this_cpu_read(psci_power_state);
 
 	return psci_ops.cpu_suspend(state[index - 1],
-				    virt_to_phys(cpu_resume));
+				    __pa_symbol(cpu_resume));
 }
 
 int psci_cpu_suspend_enter(unsigned long index)

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ static int psci_suspend_finisher(unsigned long index)`
`383`	`383`	`u32 *state = __this_cpu_read(psci_power_state);`
`384`	`384`
`385`	`385`	`return psci_ops.cpu_suspend(state[index - 1],`
`386`		`- virt_to_phys(cpu_resume));`
	`386`	`+ __pa_symbol(cpu_resume));`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`int psci_cpu_suspend_enter(unsigned long index)`