From 50e72bf8372f3f60b209f350b1eea60a60601183 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 17 Feb 2021 16:49:38 +0800 Subject: [PATCH] loader: disable interrupts in the kernel This disables interrupts when the kernel is running. Signed-off-by: Sean Cross --- loader/bin/riscv32i-unknown-none-elf.a | Bin 3082 -> 3090 bytes loader/bin/riscv32imac-unknown-none-elf.a | Bin 3090 -> 3094 bytes loader/bin/riscv32imc-unknown-none-elf.a | Bin 3090 -> 3094 bytes loader/bin/riscv64gc-unknown-none-elf.a | Bin 4714 -> 4714 bytes loader/bin/riscv64imac-unknown-none-elf.a | Bin 4714 -> 4714 bytes loader/src/asm.S | 5 +++-- 6 files changed, 3 insertions(+), 2 deletions(-) diff --git a/loader/bin/riscv32i-unknown-none-elf.a b/loader/bin/riscv32i-unknown-none-elf.a index cb7d95a702661495735ee1b717567c141aa03f59..7d0f709729850094d9588760df4a7a08445f8958 100644 GIT binary patch delta 176 zcmeB@m?SYllGDu4*woa}+{9#}QmitZqo81*00I!w(7?dV%uGSS$kNDQ;vx;k852(j zF*Zz=W1P>(GI<~4X71$tqSTn2{KS;hqRHh<&YQP0aWgS0Z$8Z8&&v2?vM`rFqr>E6 zAXzebGgmp|iOJgB+Kl>>!?~3i?@zAgR%iS(c`=YYGx;>Py2KB528Ou|2*3zs0stMc BEg1j+ delta 171 zcmbOv(IqiKlGD_}$imFR+|qEOQmitZqo81*00I!w(7?dV%uGSS$kNbg;vx;k2@_8T zF*Z$>W1P>(Jb54EX13yz#Pn3d$u&&Qn-4K@Ffqz)KF#9K%J^ZjG?zc4#pG-tnKOAe wS2^Q>$;RB;j9Qc9xs@4jO>X8^XZ$jGHIO_q`7*b<#0Pc;hPey~zzAgm0RQhR2><{9 diff --git a/loader/bin/riscv32imac-unknown-none-elf.a b/loader/bin/riscv32imac-unknown-none-elf.a index 9478b21fd1c17c3ba670ef38eb1a6eae70ca6e7c..b7f535bc457f315da9276b5ae504bced1fad7de1 100644 GIT binary patch delta 177 zcmbOvF->BEB&V67v8kz{xrxa{rC4P+M?t|r0R$kVp@D&!nVEuuk)@Hz#6=p6b0(e+ zU~HHy!#JCfW%3TjjoiukMX514`H3m1MU(THf;Jyw;$UJ_-h7(HpOx{?WN9vcMwiLi zK(b=;Zmx31Gn0+EwHfs%$8#$)UZ32|t2GBEB&V67v8kz{xrxa{rC4P+M?t|r0R$kVp@D&!nVEuuk)@Hz#6=p6b0(e+ zU~HHy!#JCfW%3TjjoiukMX514`H3m1MU(THf;Jyw;$UJ_-h7(HpOx{?WN9vcMwiLi zK(b=;Zmx31Gn0+EwHfs%$8#$)UZ32|t2GFU_8lIT#}fcYB+ffQ_$oF jCf3dWm}Hn4nS@1akkwzKc diff --git a/loader/bin/riscv64imac-unknown-none-elf.a b/loader/bin/riscv64imac-unknown-none-elf.a index 558b58e1aacf6280d1d246d5c7c1df7be0193e57..889352195d67eca405128bdc8db4d648730cda02 100644 GIT binary patch delta 88 zcmaE*@=9fbB&V67v8kz{xrxa{rC20R$9l$w$rgQD9-G-u?W+${JU0K7pOFU_8lIT#}fcYB+ffQ_$oF jCf3dWm}Hn4nS@1akkwzKc diff --git a/loader/src/asm.S b/loader/src/asm.S index 7fcec33fc..e164ceaaf 100644 --- a/loader/src/asm.S +++ b/loader/src/asm.S @@ -30,8 +30,9 @@ start_kernel: csrw mideleg, t0 csrw medeleg, t0 - // Return to Supervisor mode (and enable interrupts) - li t0, (1 << 11) | (1 << 5) + // Return to Supervisor mode (1 << 11) when we call `reti`. + // Disable interrupts (0 << 5) + li t0, (1 << 11) | (0 << 5) // If arg6 is "true", also set mstatus.SUM to allow the kernel // to access userspace memory. andi a6, a6, 1