[PATCH 1/2] ARM: tegra: use setup_mm_for_reboot rather than explicit pgd switch

[PATCH 1/2] ARM: tegra: use setup_mm_for_reboot rather than explicit pgd switch

[Will Deacon]

This patch changes the Tegra PM code to use the setup_mm_for_reboot
helper rather than call cpu_switch_mm directly. This keeps things like
TLB invalidation in one place.

Cc: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
Signed-off-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
---
 arch/arm/mach-tegra/pm.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index 523604d..a77ed48 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -183,12 +183,7 @@ bool tegra_set_cpu_in_lp2(int phy_cpu_id)
 
 static int tegra_sleep_cpu(unsigned long v2p)
 {
-	/* Switch to the identity mapping. */
-	cpu_switch_mm(idmap_pgd, &init_mm);
-
-	/* Flush the TLB. */
-	local_flush_tlb_all();
-
+	setup_mm_for_reboot();
 	tegra_sleep_cpu_finish(v2p);
 
 	/* should never here */
-- 
1.8.0

[PATCH 2/2] ARM: tegra: use CS_LAR_KEY definition instead of 0xC5ACCE55

[Will Deacon]

When enabling coresight on secondary cores for tegra, make use of our
fancy new definition for the magic lock code.

Cc: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
Signed-off-by: Dietmar Eggemann <dietmar.eggemann-5wv7dgnIgG8@public.gmane.org>
Signed-off-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
---
 arch/arm/mach-tegra/headsmp.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-tegra/headsmp.S b/arch/arm/mach-tegra/headsmp.S
index fd473f2..d2747fe 100644
--- a/arch/arm/mach-tegra/headsmp.S
+++ b/arch/arm/mach-tegra/headsmp.S
@@ -1,6 +1,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 
+#include <asm/hardware/coresight.h>
 #include "sleep.h"
 
         .section ".text.head", "ax"
@@ -8,7 +9,7 @@
 ENTRY(tegra_secondary_startup)
         bl      v7_invalidate_l1
 	/* Enable coresight */
-	mov32	r0, 0xC5ACCE55
+	mov32	r0, CS_LAR_KEY
 	mcr	p14, 0, r0, c7, c12, 6
         b       secondary_startup
 ENDPROC(tegra_secondary_startup)
-- 
1.8.0

Re: [PATCH 2/2] ARM: tegra: use CS_LAR_KEY definition instead of 0xC5ACCE55

[Stephen Warren]

On 03/25/2013 12:19 PM, Will Deacon wrote:
> When enabling coresight on secondary cores for tegra, make use of our
> fancy new definition for the magic lock code.

The code you're editing has actually been removed in the 3.10 cycle, so
there's no need for this patch any more.

Re: [PATCH 1/2] ARM: tegra: use setup_mm_for_reboot rather than explicit pgd switch

[Stephen Warren]

On 03/25/2013 12:19 PM, Will Deacon wrote:
> This patch changes the Tegra PM code to use the setup_mm_for_reboot
> helper rather than call cpu_switch_mm directly. This keeps things like
> TLB invalidation in one place.

I've applied this to Tegra's for-3.10/cleanup branch.