Commit ff832b77 authored by Alistair Francis's avatar Alistair Francis
Browse files

target/riscv: Don't set PMP feature in the cpu init 



The PMP is enabled by default via the "pmp" property so there is no need
for us to set it in the init function. As all CPUs have PMP support just
remove the set_feature() call in the CPU init functions.

Signed-off-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarBin Meng <bin.meng@windriver.com>
parent 8be6971b

target/riscv/cpu.c

+0 −5
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ static void rv32gcsu_priv1_10_0_cpu_init(Object *obj) 
    set_misa(env, RV32 | RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU);

    set_priv_version(env, PRIV_VERSION_1_10_0);

    set_resetvec(env, DEFAULT_RSTVEC);

    set_feature(env, RISCV_FEATURE_PMP);

}



static void rv32imacu_nommu_cpu_init(Object *obj)
@@ -151,7 +150,6 @@ static void rv32imacu_nommu_cpu_init(Object *obj) 
    set_misa(env, RV32 | RVI | RVM | RVA | RVC | RVU);

    set_priv_version(env, PRIV_VERSION_1_10_0);

    set_resetvec(env, DEFAULT_RSTVEC);

    set_feature(env, RISCV_FEATURE_PMP);

    qdev_prop_set_bit(DEVICE(obj), "mmu", false);

}
@@ -161,7 +159,6 @@ static void rv32imafcu_nommu_cpu_init(Object *obj) 
    set_misa(env, RV32 | RVI | RVM | RVA | RVF | RVC | RVU);

    set_priv_version(env, PRIV_VERSION_1_10_0);

    set_resetvec(env, DEFAULT_RSTVEC);

    set_feature(env, RISCV_FEATURE_PMP);

    qdev_prop_set_bit(DEVICE(obj), "mmu", false);

}
@@ -181,7 +178,6 @@ static void rv64gcsu_priv1_10_0_cpu_init(Object *obj) 
    set_misa(env, RV64 | RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU);

    set_priv_version(env, PRIV_VERSION_1_10_0);

    set_resetvec(env, DEFAULT_RSTVEC);

    set_feature(env, RISCV_FEATURE_PMP);

}



static void rv64imacu_nommu_cpu_init(Object *obj)
@@ -190,7 +186,6 @@ static void rv64imacu_nommu_cpu_init(Object *obj) 
    set_misa(env, RV64 | RVI | RVM | RVA | RVC | RVU);

    set_priv_version(env, PRIV_VERSION_1_10_0);

    set_resetvec(env, DEFAULT_RSTVEC);

    set_feature(env, RISCV_FEATURE_PMP);

    qdev_prop_set_bit(DEVICE(obj), "mmu", false);

}