Commit 834e5a69 authored by Christophe Leroy's avatar Christophe Leroy Committed by Scott Wood

powerpc/8xx: use SPRN_EIE and SPRN_EID to enable/disable interrupts

The 8xx has two special registers called EID (External Interrupt
Disable) and EIE (External Interrupt Enable) for clearing/setting
EE in MSR. It avoids the three instructions set mfmsr/ori/mtmsr or
mfmsr/rlwinm/mtmsr and it avoids using a general register.

We just have to write something in the special register to change MSR EE
bit. So we write r0 into the register, regardless of r0 value.

Writing to one of those two special registers also set the MSR RI bit,
but this bit is only unset during beginning of exception prolog and end
of exception epilog. When executing C-functions MSR RI is always set.
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent fff69fd0
...@@ -155,6 +155,8 @@ static inline unsigned long arch_local_irq_save(void) ...@@ -155,6 +155,8 @@ static inline unsigned long arch_local_irq_save(void)
unsigned long flags = arch_local_save_flags(); unsigned long flags = arch_local_save_flags();
#ifdef CONFIG_BOOKE #ifdef CONFIG_BOOKE
asm volatile("wrteei 0" : : : "memory"); asm volatile("wrteei 0" : : : "memory");
#elif defined(CONFIG_PPC_8xx)
wrtspr(SPRN_EID);
#else #else
SET_MSR_EE(flags & ~MSR_EE); SET_MSR_EE(flags & ~MSR_EE);
#endif #endif
...@@ -165,6 +167,8 @@ static inline void arch_local_irq_disable(void) ...@@ -165,6 +167,8 @@ static inline void arch_local_irq_disable(void)
{ {
#ifdef CONFIG_BOOKE #ifdef CONFIG_BOOKE
asm volatile("wrteei 0" : : : "memory"); asm volatile("wrteei 0" : : : "memory");
#elif defined(CONFIG_PPC_8xx)
wrtspr(SPRN_EID);
#else #else
arch_local_irq_save(); arch_local_irq_save();
#endif #endif
...@@ -174,6 +178,8 @@ static inline void arch_local_irq_enable(void) ...@@ -174,6 +178,8 @@ static inline void arch_local_irq_enable(void)
{ {
#ifdef CONFIG_BOOKE #ifdef CONFIG_BOOKE
asm volatile("wrteei 1" : : : "memory"); asm volatile("wrteei 1" : : : "memory");
#elif defined(CONFIG_PPC_8xx)
wrtspr(SPRN_EIE);
#else #else
unsigned long msr = mfmsr(); unsigned long msr = mfmsr();
SET_MSR_EE(msr | MSR_EE); SET_MSR_EE(msr | MSR_EE);
......
...@@ -1249,6 +1249,8 @@ static inline void mtmsr_isync(unsigned long val) ...@@ -1249,6 +1249,8 @@ static inline void mtmsr_isync(unsigned long val)
: "r" ((unsigned long)(v)) \ : "r" ((unsigned long)(v)) \
: "memory") : "memory")
#endif #endif
#define wrtspr(rn) asm volatile("mtspr " __stringify(rn) ",0" : \
: : "memory")
extern void msr_check_and_set(unsigned long bits); extern void msr_check_and_set(unsigned long bits);
extern bool strict_msr_control; extern bool strict_msr_control;
......
...@@ -25,6 +25,10 @@ ...@@ -25,6 +25,10 @@
#define SPRN_MD_RAM0 825 #define SPRN_MD_RAM0 825
#define SPRN_MD_RAM1 826 #define SPRN_MD_RAM1 826
/* Special MSR manipulation registers */
#define SPRN_EIE 80 /* External interrupt enable (EE=1, RI=1) */
#define SPRN_EID 81 /* External interrupt disable (EE=0, RI=1) */
/* Commands. Only the first few are available to the instruction cache. /* Commands. Only the first few are available to the instruction cache.
*/ */
#define IDC_ENABLE 0x02000000 /* Cache enable */ #define IDC_ENABLE 0x02000000 /* Cache enable */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment