From 316daaf1c299c29ac46e52145f65521f48ec63b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Date: Tue, 29 Apr 2025 16:25:50 +0200 Subject: [PATCH] lib: sbi_hart: properly reset Ssstateen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sstateen* and hstateen* CSRs must be zeroed by M-mode if the mstateen* registers are missing, to avoid security issues. Reviewed-by: Anup Patel Signed-off-by: Radim Krčmář Link: https://lore.kernel.org/r/20250429142549.3673976-10-rkrcmar@ventanamicro.com Signed-off-by: Anup Patel --- lib/sbi/sbi_hart.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index 8dc61d6f..fc4925b5 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -114,12 +114,21 @@ static void mstatus_init(struct sbi_scratch *scratch) csr_write64(CSR_MSTATEEN1, SMSTATEEN_STATEN); csr_write64(CSR_MSTATEEN2, SMSTATEEN_STATEN); csr_write64(CSR_MSTATEEN3, SMSTATEEN_STATEN); + } - if (misa_extension('S')) + if (sbi_hart_has_extension(scratch, SBI_HART_EXT_SSSTATEEN)) { + if (misa_extension('S')) { csr_write(CSR_SSTATEEN0, 0); - - if (misa_extension('H')) + csr_write(CSR_SSTATEEN1, 0); + csr_write(CSR_SSTATEEN2, 0); + csr_write(CSR_SSTATEEN3, 0); + } + if (misa_extension('H')) { csr_write64(CSR_HSTATEEN0, (uint64_t)0); + csr_write64(CSR_HSTATEEN1, (uint64_t)0); + csr_write64(CSR_HSTATEEN2, (uint64_t)0); + csr_write64(CSR_HSTATEEN3, (uint64_t)0); + } } if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_12) {