From 5f2df68e112c5f704b6825c6f7fdddb786494759 Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Thu, 31 Jan 2013 13:42:03 +0000
Subject: [PATCH] --- yaml --- r: 360672 b: refs/heads/master c:
 3d6b7bb0a2c518d24bc3036f9bbb6f3fb35462c3 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/metag/include/asm/processor.h |  2 +-
 trunk/arch/metag/kernel/setup.c          | 45 +++++++++++++++++++++---
 trunk/arch/metag/kernel/smp.c            |  2 +-
 4 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b4a8d547e7d9..070ae206ff91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c787c2d62fe0c482f5fb3e5b869cd262fe69b244
+refs/heads/master: 3d6b7bb0a2c518d24bc3036f9bbb6f3fb35462c3
diff --git a/trunk/arch/metag/include/asm/processor.h b/trunk/arch/metag/include/asm/processor.h
index b7e25289f3a3..9b029a7911c3 100644
--- a/trunk/arch/metag/include/asm/processor.h
+++ b/trunk/arch/metag/include/asm/processor.h
@@ -154,7 +154,7 @@ unsigned long get_wchan(struct task_struct *p);
 
 #define cpu_relax()     barrier()
 
-extern void setup_txprivext(void);
+extern void setup_priv(void);
 
 static inline unsigned int hard_processor_id(void)
 {
diff --git a/trunk/arch/metag/kernel/setup.c b/trunk/arch/metag/kernel/setup.c
index dcb1d6d51ce4..9803ca4f6510 100644
--- a/trunk/arch/metag/kernel/setup.c
+++ b/trunk/arch/metag/kernel/setup.c
@@ -35,6 +35,7 @@
 #include <asm/hwthread.h>
 #include <asm/l2cache.h>
 #include <asm/mach/arch.h>
+#include <asm/metag_mem.h>
 #include <asm/metag_regs.h>
 #include <asm/mmu.h>
 #include <asm/mmzone.h>
@@ -75,6 +76,32 @@
 			 META2_PRIV			| \
 			 UNALIGNED_PRIV)
 
+/*
+ * Protect access to:
+ * 0x06000000-0x07ffffff Direct mapped region
+ * 0x05000000-0x05ffffff MMU table region (Meta1)
+ * 0x04400000-0x047fffff Cache flush region
+ * 0x84000000-0x87ffffff Core cache memory region (Meta2)
+ *
+ * Allow access to:
+ * 0x80000000-0x81ffffff Core code memory region (Meta2)
+ */
+#ifdef CONFIG_METAG_META12
+#define PRIVSYSR_BITS	TXPRIVSYSR_ALL_BITS
+#else
+#define PRIVSYSR_BITS	(TXPRIVSYSR_ALL_BITS & ~TXPRIVSYSR_CORECODE_BIT)
+#endif
+
+/* Protect all 0x02xxxxxx and 0x048xxxxx. */
+#define PIOREG_BITS	0xffffffff
+
+/*
+ * Protect all 0x04000xx0 (system events)
+ * except write combiner flush and write fence (system events 4 and 5).
+ */
+#define PSYREG_BITS	0xfffffffb
+
+
 extern char _heap_start[];
 
 #ifdef CONFIG_METAG_BUILTIN_DTB
@@ -371,7 +398,7 @@ void __init setup_arch(char **cmdline_p)
 
 	paging_init(heap_end);
 
-	setup_txprivext();
+	setup_priv();
 
 	/* Setup the boot cpu's mapping. The rest will be setup below. */
 	cpu_2_hwthread_id[smp_processor_id()] = hard_processor_id();
@@ -531,13 +558,21 @@ void __init metag_start_kernel(char *args)
 	start_kernel();
 }
 
-/*
- * Setup TXPRIVEXT register to be prevent userland from touching our
- * precious registers.
+/**
+ * setup_priv() - Set up privilege protection registers.
+ *
+ * Set up privilege protection registers such as TXPRIVEXT to prevent userland
+ * from touching our precious registers and sensitive memory areas.
  */
-void setup_txprivext(void)
+void setup_priv(void)
 {
+	unsigned int offset = hard_processor_id() << TXPRIVREG_STRIDE_S;
+
 	__core_reg_set(TXPRIVEXT, PRIV_BITS);
+
+	metag_out32(PRIVSYSR_BITS, T0PRIVSYSR + offset);
+	metag_out32(PIOREG_BITS,   T0PIOREG   + offset);
+	metag_out32(PSYREG_BITS,   T0PSYREG   + offset);
 }
 
 PTBI pTBI_get(unsigned int cpu)
diff --git a/trunk/arch/metag/kernel/smp.c b/trunk/arch/metag/kernel/smp.c
index d1163127eb68..4b6d1f14df32 100644
--- a/trunk/arch/metag/kernel/smp.c
+++ b/trunk/arch/metag/kernel/smp.c
@@ -268,7 +268,7 @@ asmlinkage void secondary_start_kernel(void)
 
 	preempt_disable();
 
-	setup_txprivext();
+	setup_priv();
 
 	/*
 	 * Enable local interrupts.