Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64fc2a94 authored by Florian Fainelli's avatar Florian Fainelli Committed by Russell King
Browse files

ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol 



All low-level PM/SMP code using virt_to_phys() should actually use
__pa_symbol() against kernel symbols. Update code where relevant to move
away from virt_to_phys().

Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e377cd82

arch/arm/common/mcpm_entry.c

+6 −6
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ extern unsigned long mcpm_entry_vectors[MAX_NR_CLUSTERS][MAX_CPUS_PER_CLUSTER]; 


void mcpm_set_entry_vector(unsigned cpu, unsigned cluster, void *ptr)

{

	unsigned long val = ptr ? virt_to_phys(ptr) : 0;

	unsigned long val = ptr ? __pa_symbol(ptr) : 0;

	mcpm_entry_vectors[cluster][cpu] = val;

	sync_cache_w(&mcpm_entry_vectors[cluster][cpu]);

}
@@ -299,8 +299,8 @@ void mcpm_cpu_power_down(void) 
	 * the kernel as if the power_up method just had deasserted reset

	 * on the CPU.

	 */

	phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);

	phys_reset(virt_to_phys(mcpm_entry_point));

	phys_reset = (phys_reset_t)(unsigned long)__pa_symbol(cpu_reset);

	phys_reset(__pa_symbol(mcpm_entry_point));



	/* should never get here */

	BUG();
@@ -388,8 +388,8 @@ static int __init nocache_trampoline(unsigned long _arg) 
	__mcpm_outbound_leave_critical(cluster, CLUSTER_DOWN);

	__mcpm_cpu_down(cpu, cluster);



	phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);

	phys_reset(virt_to_phys(mcpm_entry_point));

	phys_reset = (phys_reset_t)(unsigned long)__pa_symbol(cpu_reset);

	phys_reset(__pa_symbol(mcpm_entry_point));

	BUG();

}
@@ -449,7 +449,7 @@ int __init mcpm_sync_init( 
	sync_cache_w(&mcpm_sync);



	if (power_up_setup) {

		mcpm_power_up_setup_phys = virt_to_phys(power_up_setup);

		mcpm_power_up_setup_phys = __pa_symbol(power_up_setup);

		sync_cache_w(&mcpm_power_up_setup_phys);

	}

arch/arm/mach-alpine/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static int alpine_boot_secondary(unsigned int cpu, struct task_struct *idle) 
{

	phys_addr_t addr;



	addr = virt_to_phys(secondary_startup);

	addr = __pa_symbol(secondary_startup);



	if (addr > (phys_addr_t)(uint32_t)(-1)) {

		pr_err("FAIL: resume address over 32bit (%pa)", &addr);

arch/arm/mach-axxia/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
static void write_release_addr(u32 release_phys)

{

	u32 *virt = (u32 *) phys_to_virt(release_phys);

	writel_relaxed(virt_to_phys(secondary_startup), virt);

	writel_relaxed(__pa_symbol(secondary_startup), virt);

	/* Make sure this store is visible to other CPUs */

	smp_wmb();

	__cpuc_flush_dcache_area(virt, sizeof(u32));

arch/arm/mach-bcm/bcm63xx_smp.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int bcm63138_smp_boot_secondary(unsigned int cpu, 
	}



	/* Write the secondary init routine to the BootLUT reset vector */

	val = virt_to_phys(secondary_startup);

	val = __pa_symbol(secondary_startup);

	writel_relaxed(val, bootlut_base + BOOTLUT_RESET_VECT);



	/* Power up the core, will jump straight to its reset vector when we

arch/arm/mach-bcm/platsmp-brcmstb.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static void brcmstb_cpu_boot(u32 cpu) 
	 * Set the reset vector to point to the secondary_startup

	 * routine

	 */

	cpu_set_boot_addr(cpu, virt_to_phys(secondary_startup));

	cpu_set_boot_addr(cpu, __pa_symbol(secondary_startup));



	/* Unhalt the cpu */

	cpu_rst_cfg_set(cpu, 0);