[PULL,02/59] target/riscv: do not mask unsupported QEMU extensions in write_misa()

Commit Message

Palmer Dabbelt March 3, 2023, 8:36 a.m. UTC

From: Daniel Henrique Barboza <[e-mail]>

The masking done using env->misa_ext_mask already filters any extension
that QEMU doesn't support. If the hart supports the extension then QEMU
supports it as well.

If the masking done by env->misa_ext_mask is somehow letting unsupported
QEMU extensions pass by, misa_ext_mask itself needs to be fixed instead.

Signed-off-by: Daniel Henrique Barboza <[e-mail]>
Reviewed-by: Weiwei Li <[e-mail]>
Reviewed-by: Bin Meng <[e-mail]>
Reviewed-by: Andrew Jones <[e-mail]>
Message-ID: <[e-mail]>
Signed-off-by: Palmer Dabbelt <[e-mail]>
---
 target/riscv/csr.c | 3 ---
 1 file changed, 3 deletions(-)

Patch

diff --git a/target/riscv/csr.c b/target/riscv/csr.c
index 1b0a0c1693..e149b453da 100644
--- a/target/riscv/csr.c
+++ b/target/riscv/csr.c
@@ -1356,9 +1356,6 @@  static RISCVException write_misa(CPURISCVState *env, int csrno,
     /* Mask extensions that are not supported by this hart */
     val &= env->misa_ext_mask;
 
-    /* Mask extensions that are not supported by QEMU */
-    val &= (RVI | RVE | RVM | RVA | RVF | RVD | RVC | RVS | RVU | RVV);
-
     /* 'D' depends on 'F', so clear 'D' if 'F' is not present */
     if ((val & RVD) && !(val & RVF)) {
         val &= ~RVD;