From 7242f9c14b3af77eb24944b25076bec7e173399f Mon Sep 17 00:00:00 2001 From: S Pawan Kumar Date: Sat, 28 Jan 2023 18:39:11 +0530 Subject: [PATCH 1/3] Fix SATP restore condition. Signed-off-by: S Pawan Kumar --- riscv-test-suite/env/arch_test.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/riscv-test-suite/env/arch_test.h b/riscv-test-suite/env/arch_test.h index 641a2a451..e542123b9 100644 --- a/riscv-test-suite/env/arch_test.h +++ b/riscv-test-suite/env/arch_test.h @@ -1398,9 +1398,11 @@ resto_\__MODE__\()edeleg: //FIXME: if N-extension or anything like it is implemented, uncomment the following // csrw CSR_XEDELEG, t2 //this handles S mode restore .endif +.if (\__MODE__\() != M) resto_\__MODE__\()satp: LREG t2, xsatp_sv_addr(t1) // restore saved xsatp csrw CSR_XSATP, t2 +.endif resto_\__MODE__\()scratch: LREG t5, xscr_save_addr(t1) // restore saved xscratch csrw CSR_XSCRATCH, t5 From 33b10ae372e1924ac55ef3a72eeedb26366a12ed Mon Sep 17 00:00:00 2001 From: S Pawan Kumar Date: Sat, 28 Jan 2023 18:41:19 +0530 Subject: [PATCH 2/3] Changelog Update. Fixes #308 Signed-off-by: S Pawan Kumar --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 033e80b47..310c9b06d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # CHANGELOG -## [3.6.0] - 2022-10-11 +## [3.6.0] - 2023-01-28 +- Fix satp restore condition. + +## [3.6.0] - 2023-01-26 - Removed the bugs in RVTEST_GOTO_LOWER_MODE macro - Removed the bugs in RVTEST_GOTO_MMODE macro and defined strap_routine directive. - Updated RVTEST_TRAP_SAVEAREA and RVTEST_TRAP_EPILOG macros to refine the definitions of per mode save area macros. @@ -8,8 +11,6 @@ - fixed the handling of when xTVEC was not initialized and also could not be written - rewritten the save_GPR macro to it now compiles - some miscellaneous optimizations - -======= ## [3.5.3] - 2022-11-22 - Fix Canary definition according to sigalign. From f3b08246ec3cf5a84d1715568042a0591b58fd8a Mon Sep 17 00:00:00 2001 From: S Pawan Kumar Date: Sat, 28 Jan 2023 18:41:35 +0530 Subject: [PATCH 3/3] Fix version in changelog. Signed-off-by: S Pawan Kumar --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 310c9b06d..2f0e3f5ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # CHANGELOG -## [3.6.0] - 2023-01-28 +## [3.6.1] - 2023-01-28 - Fix satp restore condition. ## [3.6.0] - 2023-01-26