aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrygorii Strashko <[email protected]>2015-07-31 15:46:18 +0100
committerWill Deacon <[email protected]>2015-08-03 15:38:19 +0100
commit37cf524f9360f9165d67459b7bf795c01824df98 (patch)
treeb70dcfb41e49ee66fe20f02edbe3c15bf6186f3d
parent514f161abcda065914f7ea8954c815eee98074a5 (diff)
ARM: psci: boot_secondary: replace __pa with virt_to_idmap
On some PAE systems (e.g. TI Keystone), memory is above the 32-bit addressable limit, and the interconnect provides an aliased view of parts of physical memory in the 32-bit addressable space. This alias is strictly for boot time usage, and is not otherwise usable because of coherency limitations. In this case, virt_to_phys(secondary_startup) would return the physical address of the secondary CPU boot entry point, but on such systems, this would be above the 4GB limit. A separate function, virt_to_idmap(), has been provided to return a usable physical address for functions in the identity mapping, and this must be used in preference to virt_to_phys() or __pa() to find the physical entry point for functions in the identity mapping range. For other systems, virt_to_idmap() and virt_to_phys() return identical physical addresses. Acked-by: Santosh Shilimkar <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Tested-by Vitaly Andrianov <[email protected]> Signed-off-by: Grygorii Strashko <[email protected]> [Mark: apply rmk's suggested rewording] Signed-off-by: Mark Rutland <[email protected]> Cc: Russell King <[email protected]> Signed-off-by: Will Deacon <[email protected]>
-rw-r--r--arch/arm/kernel/psci_smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c
index 28a1db4da704..244aaddfbfda 100644
--- a/arch/arm/kernel/psci_smp.c
+++ b/arch/arm/kernel/psci_smp.c
@@ -51,7 +51,7 @@ static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
if (psci_ops.cpu_on)
return psci_ops.cpu_on(cpu_logical_map(cpu),
- __pa(secondary_startup));
+ virt_to_idmap(&secondary_startup));
return -ENODEV;
}