Unverified Commit f18637cd authored by Michael Clark's avatar Michael Clark Committed by Palmer Dabbelt
Browse files

RISC-V: Add misa runtime write support 



This patch adds support for writing misa. misa is validated based
on rules in the ISA specification. 'E' is mutually exclusive with
all other extensions. 'D' depends on 'F' so 'D' bit is dropped
if 'F' is not present. A conservative approach to consistency is
taken by flushing the translation cache on misa writes. misa_mask
is added to the CPU struct to store the original set of extensions.

Signed-off-by: default avatarMichael Clark <mjc@sifive.com>
Signed-off-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarPalmer Dabbelt <palmer@sifive.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent d77c3401

target/riscv/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ typedef struct RISCVCPUInfo { 


static void set_misa(CPURISCVState *env, target_ulong misa)

{

    env->misa = misa;

    env->misa_mask = env->misa = misa;

}



static void set_versions(CPURISCVState *env, int user_ver, int priv_ver)

target/riscv/cpu.h

+3 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ 
   so a cpu features bitfield is required, likewise for optional PMP support */

enum {

    RISCV_FEATURE_MMU,

    RISCV_FEATURE_PMP

    RISCV_FEATURE_PMP,

    RISCV_FEATURE_MISA

};



#define USER_VERSION_2_02_0 0x00020200
@@ -118,6 +119,7 @@ struct CPURISCVState { 
    target_ulong user_ver;

    target_ulong priv_ver;

    target_ulong misa;

    target_ulong misa_mask;



    uint32_t features;

target/riscv/cpu_bits.h

+11 −0
Original line number Diff line number Diff line
@@ -311,10 +311,21 @@ 
#define MSTATUS32_SD        0x80000000

#define MSTATUS64_SD        0x8000000000000000ULL



#define MISA32_MXL          0xC0000000

#define MISA64_MXL          0xC000000000000000ULL



#define MXL_RV32            1

#define MXL_RV64            2

#define MXL_RV128           3



#if defined(TARGET_RISCV32)

#define MSTATUS_SD MSTATUS32_SD

#define MISA_MXL MISA32_MXL

#define MXL_VAL MXL_RV32

#elif defined(TARGET_RISCV64)

#define MSTATUS_SD MSTATUS64_SD

#define MISA_MXL MISA64_MXL

#define MXL_VAL MXL_RV64

#endif



/* sstatus CSR bits */

target/riscv/csr.c

+53 −1
Original line number Diff line number Diff line
@@ -332,6 +332,58 @@ static int read_misa(CPURISCVState *env, int csrno, target_ulong *val) 
    return 0;

}



static int write_misa(CPURISCVState *env, int csrno, target_ulong val)

{

    if (!riscv_feature(env, RISCV_FEATURE_MISA)) {

        /* drop write to misa */

        return 0;

    }



    /* 'I' or 'E' must be present */

    if (!(val & (RVI | RVE))) {

        /* It is not, drop write to misa */

        return 0;

    }



    /* 'E' excludes all other extensions */

    if (val & RVE) {

        /* when we support 'E' we can do "val = RVE;" however

         * for now we just drop writes if 'E' is present.

         */

        return 0;

    }



    /* Mask extensions that are not supported by this hart */

    val &= env->misa_mask;



    /* Mask extensions that are not supported by QEMU */

    val &= (RVI | RVE | RVM | RVA | RVF | RVD | RVC | RVS | RVU);



    /* 'D' depends on 'F', so clear 'D' if 'F' is not present */

    if ((val & RVD) && !(val & RVF)) {

        val &= ~RVD;

    }



    /* Suppress 'C' if next instruction is not aligned

     * TODO: this should check next_pc

     */

    if ((val & RVC) && (GETPC() & ~3) != 0) {

        val &= ~RVC;

    }



    /* misa.MXL writes are not supported by QEMU */

    val = (env->misa & MISA_MXL) | (val & ~MISA_MXL);



    /* flush translation cache */

    if (val != env->misa) {

        tb_flush(CPU(riscv_env_get_cpu(env)));

    }



    env->misa = val;



    return 0;

}



static int read_medeleg(CPURISCVState *env, int csrno, target_ulong *val)

{

    *val = env->medeleg;
@@ -810,7 +862,7 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { 


    /* Machine Trap Setup */

    [CSR_MSTATUS] =             { any,  read_mstatus,     write_mstatus     },

    [CSR_MISA] =                { any,  read_misa                           },

    [CSR_MISA] =                { any,  read_misa,        write_misa        },

    [CSR_MIDELEG] =             { any,  read_mideleg,     write_mideleg     },

    [CSR_MEDELEG] =             { any,  read_medeleg,     write_medeleg     },

    [CSR_MIE] =                 { any,  read_mie,         write_mie         },