ARM: mvebu: use __pa_symbol in the mv98dx3236 platform SMP code

As we already did for Armada XP switch from virt_to_phys() to __pa_symbol().

The reason for it was well explained by Mark Rutland so let's quote him:

"virt_to_phys() is intended to operate on the linear/direct mapping of RAM.

__pa_symbol() is intended to operate on the kernel mapping, which may not be in the linear/direct mapping on all architectures. e.g. arm64 and x86_64 map the kernel image and RAM separately.

On 32-bit ARM the kernel image mapping is tied to the linear/direct mapping, so that works, but as it's semantically wrong (and broken for generic code), the DEBUG_VIRTUAL checks complain."

Fixes db88977894ab ("arm: mvebu: support for SMP on 98DX3336 SoC")

Cc <[email protected]>

Signed-off-by Gregory CLEMENT <[email protected]>

---

Hi Chris,

with this patch I don't expect any regression, hover it would be nice if you can test it.

Thanks,

Gregory

 arch/arm/mach-mvebu/platsmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-mvebu/platsmp.c +1 -1

index e62273aacb43..4ffbbd217e82 100644
@@ -211,7 +211,7 @@ static int mv98dx3236_resume_set_cpu_boot_addr(int hw_cpu, void *boot_addr)
 		return PTR_ERR(base);
 
 	writel(0, base + MV98DX3236_CPU_RESUME_CTRL_REG);
-	writel(virt_to_phys(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG);
+	writel(__pa_symbol(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG);
 
 	iounmap(base);
 

Signature · 1 line

2.13.2

Hi Florian,

I forgot to CC you on this patch.

Gregory

Quoted 19 lines · Gregory CLEMENT

As we already did for Armada XP switch from virt_to_phys() to __pa_symbol().

The reason for it was well explained by Mark Rutland so let's quote him:

"virt_to_phys() is intended to operate on the linear/direct mapping of RAM.

__pa_symbol() is intended to operate on the kernel mapping, which may not be in the linear/direct mapping on all architectures. e.g. arm64 and x86_64 map the kernel image and RAM separately.

On 32-bit ARM the kernel image mapping is tied to the linear/direct mapping, so that works, but as it's semantically wrong (and broken for generic code), the DEBUG_VIRTUAL checks complain."

Fixes db88977894ab ("arm: mvebu: support for SMP on 98DX3336 SoC")

Cc <[email protected]>

Signed-off-by Gregory CLEMENT <[email protected]>

As we already did for Armada XP switch from virt_to_phys() to __pa_symbol().

The reason for it was well explained by Mark Rutland so let's quote him:

"virt_to_phys() is intended to operate on the linear/direct mapping of RAM.

__pa_symbol() is intended to operate on the kernel mapping, which may not be in the linear/direct mapping on all architectures. e.g. arm64 and x86_64 map the kernel image and RAM separately.

On 32-bit ARM the kernel image mapping is tied to the linear/direct mapping, so that works, but as it's semantically wrong (and broken for generic code), the DEBUG_VIRTUAL checks complain."

Fixes db88977894ab ("arm: mvebu: support for SMP on 98DX3336 SoC")

Cc <[email protected]>

Signed-off-by Gregory CLEMENT <[email protected]>

---

Hi Chris,

with this patch I don't expect any regression, hover it would be nice if you can test it.

As we already did for Armada XP switch from virt_to_phys() to __pa_symbol().

The reason for it was well explained by Mark Rutland so let's quote him:

"virt_to_phys() is intended to operate on the linear/direct mapping of RAM.

__pa_symbol() is intended to operate on the kernel mapping, which may not be in the linear/direct mapping on all architectures. e.g. arm64 and x86_64 map the kernel image and RAM separately.

On 32-bit ARM the kernel image mapping is tied to the linear/direct mapping, so that works, but as it's semantically wrong (and broken for generic code), the DEBUG_VIRTUAL checks complain."

Fixes db88977894ab ("arm: mvebu: support for SMP on 98DX3336 SoC")

Cc <[email protected]>

Signed-off-by Gregory CLEMENT <[email protected]>

---

Hi Chris,

with this patch I don't expect any regression, hover it would be nice if you can test it.

Thanks,

Gregory

 arch/arm/mach-mvebu/platsmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-mvebu/platsmp.c +1 -1

index e62273aacb43..4ffbbd217e82 100644
@@ -211,7 +211,7 @@ static int mv98dx3236_resume_set_cpu_boot_addr(int hw_cpu, void *boot_addr)
 		return PTR_ERR(base);
 
 	writel(0, base + MV98DX3236_CPU_RESUME_CTRL_REG);
-	writel(virt_to_phys(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG);
+	writel(__pa_symbol(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG);
 
 	iounmap(base);
 

Signature · 1 line

2.13.2