From cef124ee26217c3d9dd43b13327b15ae9ee3d0f2 Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Thu, 31 Jan 2013 13:27:35 +0000
Subject: [PATCH] --- yaml --- r: 360671 b: refs/heads/master c:
 c787c2d62fe0c482f5fb3e5b869cd262fe69b244 h: refs/heads/master i:   360669:
 89b1cbd78b932bb27763998beafa1c174ef49aed   360667:
 f5396beae02dbd72ba2fdb125d2b02c315c268c0   360663:
 160636a95535d683f312ed31395659a7f0869983   360655:
 598b75a1c70d5ce1a1f91c801d2bfb9bace4ea46   360639:
 ad8a9e7946c652389ec9a2a9fa2bed4fd25a964a v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/metag/include/asm/metag_regs.h |  4 +++
 trunk/arch/metag/kernel/setup.c           | 34 ++++++++++++++++++-----
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 693ff47b16fd..b4a8d547e7d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82f0167aa4c4bbc06b5a2e1e83d252792f7c5754
+refs/heads/master: c787c2d62fe0c482f5fb3e5b869cd262fe69b244
diff --git a/trunk/arch/metag/include/asm/metag_regs.h b/trunk/arch/metag/include/asm/metag_regs.h
index 022fcad768f7..acf4b8e6e9d1 100644
--- a/trunk/arch/metag/include/asm/metag_regs.h
+++ b/trunk/arch/metag/include/asm/metag_regs.h
@@ -414,6 +414,10 @@
 #define TXPRIVEXT_REGNUM 29
 #define     TXPRIVEXT_COPRO_BITS    0xFF000000 /* Co-processor 0-7 */
 #define     TXPRIVEXT_COPRO_S       24
+#ifndef METAC_1_2
+#define     TXPRIVEXT_TXTIMER_BIT   0x00080000 /* TXTIMER   priv */
+#define     TXPRIVEXT_TRACE_BIT     0x00040000 /* TTEXEC|TTCTRL|GTEXEC */
+#endif
 #define     TXPRIVEXT_TXTRIGGER_BIT 0x00020000 /* TXSTAT|TXMASK|TXPOLL */
 #define     TXPRIVEXT_TXGBLCREG_BIT 0x00010000 /* Global common regs */
 #define     TXPRIVEXT_CBPRIV_BIT    0x00008000 /* Mem i/f dump priv */
diff --git a/trunk/arch/metag/kernel/setup.c b/trunk/arch/metag/kernel/setup.c
index aaebc56270ec..dcb1d6d51ce4 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_regs.h>
 #include <asm/mmu.h>
 #include <asm/mmzone.h>
 #include <asm/processor.h>
@@ -43,18 +44,37 @@
 #include <asm/setup.h>
 #include <asm/traps.h>
 
-/* PRIV protect as many registers as possible. */
-#define DEFAULT_PRIV	0xff0f7f00
-
-/* Enable unaligned access checking. */
-#define UNALIGNED_PRIV	0x00000010
+/* Priv protect as many registers as possible. */
+#define DEFAULT_PRIV	(TXPRIVEXT_COPRO_BITS		| \
+			 TXPRIVEXT_TXTRIGGER_BIT	| \
+			 TXPRIVEXT_TXGBLCREG_BIT	| \
+			 TXPRIVEXT_ILOCK_BIT		| \
+			 TXPRIVEXT_TXITACCYC_BIT	| \
+			 TXPRIVEXT_TXDIVTIME_BIT	| \
+			 TXPRIVEXT_TXAMAREGX_BIT	| \
+			 TXPRIVEXT_TXTIMERI_BIT		| \
+			 TXPRIVEXT_TXSTATUS_BIT		| \
+			 TXPRIVEXT_TXDISABLE_BIT)
+
+/* Meta2 specific bits. */
+#ifdef CONFIG_METAG_META12
+#define META2_PRIV	0
+#else
+#define META2_PRIV	(TXPRIVEXT_TXTIMER_BIT		| \
+			 TXPRIVEXT_TRACE_BIT)
+#endif
 
+/* Unaligned access checking bits. */
 #ifdef CONFIG_METAG_UNALIGNED
-#define PRIV_BITS (DEFAULT_PRIV | UNALIGNED_PRIV)
+#define UNALIGNED_PRIV	TXPRIVEXT_ALIGNREW_BIT
 #else
-#define PRIV_BITS DEFAULT_PRIV
+#define UNALIGNED_PRIV	0
 #endif
 
+#define PRIV_BITS 	(DEFAULT_PRIV			| \
+			 META2_PRIV			| \
+			 UNALIGNED_PRIV)
+
 extern char _heap_start[];
 
 #ifdef CONFIG_METAG_BUILTIN_DTB