On Tue, Jun 4, 2024 at 4:23 PM Fea.Wang <fea.w...@sifive.com> wrote:
>
> Add RISC-V privilege 1.13 support.
>
> Signed-off-by: Fea.Wang <fea.w...@sifive.com>
> Signed-off-by: Fea.Wang <fea.w...@sifive.com>
> Reviewed-by: Frank Chang <frank.ch...@sifive.com>
> Reviewed-by: Weiwei Li <liwei1...@gmail.com>
> Reviewed-by: LIU Zhiwei <zhiwei_...@linux.alibaba.com>
This should be the last patch in the series. The idea is that we add
support and then let users enable it.
Alistair
> ---
> target/riscv/cpu.c | 6 +++++-
> target/riscv/tcg/tcg-cpu.c | 4 ++++
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index e9e69b9863..02c1e12a03 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -1775,7 +1775,9 @@ static int priv_spec_from_str(const char *priv_spec_str)
> {
> int priv_version = -1;
>
> - if (!g_strcmp0(priv_spec_str, PRIV_VER_1_12_0_STR)) {
> + if (!g_strcmp0(priv_spec_str, PRIV_VER_1_13_0_STR)) {
> + priv_version = PRIV_VERSION_1_13_0;
> + } else if (!g_strcmp0(priv_spec_str, PRIV_VER_1_12_0_STR)) {
> priv_version = PRIV_VERSION_1_12_0;
> } else if (!g_strcmp0(priv_spec_str, PRIV_VER_1_11_0_STR)) {
> priv_version = PRIV_VERSION_1_11_0;
> @@ -1795,6 +1797,8 @@ const char *priv_spec_to_str(int priv_version)
> return PRIV_VER_1_11_0_STR;
> case PRIV_VERSION_1_12_0:
> return PRIV_VER_1_12_0_STR;
> + case PRIV_VERSION_1_13_0:
> + return PRIV_VER_1_13_0_STR;
> default:
> return NULL;
> }
> diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c
> index 60fe0fd060..595d3b5b8f 100644
> --- a/target/riscv/tcg/tcg-cpu.c
> +++ b/target/riscv/tcg/tcg-cpu.c
> @@ -318,6 +318,10 @@ static void riscv_cpu_update_named_features(RISCVCPU
> *cpu)
> cpu->cfg.has_priv_1_12 = true;
> }
>
> + if (cpu->env.priv_ver >= PRIV_VERSION_1_13_0) {
> + cpu->cfg.has_priv_1_13 = true;
> + }
> +
> /* zic64b is 1.12 or later */
> cpu->cfg.ext_zic64b = cpu->cfg.cbom_blocksize == 64 &&
> cpu->cfg.cbop_blocksize == 64 &&
> --
> 2.34.1
>
>
