projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mimc200' into next
[oweals/u-boot.git]
/
cpu
/
microblaze
/
irq.S
diff --git
a/cpu/microblaze/irq.S
b/cpu/microblaze/irq.S
index a4e3fbfad674fbd17c3398ea5c305b98dec2b207..e1fc19046c721ee98e0c332c76506f7431ccef35 100644
(file)
--- a/
cpu/microblaze/irq.S
+++ b/
cpu/microblaze/irq.S
@@
-23,6
+23,7
@@
*/
#include <config.h>
*/
#include <config.h>
+#include <asm/asm.h>
.text
.global _interrupt_handler
_interrupt_handler:
.text
.global _interrupt_handler
_interrupt_handler:
@@
-151,6
+152,11
@@
_interrupt_handler:
addi r1, r1, 4
/* enable_interrupt */
addi r1, r1, 4
/* enable_interrupt */
+#ifdef XILINX_USE_MSR_INSTR
+ msrset r0, 2
+#else
+ /* FIXME unstable in stressed mode - two irqs */
+ nop
addi r1, r1, -4
swi r12, r1, 0
mfs r12, rmsr
addi r1, r1, -4
swi r12, r1, 0
mfs r12, rmsr
@@
-159,6
+165,7
@@
_interrupt_handler:
lwi r12, r1, 0
addi r1, r1, 4
nop
lwi r12, r1, 0
addi r1, r1, 4
nop
+#endif
bra r14
nop
nop
bra r14
nop
nop