2 files changed, 83 insertions, 6 deletions
diff --git a/include/asm-frv/spr-regs.h b/include/asm-frv/spr-regs.h
index ef472f058d9c..c2a541ef828d 100644
--- a/include/asm-frv/spr-regs.h
+++ b/include/asm-frv/spr-regs.h
@@ -98,6 +98,7 @@
 #define TBR_TT_TRAP0            (0x80 << 4)
 #define TBR_TT_TRAP1            (0x81 << 4)
 #define TBR_TT_TRAP2            (0x82 << 4)
+#define TBR_TT_TRAP3            (0x83 << 4)
 #define TBR_TT_TRAP126          (0xfe << 4)
 #define TBR_TT_BREAK            (0xff << 4)
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index d2aea70a5f64..f72ff0c4dc0b 100644
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
@@ -40,8 +40,84 @@ do {									\
 /*
 * interrupt flag manipulation
+ * - use virtual interrupt management since touching the PSR is slow
+ *   - ICC2.Z: T if interrupts virtually disabled
+ *   - ICC2.C: F if interrupts really disabled
+ * - if Z==1 upon interrupt:
+ *   - C is set to 0
+ *   - interrupts are really disabled
+ *   - entry.S returns immediately
+ * - uses TIHI (TRAP if Z==0 && C==0) #2 to really reenable interrupts
+ *   - if taken, the trap:
+ *     - sets ICC2.C
+ *     - enables interrupts
 */
-#define local_irq_disable()                             \
+#define local_irq_disable()                                     \
+do {                                                            \
+        /* set Z flag, but don't change the C flag */           \
+        asm volatile("  andcc   gr0,gr0,gr0,icc2        \n"     \
+                     :                                          \
+                     :                                          \
+                     : "memory", "icc2"                         \
+                     );                                         \
+} while(0)
+#define local_irq_enable()                                      \
+do {                                                            \
+        /* clear Z flag and then test the C flag */             \
+        asm volatile("  oricc   gr0,#1,gr0,icc2         \n"     \
+                     "  tihi    icc2,gr0,#2             \n"     \
+                     :                                          \
+                     :                                          \
+                     : "memory", "icc2"                         \
+                     );                                         \
+} while(0)
+#define local_save_flags(flags)                                 \
+do {                                                            \
+        typecheck(unsigned long, flags);                        \
+        asm volatile("movsg ccr,%0"                             \
+                     : "=r"(flags)                              \
+                     :                                          \
+                     : "memory");                               \
+                                                                \
+        /* shift ICC2.Z to bit 0 */                             \
+        flags >>= 26;                                           \
+                                                                \
+        /* make flags 1 if interrupts disabled, 0 otherwise */  \
+        flags &= 1UL;                                           \
+} while(0)
+#define irqs_disabled() \
+        ({unsigned long flags; local_save_flags(flags); flags; })
+#define local_irq_save(flags)                   \
+do {                                            \
+        typecheck(unsigned long, flags);        \
+        local_save_flags(flags);                \
+        local_irq_disable();                    \
+} while(0)
+#define local_irq_restore(flags)                                        \
+do {                                                                    \
+        typecheck(unsigned long, flags);                                \
+                                                                        \
+        /* load the Z flag by turning 1 if disabled into 0 if disabled  \
+         * and thus setting the Z flag but not the C flag */            \
+        asm volatile("  xoricc  %0,#1,gr0,icc2          \n"             \
+                     /* then test Z=0 and C=0 */                        \
+                     "  tihi    icc2,gr0,#2             \n"             \
+                     :                                                  \
+                     : "r"(flags)                                       \
+                     : "memory", "icc2"                                 \
+                     );                                                 \
+                                                                        \
+} while(0)
+/*
+ * real interrupt flag manipulation
+ */
+#define __local_irq_disable()                           \
 do {                                                    \
        unsigned long psr;                              \
        asm volatile("  movsg   psr,%0          \n"     \
@@ -53,7 +129,7 @@ do {							\
                     : "memory");                       \
 } while(0)
-#define local_irq_enable()                              \
+#define __local_irq_enable()                            \
 do {                                                    \
        unsigned long psr;                              \
        asm volatile("  movsg   psr,%0          \n"     \
@@ -64,7 +140,7 @@ do {							\
                     : "memory");                       \
 } while(0)
-#define local_save_flags(flags)                 \
+#define __local_save_flags(flags)               \
 do {                                            \
        typecheck(unsigned long, flags);        \
        asm("movsg psr,%0"                      \
@@ -73,7 +149,7 @@ do {						\
            : "memory");                        \
 } while(0)
-#define local_irq_save(flags)                           \
+#define __local_irq_save(flags)                         \
 do {                                                    \
        unsigned long npsr;                             \
        typecheck(unsigned long, flags);                \
@@ -86,7 +162,7 @@ do {							\
                     : "memory");                       \
 } while(0)
-#define local_irq_restore(flags)                        \
+#define __local_irq_restore(flags)                      \
 do {                                                    \
        typecheck(unsigned long, flags);                \
        asm volatile("  movgs   %0,psr          \n"     \
@@ -95,7 +171,7 @@ do {							\
                     : "memory");                       \
 } while(0)
-#define irqs_disabled() \
+#define __irqs_disabled() \
        ((__get_PSR() & PSR_PIL) >= PSR_PIL_14)
 /*

diff --git a/include/asm-frv/spr-regs.h b/include/asm-frv/spr-regs.h index ef472f058d9c..c2a541ef828d 100644 --- a/include/asm-frv/spr-regs.h +++ b/include/asm-frv/spr-regs.h
@@ -98,6 +98,7 @@
98	#define TBR_TT_TRAP0 (0x80 << 4)	98	#define TBR_TT_TRAP0 (0x80 << 4)
99	#define TBR_TT_TRAP1 (0x81 << 4)	99	#define TBR_TT_TRAP1 (0x81 << 4)
100	#define TBR_TT_TRAP2 (0x82 << 4)	100	#define TBR_TT_TRAP2 (0x82 << 4)
		101	#define TBR_TT_TRAP3 (0x83 << 4)
101	#define TBR_TT_TRAP126 (0xfe << 4)	102	#define TBR_TT_TRAP126 (0xfe << 4)
102	#define TBR_TT_BREAK (0xff << 4)	103	#define TBR_TT_BREAK (0xff << 4)
103		104


diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h index d2aea70a5f64..f72ff0c4dc0b 100644 --- a/include/asm-frv/system.h +++ b/include/asm-frv/system.h
@@ -40,8 +40,84 @@ do { \
40		40
41	/*	41	/*
42	* interrupt flag manipulation	42	* interrupt flag manipulation
		43	* - use virtual interrupt management since touching the PSR is slow
		44	* - ICC2.Z: T if interrupts virtually disabled
		45	* - ICC2.C: F if interrupts really disabled
		46	* - if Z==1 upon interrupt:
		47	* - C is set to 0
		48	* - interrupts are really disabled
		49	* - entry.S returns immediately
		50	* - uses TIHI (TRAP if Z==0 && C==0) #2 to really reenable interrupts
		51	* - if taken, the trap:
		52	* - sets ICC2.C
		53	* - enables interrupts
43	*/	54	*/
44	#define local_irq_disable() \	55	#define local_irq_disable() \
		56	do { \
		57	/* set Z flag, but don't change the C flag */ \
		58	asm volatile(" andcc gr0,gr0,gr0,icc2 \n" \
		59	: \
		60	: \
		61	: "memory", "icc2" \
		62	); \
		63	} while(0)
		64
		65	#define local_irq_enable() \
		66	do { \
		67	/* clear Z flag and then test the C flag */ \
		68	asm volatile(" oricc gr0,#1,gr0,icc2 \n" \
		69	" tihi icc2,gr0,#2 \n" \
		70	: \
		71	: \
		72	: "memory", "icc2" \
		73	); \
		74	} while(0)
		75
		76	#define local_save_flags(flags) \
		77	do { \
		78	typecheck(unsigned long, flags); \
		79	asm volatile("movsg ccr,%0" \
		80	: "=r"(flags) \
		81	: \
		82	: "memory"); \
		83	\
		84	/* shift ICC2.Z to bit 0 */ \
		85	flags >>= 26; \
		86	\
		87	/* make flags 1 if interrupts disabled, 0 otherwise */ \
		88	flags &= 1UL; \
		89	} while(0)
		90
		91	#define irqs_disabled() \
		92	({unsigned long flags; local_save_flags(flags); flags; })
		93
		94	#define local_irq_save(flags) \
		95	do { \
		96	typecheck(unsigned long, flags); \
		97	local_save_flags(flags); \
		98	local_irq_disable(); \
		99	} while(0)
		100
		101	#define local_irq_restore(flags) \
		102	do { \
		103	typecheck(unsigned long, flags); \
		104	\
		105	/* load the Z flag by turning 1 if disabled into 0 if disabled \
		106	* and thus setting the Z flag but not the C flag */ \
		107	asm volatile(" xoricc %0,#1,gr0,icc2 \n" \
		108	/* then test Z=0 and C=0 */ \
		109	" tihi icc2,gr0,#2 \n" \
		110	: \
		111	: "r"(flags) \
		112	: "memory", "icc2" \
		113	); \
		114	\
		115	} while(0)
		116
		117	/*
		118	* real interrupt flag manipulation
		119	*/
		120	#define __local_irq_disable() \
45	do { \	121	do { \
46	unsigned long psr; \	122	unsigned long psr; \
47	asm volatile(" movsg psr,%0 \n" \	123	asm volatile(" movsg psr,%0 \n" \
@@ -53,7 +129,7 @@ do { \
53	: "memory"); \	129	: "memory"); \
54	} while(0)	130	} while(0)
55		131
56	#define local_irq_enable() \	132	#define __local_irq_enable() \
57	do { \	133	do { \
58	unsigned long psr; \	134	unsigned long psr; \
59	asm volatile(" movsg psr,%0 \n" \	135	asm volatile(" movsg psr,%0 \n" \
@@ -64,7 +140,7 @@ do { \
64	: "memory"); \	140	: "memory"); \
65	} while(0)	141	} while(0)
66		142
67	#define local_save_flags(flags) \	143	#define __local_save_flags(flags) \
68	do { \	144	do { \
69	typecheck(unsigned long, flags); \	145	typecheck(unsigned long, flags); \
70	asm("movsg psr,%0" \	146	asm("movsg psr,%0" \
@@ -73,7 +149,7 @@ do { \
73	: "memory"); \	149	: "memory"); \
74	} while(0)	150	} while(0)
75		151
76	#define local_irq_save(flags) \	152	#define __local_irq_save(flags) \
77	do { \	153	do { \
78	unsigned long npsr; \	154	unsigned long npsr; \
79	typecheck(unsigned long, flags); \	155	typecheck(unsigned long, flags); \
@@ -86,7 +162,7 @@ do { \
86	: "memory"); \	162	: "memory"); \
87	} while(0)	163	} while(0)
88		164
89	#define local_irq_restore(flags) \	165	#define __local_irq_restore(flags) \
90	do { \	166	do { \
91	typecheck(unsigned long, flags); \	167	typecheck(unsigned long, flags); \
92	asm volatile(" movgs %0,psr \n" \	168	asm volatile(" movgs %0,psr \n" \
@@ -95,7 +171,7 @@ do { \
95	: "memory"); \	171	: "memory"); \
96	} while(0)	172	} while(0)
97		173
98	#define irqs_disabled() \	174	#define __irqs_disabled() \
99	((__get_PSR() & PSR_PIL) >= PSR_PIL_14)	175	((__get_PSR() & PSR_PIL) >= PSR_PIL_14)
100		176
101	/*	177	/*