!237 fix: risc-v 锁中断在调度后失效

Merge pull request !237 from zhushengle/risc-v
2021-07-28 02:40:28 +00:00 · 2021-07-28 02:40:28 +00:00 · 6b732ca351
parent 71c76e8b08 70f3aa1c11
commit 6b732ca351
1 changed files with 13 additions and 2 deletions
--- a/kernel/arch/risc-v/riscv32/gcc/los_dispatch.S
+++ b/kernel/arch/risc-v/riscv32/gcc/los_dispatch.S
@ -107,14 +107,25 @@

 HalTaskContextSwitch:
    PUSH_ALL_REG
+
+    // clear mpie
+    li   a2, RISCV_MSTATUS_MPIE
+    not  a2, a2
+    and  a0, a0, a2
+
+    // get mie
    andi a1, a0, RISCV_MSTATUS_MIE

    // must be in machine mode
    ori  a1, a1, 0x180
    slli a1, a1, 0x4
    or   a0, a0, a1
-    li   a1, ~RISCV_MSTATUS_MIE
-    and  a0, a0, a1
+
+    // clear mie
+    li   a2, RISCV_MSTATUS_MIE
+    not  a2, a2
+    and  a0, a0, a2
+
    SREG a0, 16 * REGBYTES(sp)
    SREG ra, 17 * REGBYTES(sp)