Commit 8be6971b authored by Alistair Francis's avatar Alistair Francis
Browse files

target/riscv: Disable the MMU correctly 



Previously if we didn't enable the MMU it would be enabled in the
realize() function anyway. Let's ensure that if we don't want the MMU we
disable it. We also don't need to enable the MMU as it will be enabled
in realize() by default.

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

target/riscv/cpu.c

+3 −2
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_MMU);

    set_feature(env, RISCV_FEATURE_PMP);

}
@@ -153,6 +152,7 @@ static void rv32imacu_nommu_cpu_init(Object *obj) 
    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);

}



static void rv32imafcu_nommu_cpu_init(Object *obj)
@@ -162,6 +162,7 @@ static void rv32imafcu_nommu_cpu_init(Object *obj) 
    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);

}



#elif defined(TARGET_RISCV64)
@@ -180,7 +181,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_MMU);

    set_feature(env, RISCV_FEATURE_PMP);

}
@@ -191,6 +191,7 @@ static void rv64imacu_nommu_cpu_init(Object *obj) 
    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);

}



#endif