Skip to contentSkip to conversation

Patch "ARM: mvebu: use __pa_symbol in the mv98dx3236 platform SMP code" has been added to the 4.12-stable tree

PATCH [email protected] 1 participant 1 message Aug 7, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

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

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     arm-mvebu-use-__pa_symbol-in-the-mv98dx3236-platform-smp-code.patch

and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 76127d6fe00062bddb25515d8a4f44633c41fe14 Mon Sep 17 00:00:00 2001

From: Gregory CLEMENT <[email protected]>
Date: Fri, 7 Jul 2017 09:59:28 +0200
Subject: ARM: mvebu: use __pa_symbol in the mv98dx3236 platform SMP code

From: Gregory CLEMENT <[email protected]>

commit 76127d6fe00062bddb25515d8a4f44633c41fe14 upstream.

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")
---
 arch/arm/mach-mvebu/platsmp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-mvebu/platsmp.c +1 -1
@@ -211,7 +211,7 @@ static int mv98dx3236_resume_set_cpu_boo
 		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);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/arm-mvebu-use-__pa_symbol-in-the-mv98dx3236-platform-smp-code.patch queue-4.12/arm-dts-armada-38x-fix-irq-type-for-pca955.patch queue-4.12/arm64-dts-marvell-armada-37xx-fix-the-number-of-gpio-on-south-bridge.patch