From: "Christoph Müllner" <cmuellner@linux.com> To: Atish Patra <atishp@rivosinc.com> Cc: "open list:RISC-V" <qemu-riscv@nongnu.org>, Anup Patel <anup@brainfault.org>, Bin Meng <bin.meng@windriver.com>, "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, Alistair Francis <alistair.francis@wdc.com>, Palmer Dabbelt <palmer@dabbelt.com> Subject: Re: [RFC 5/5] target/riscv: Enable privileged spec version 1.12 Date: Mon, 24 Jan 2022 14:32:17 +0100 [thread overview] Message-ID: <CAHB2gtQxLo=UuGnGtJPaNqA-Tc19vJCHnyqUmjNV6mAU6hPZ3w@mail.gmail.com> (raw) In-Reply-To: <20220120200735.2739543-6-atishp@rivosinc.com> [-- Attachment #1: Type: text/plain, Size: 2852 bytes --] On Fri, Jan 21, 2022 at 12:16 AM Atish Patra <atishp@rivosinc.com> wrote: > Virt machine uses privileged specification version 1.12 now. > All other machine continue to use the default one defined for that > machine unless changed to 1.12 by the user explicitly. > > Signed-off-by: Atish Patra <atishp@rivosinc.com> > --- > target/riscv/cpu.c | 8 +++++--- > target/riscv/csr.c | 10 ++++++++++ > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index 9bc25d3055d4..cec5791151e7 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -153,7 +153,7 @@ static void riscv_any_cpu_init(Object *obj) > #elif defined(TARGET_RISCV64) > set_misa(env, MXL_RV64, RVI | RVM | RVA | RVF | RVD | RVC | RVU); > #endif > - set_priv_version(env, PRIV_VERSION_1_11_0); > + set_priv_version(env, PRIV_VERSION_1_12_0); > } > > #if defined(TARGET_RISCV64) > @@ -439,7 +439,9 @@ static void riscv_cpu_realize(DeviceState *dev, Error > **errp) > } > > if (cpu->cfg.priv_spec) { > - if (!g_strcmp0(cpu->cfg.priv_spec, "v1.11.0")) { > + if (!g_strcmp0(cpu->cfg.priv_spec, "v1.12.0")) { > + priv_version = PRIV_VERSION_1_12_0; > + } else 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; > @@ -454,7 +456,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error > **errp) > if (priv_version) { > set_priv_version(env, priv_version); > } else if (!env->priv_ver) { > - set_priv_version(env, PRIV_VERSION_1_11_0); > + set_priv_version(env, PRIV_VERSION_1_12_0); > } > > if (cpu->cfg.mmu) { > diff --git a/target/riscv/csr.c b/target/riscv/csr.c > index a4bbae7a1bbd..62d429cc3f17 100644 > --- a/target/riscv/csr.c > +++ b/target/riscv/csr.c > @@ -1874,6 +1874,12 @@ static inline RISCVException > riscv_csrrw_check(CPURISCVState *env, > int read_only = get_field(csrno, 0xC00) == 3; > #if !defined(CONFIG_USER_ONLY) > int effective_priv = env->priv; > + int csr_min_priv = csr_ops[csrno].min_priv_ver; > + > + /* The default privilege specification version supported is 1.10 */ > + if (!csr_min_priv) { > + csr_min_priv = PRIV_VERSION_1_10_0; > + } > > if (riscv_has_ext(env, RVH) && > env->priv == PRV_S && > @@ -1904,6 +1910,10 @@ static inline RISCVException > riscv_csrrw_check(CPURISCVState *env, > return RISCV_EXCP_ILLEGAL_INST; > } > > + if (env->priv_ver < csr_min_priv) { > + return RISCV_EXCP_ILLEGAL_INST; > + } > This does not compile if CONFIG_USER_ONLY is defined. > + > return csr_ops[csrno].predicate(env, csrno); > } > > -- > 2.30.2 > > [-- Attachment #2: Type: text/html, Size: 3829 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: "Christoph Müllner" <cmuellner@linux.com> To: Atish Patra <atishp@rivosinc.com> Cc: "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, "open list:RISC-V" <qemu-riscv@nongnu.org>, Anup Patel <anup@brainfault.org>, Bin Meng <bin.meng@windriver.com>, Alistair Francis <alistair.francis@wdc.com>, Palmer Dabbelt <palmer@dabbelt.com> Subject: Re: [RFC 5/5] target/riscv: Enable privileged spec version 1.12 Date: Mon, 24 Jan 2022 14:32:17 +0100 [thread overview] Message-ID: <CAHB2gtQxLo=UuGnGtJPaNqA-Tc19vJCHnyqUmjNV6mAU6hPZ3w@mail.gmail.com> (raw) In-Reply-To: <20220120200735.2739543-6-atishp@rivosinc.com> [-- Attachment #1: Type: text/plain, Size: 2852 bytes --] On Fri, Jan 21, 2022 at 12:16 AM Atish Patra <atishp@rivosinc.com> wrote: > Virt machine uses privileged specification version 1.12 now. > All other machine continue to use the default one defined for that > machine unless changed to 1.12 by the user explicitly. > > Signed-off-by: Atish Patra <atishp@rivosinc.com> > --- > target/riscv/cpu.c | 8 +++++--- > target/riscv/csr.c | 10 ++++++++++ > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index 9bc25d3055d4..cec5791151e7 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -153,7 +153,7 @@ static void riscv_any_cpu_init(Object *obj) > #elif defined(TARGET_RISCV64) > set_misa(env, MXL_RV64, RVI | RVM | RVA | RVF | RVD | RVC | RVU); > #endif > - set_priv_version(env, PRIV_VERSION_1_11_0); > + set_priv_version(env, PRIV_VERSION_1_12_0); > } > > #if defined(TARGET_RISCV64) > @@ -439,7 +439,9 @@ static void riscv_cpu_realize(DeviceState *dev, Error > **errp) > } > > if (cpu->cfg.priv_spec) { > - if (!g_strcmp0(cpu->cfg.priv_spec, "v1.11.0")) { > + if (!g_strcmp0(cpu->cfg.priv_spec, "v1.12.0")) { > + priv_version = PRIV_VERSION_1_12_0; > + } else 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; > @@ -454,7 +456,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error > **errp) > if (priv_version) { > set_priv_version(env, priv_version); > } else if (!env->priv_ver) { > - set_priv_version(env, PRIV_VERSION_1_11_0); > + set_priv_version(env, PRIV_VERSION_1_12_0); > } > > if (cpu->cfg.mmu) { > diff --git a/target/riscv/csr.c b/target/riscv/csr.c > index a4bbae7a1bbd..62d429cc3f17 100644 > --- a/target/riscv/csr.c > +++ b/target/riscv/csr.c > @@ -1874,6 +1874,12 @@ static inline RISCVException > riscv_csrrw_check(CPURISCVState *env, > int read_only = get_field(csrno, 0xC00) == 3; > #if !defined(CONFIG_USER_ONLY) > int effective_priv = env->priv; > + int csr_min_priv = csr_ops[csrno].min_priv_ver; > + > + /* The default privilege specification version supported is 1.10 */ > + if (!csr_min_priv) { > + csr_min_priv = PRIV_VERSION_1_10_0; > + } > > if (riscv_has_ext(env, RVH) && > env->priv == PRV_S && > @@ -1904,6 +1910,10 @@ static inline RISCVException > riscv_csrrw_check(CPURISCVState *env, > return RISCV_EXCP_ILLEGAL_INST; > } > > + if (env->priv_ver < csr_min_priv) { > + return RISCV_EXCP_ILLEGAL_INST; > + } > This does not compile if CONFIG_USER_ONLY is defined. > + > return csr_ops[csrno].predicate(env, csrno); > } > > -- > 2.30.2 > > [-- Attachment #2: Type: text/html, Size: 3829 bytes --]
next prev parent reply other threads:[~2022-01-24 13:34 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-20 20:07 [RFC 0/5] Privilege version update Atish Patra 2022-01-20 20:07 ` Atish Patra 2022-01-20 20:07 ` [RFC 1/5] target/riscv: Add the privileged spec version 1.12.0 Atish Patra 2022-01-20 20:07 ` Atish Patra 2022-01-24 7:59 ` Richard Henderson 2022-01-24 7:59 ` Richard Henderson 2022-01-29 0:52 ` Atish Kumar Patra 2022-01-29 0:52 ` Atish Kumar Patra 2022-01-31 6:33 ` Alistair Francis 2022-01-31 6:33 ` Alistair Francis 2022-01-20 20:07 ` [RFC 2/5] target/riscv: Introduce privilege version field in the CSR ops Atish Patra 2022-01-20 20:07 ` Atish Patra 2022-01-24 7:56 ` Richard Henderson 2022-01-24 7:56 ` Richard Henderson 2022-01-29 0:52 ` Atish Kumar Patra 2022-01-29 0:52 ` Atish Kumar Patra 2022-01-20 20:07 ` [RFC 3/5] target/riscv: Add support for mconfigptr Atish Patra 2022-01-20 20:07 ` Atish Patra 2022-01-20 20:07 ` [RFC 4/5] target/riscv: Add *envcfg* CSRs support Atish Patra 2022-01-20 20:07 ` Atish Patra 2022-01-26 8:37 ` Weiwei Li 2022-01-26 8:37 ` Weiwei Li 2022-01-29 1:28 ` Atish Patra 2022-01-29 1:28 ` Atish Patra 2022-01-29 1:50 ` angell1518 2022-01-31 20:05 ` Atish Kumar Patra 2022-01-31 20:05 ` Atish Kumar Patra 2022-02-03 12:23 ` Heiko Stübner 2022-02-03 20:39 ` Atish Kumar Patra 2022-02-03 20:39 ` Atish Kumar Patra 2022-01-20 20:07 ` [RFC 5/5] target/riscv: Enable privileged spec version 1.12 Atish Patra 2022-01-20 20:07 ` Atish Patra 2022-01-24 13:32 ` Christoph Müllner [this message] 2022-01-24 13:32 ` Christoph Müllner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAHB2gtQxLo=UuGnGtJPaNqA-Tc19vJCHnyqUmjNV6mAU6hPZ3w@mail.gmail.com' \ --to=cmuellner@linux.com \ --cc=alistair.francis@wdc.com \ --cc=anup@brainfault.org \ --cc=atishp@rivosinc.com \ --cc=bin.meng@windriver.com \ --cc=palmer@dabbelt.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-riscv@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.