From fa22d9bad85a61f5a391bc251d5773fe2c2424c0 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 24 Mar 2020 15:24:19 +0800 Subject: [PATCH] kernel: fix isr context handling We were loading both the context and the banked context, which resulted in an invalid context being selected. This caused a cascading failure. Load only the lower halfword in order to correctly enter the interrupt context. Signed-off-by: Sean Cross --- kernel/bin/riscv32i-unknown-none-elf.a | Bin 8558 -> 8558 bytes kernel/bin/riscv32imac-unknown-none-elf.a | Bin 8374 -> 8374 bytes kernel/bin/riscv32imc-unknown-none-elf.a | Bin 8374 -> 8374 bytes kernel/bin/riscv64gc-unknown-none-elf.a | Bin 13414 -> 13414 bytes kernel/bin/riscv64imac-unknown-none-elf.a | Bin 13414 -> 13414 bytes kernel/src/asm.S | 8 ++++---- 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/bin/riscv32i-unknown-none-elf.a b/kernel/bin/riscv32i-unknown-none-elf.a index 15aabf24cdd4e791c26fe383c86e7b944edd7e79..21ed4e56e1b42bd5cffb1568db7e2490d1ce9701 100644 GIT binary patch delta 35 jcmaFo^v-F5G`p#Rv5A?1*+iw;aORP6MuE*Xj7ACo%)bg( delta 35 jcmaFo^v-F5G`oqhiIIW1#YCmqaORP6Mup8bj7ACo&8G@) diff --git a/kernel/bin/riscv32imac-unknown-none-elf.a b/kernel/bin/riscv32imac-unknown-none-elf.a index bf535b656c6b214411ce0cb3ef4a2b0a4b377d31..4918d09626cd3cdbb84a14a0a3340ca4bf68690f 100644 GIT binary patch delta 316 zcmdnyxXp2bG`p#Rv5A?1=|rX3aORN`mSzD*hRIfp35@ZZXEWYp-dx7o!MK=@oypLT z0S4F@7=g?n7?%OU4?*KcOt$BgH;h9QO+w?Rpz(7y_jB?yF>aVVpIe`C$K>_G041w5-2eap delta 286 zcmdnyxXp2bG`oqhiIIW1#YCmqaORN`rb!NyZ5R_6>o?D3yve+|gtd#2k!SOJHhw0? zfXV+kGKcD1e2|hI-%bw34%>S>L2Q@+f=oU{PdlM2r q6~vyrp8qgo*5+b?>%2fM-g4fIev_xm`7?%1ehwrnHk-@WGXelQfi*Dz diff --git a/kernel/bin/riscv32imc-unknown-none-elf.a b/kernel/bin/riscv32imc-unknown-none-elf.a index bf535b656c6b214411ce0cb3ef4a2b0a4b377d31..647d4b0dc85468a9f110bee5cb558959699c8fda 100644 GIT binary patch delta 316 zcmdnyxXp2bG`p#Rv5A?1*+iw;P^Rg`BPA@&0*(xmtr!y+<2TP{yve+|jJ1PtF&{gV zp&tVburV+KnL#iv1B4%f#*dh6&na&hhbEeY#!o@x=WOohAx@nlKaNWCK2_$**`t7&#{Q^GQyY;8O##?D_n`{QrstPz?e=2YUk9 uTafsvKsM9l_56n!b2b+XT;~O9@s{&u446D!&Yv-2@^c_rwb@+0o)G{h+BDt( delta 286 zcmdnyxXp2bG`oqhiIIW1#YCmqaORN`rb!NyZ5R_6>o?D3yve+|gtd#2k!SOJHhw0? zfXV+kGKcD1e2|hI-%bw34%>S>L2Q@+f=oU{PdlM2r q6~vyrp8qgo*5+b?>%2fM-g4fIev_xm`7?%1ehwrnHk-@WGXelQfi*Dz diff --git a/kernel/bin/riscv64gc-unknown-none-elf.a b/kernel/bin/riscv64gc-unknown-none-elf.a index 5e59fbd3c68c202d913058f597d6f0109e7a385f..de5e92ad4c5087a6d137dd6da1c0d83ec74fd9c3 100644 GIT binary patch delta 259 zcmaEs@hoG4G`p#Rv5A?1*+iw;aORN?mS%xQhRJ@61&sGM?`M3eB#N_jQ?u-|}@_PIS7@vUU zUx3KXasodXnZy_;3vh@tGEPC delta 248 zcmaEs@hoG4G`oqhiIIW1#YCmqaORN?rbP*p0~iY!|8G9X_>_6`5>_iFMv=+u*~J&% zV`pZJn0%j0pD_)@XUqbTlkK=A7z@CxJRqwHEYk)e7jNTcW;_L!Imc(fcxm!~zUz$7 z!1Av)zvt&?Vv=B-EWjZ?SzkzhvYwE{#)Y_ZKg!dZ-xZ49Wu z6UY@{U}HEn`MiiYqr~RtBK(YuO`E@q_DeCzF-}%s7nwZAAc?VP@_&PRpo{7a>lv49 J{%@Gh1OTAXOhy0z diff --git a/kernel/bin/riscv64imac-unknown-none-elf.a b/kernel/bin/riscv64imac-unknown-none-elf.a index 5e59fbd3c68c202d913058f597d6f0109e7a385f..de5e92ad4c5087a6d137dd6da1c0d83ec74fd9c3 100644 GIT binary patch delta 259 zcmaEs@hoG4G`p#Rv5A?1*+iw;aORN?mS%xQhRJ@61&sGM?`M3eB#N_jQ?u-|}@_PIS7@vUU zUx3KXasodXnZy_;3vh@tGEPC delta 248 zcmaEs@hoG4G`oqhiIIW1#YCmqaORN?rbP*p0~iY!|8G9X_>_6`5>_iFMv=+u*~J&% zV`pZJn0%j0pD_)@XUqbTlkK=A7z@CxJRqwHEYk)e7jNTcW;_L!Imc(fcxm!~zUz$7 z!1Av)zvt&?Vv=B-EWjZ?SzkzhvYwE{#)Y_ZKg!dZ-xZ49Wu z6UY@{U}HEn`MiiYqr~RtBK(YuO`E@q_DeCzF-}%s7nwZAAc?VP@_&PRpo{7a>lv49 J{%@Gh1OTAXOhy0z diff --git a/kernel/src/asm.S b/kernel/src/asm.S index f0d102157..a081b19e5 100644 --- a/kernel/src/asm.S +++ b/kernel/src/asm.S @@ -51,10 +51,10 @@ _start: _start_trap: csrw sscratch, sp li sp, 0xff801000 - STORE x1, 0*REGBYTES(sp) - LOAD x1, 1*REGBYTES(sp) - slli x1, x1, 7 - add sp, sp, x1 + STORE x1, 0*REGBYTES(sp) // Store x1 in the scratch field + lh x1, 1*REGBYTES(sp) // Load current context number + slli x1, x1, 7 // Multiply current context number by 32 + add sp, sp, x1 // Set $sp to 0xff801000 + (current_context * 32) STORE x1, 0*REGBYTES(sp) // Skip SP for now