All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
To: qemu-devel@nongnu.org
Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com,
	bmeng@tinylab.org, liweiwei@iscas.ac.cn,
	zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com,
	Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Subject: [PATCH for-8.1 v4 07/25] target/riscv: move pmp and epmp validations to validate_set_extensions()
Date: Wed, 22 Mar 2023 19:19:46 -0300	[thread overview]
Message-ID: <20230322222004.357013-8-dbarboza@ventanamicro.com> (raw)
In-Reply-To: <20230322222004.357013-1-dbarboza@ventanamicro.com>

In the near future, write_misa() will use a variation of what we have
now as riscv_cpu_validate_set_extensions(). The pmp and epmp validation
will be required in write_misa() and it's already required here in
riscv_cpu_realize(), so move it to riscv_cpu_validate_set_extensions().

Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
---
 target/riscv/cpu.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 1a298e5e55..7458845fec 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -916,6 +916,15 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)
     Error *local_err = NULL;
     uint32_t ext = 0;
 
+    if (cpu->cfg.epmp && !cpu->cfg.pmp) {
+        /*
+         * Enhanced PMP should only be available
+         * on harts with PMP support
+         */
+        error_setg(errp, "Invalid configuration: EPMP requires PMP support");
+        return;
+    }
+
     /* Do some ISA extension error checking */
     if (cpu->cfg.ext_g && !(cpu->cfg.ext_i && cpu->cfg.ext_m &&
                             cpu->cfg.ext_a && cpu->cfg.ext_f &&
@@ -1228,16 +1237,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)
         return;
     }
 
-    if (cpu->cfg.epmp && !cpu->cfg.pmp) {
-        /*
-         * Enhanced PMP should only be available
-         * on harts with PMP support
-         */
-        error_setg(errp, "Invalid configuration: EPMP requires PMP support");
-        return;
-    }
-
-
 #ifndef CONFIG_USER_ONLY
     if (cpu->cfg.ext_sstc) {
         riscv_timer_init(cpu);
-- 
2.39.2



  parent reply	other threads:[~2023-03-22 23:41 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-22 22:19 [PATCH for-8.1 v4 00/25] target/riscv: rework CPU extensions validation Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 01/25] target/riscv/cpu.c: add riscv_cpu_validate_v() Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 02/25] target/riscv/cpu.c: remove set_vext_version() Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 03/25] target/riscv/cpu.c: remove set_priv_version() Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 04/25] target/riscv: add PRIV_VERSION_LATEST Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 05/25] target/riscv/cpu.c: add priv_spec validate/disable_exts helpers Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 06/25] target/riscv/cpu.c: add riscv_cpu_validate_misa_mxl() Daniel Henrique Barboza
2023-03-23  1:35   ` LIU Zhiwei
2023-03-22 22:19 ` Daniel Henrique Barboza [this message]
2023-03-23  1:42   ` [PATCH for-8.1 v4 07/25] target/riscv: move pmp and epmp validations to validate_set_extensions() LIU Zhiwei
2023-03-22 22:19 ` [PATCH for-8.1 v4 08/25] target/riscv/cpu.c: validate extensions before riscv_timer_init() Daniel Henrique Barboza
2023-03-23  1:52   ` LIU Zhiwei
2023-03-22 22:19 ` [PATCH for-8.1 v4 09/25] target/riscv/cpu.c: remove cfg setup from riscv_cpu_init() Daniel Henrique Barboza
2023-03-23  2:02   ` LIU Zhiwei
2023-03-22 22:19 ` [PATCH for-8.1 v4 10/25] target/riscv/cpu.c: avoid set_misa() in validate_set_extensions() Daniel Henrique Barboza
2023-03-23  2:04   ` LIU Zhiwei
2023-03-22 22:19 ` [PATCH for-8.1 v4 11/25] target/riscv/cpu.c: set cpu config in set_misa() Daniel Henrique Barboza
2023-03-23  2:14   ` LIU Zhiwei
2023-03-23  2:18     ` LIU Zhiwei
2023-03-23 23:23     ` Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 12/25] target/riscv/cpu.c: redesign register_cpu_props() Daniel Henrique Barboza
2023-03-23  3:22   ` LIU Zhiwei
2023-03-22 22:19 ` [PATCH for-8.1 v4 13/25] target/riscv: put env->misa_ext <-> cpu->cfg code into helpers Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 14/25] target/riscv: add RVG Daniel Henrique Barboza
2023-03-24 14:43   ` liweiwei
2023-03-22 22:19 ` [PATCH for-8.1 v4 15/25] target/riscv/cpu.c: split RVG code from validate_set_extensions() Daniel Henrique Barboza
2023-03-24 14:47   ` liweiwei
2023-03-22 22:19 ` [PATCH for-8.1 v4 16/25] target/riscv/cpu.c: add riscv_cpu_validate_misa_ext() Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 17/25] target/riscv: move riscv_cpu_validate_v() to validate_misa_ext() Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 18/25] target/riscv: error out on priv failure for RVH Daniel Henrique Barboza
2023-03-24 14:56   ` liweiwei
2023-03-28 14:33     ` Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 19/25] target/riscv: write env->misa_ext* in register_generic_cpu_props() Daniel Henrique Barboza
2023-03-22 22:19 ` [PATCH for-8.1 v4 20/25] target/riscv: make validate_misa_ext() use a misa_ext val Daniel Henrique Barboza
2023-03-22 22:20 ` [PATCH for-8.1 v4 21/25] target/riscv: split riscv_cpu_validate_set_extensions() Daniel Henrique Barboza
2023-03-22 22:20 ` [PATCH for-8.1 v4 22/25] target/riscv: use misa_ext val in riscv_cpu_validate_extensions() Daniel Henrique Barboza
2023-03-24 15:06   ` liweiwei
2023-03-22 22:20 ` [PATCH for-8.1 v4 23/25] target/riscv: rework write_misa() Daniel Henrique Barboza
2023-03-24 15:09   ` liweiwei
2023-03-22 22:20 ` [PATCH for-8.1 v4 24/25] target/riscv: update cpu->cfg misa bits in commit_cpu_cfg() Daniel Henrique Barboza
2023-03-24 15:14   ` liweiwei
2023-03-22 22:20 ` [PATCH for-8.1 v4 25/25] target/riscv: handle RVG updates in write_misa() Daniel Henrique Barboza

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=20230322222004.357013-8-dbarboza@ventanamicro.com \
    --to=dbarboza@ventanamicro.com \
    --cc=alistair.francis@wdc.com \
    --cc=bmeng@tinylab.org \
    --cc=liweiwei@iscas.ac.cn \
    --cc=palmer@rivosinc.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=zhiwei_liu@linux.alibaba.com \
    /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: link
Be 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.