Unverified Commit e3147506 authored by Alistair Francis's avatar Alistair Francis Committed by Palmer Dabbelt
Browse files

target/riscv: Set privledge spec 1.11.0 as default 



Set the priv spec version 1.11.0 as the default and allow selecting it
via the command line.

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 747a43e8

target/riscv/cpu.c

+5 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void riscv_any_cpu_init(Object *obj) 
{

    CPURISCVState *env = &RISCV_CPU(obj)->env;

    set_misa(env, RVXLEN | RVI | RVM | RVA | RVF | RVD | RVC | RVU);

    set_versions(env, USER_VERSION_2_02_0, PRIV_VERSION_1_10_0);

    set_versions(env, USER_VERSION_2_02_0, PRIV_VERSION_1_11_0);

    set_resetvec(env, DEFAULT_RSTVEC);

}
@@ -316,7 +316,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) 
    RISCVCPU *cpu = RISCV_CPU(dev);

    CPURISCVState *env = &cpu->env;

    RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(dev);

    int priv_version = PRIV_VERSION_1_10_0;

    int priv_version = PRIV_VERSION_1_11_0;

    int user_version = USER_VERSION_2_02_0;

    target_ulong target_misa = 0;

    Error *local_err = NULL;
@@ -328,7 +328,9 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) 
    }



    if (cpu->cfg.priv_spec) {

        if (!g_strcmp0(cpu->cfg.priv_spec, "v1.10.0")) {

        if (!g_strcmp0(cpu->cfg.priv_spec, "v1.11.0")) {

            priv_version = PRIV_VERSION_1_11_0;

        } else if (!g_strcmp0(cpu->cfg.priv_spec, "v1.10.0")) {

            priv_version = PRIV_VERSION_1_10_0;

        } else if (!g_strcmp0(cpu->cfg.priv_spec, "v1.9.1")) {

            priv_version = PRIV_VERSION_1_09_1;