From: Anup Patel <anup@brainfault.org>
To: Peter Maydell <peter.maydell@linaro.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Alistair Francis <Alistair.Francis@wdc.com>,
Sagar Karandikar <sagark@eecs.berkeley.edu>
Cc: Anup Patel <anup@brainfault.org>, Bin Meng <bmeng.cn@gmail.com>,
qemu-riscv@nongnu.org, qemu-devel@nongnu.org,
Atish Patra <atishp@atishpatra.org>
Subject: [PATCH v6 13/23] target/riscv: Implement AIA mtopi, stopi, and vstopi CSRs
Date: Thu, 30 Dec 2021 18:05:29 +0530 [thread overview]
Message-ID: <20211230123539.52786-14-anup@brainfault.org> (raw)
In-Reply-To: <20211230123539.52786-1-anup@brainfault.org>
From: Anup Patel <anup.patel@wdc.com>
The AIA specification introduces new [m|s|vs]topi CSRs for
reporting pending local IRQ number and associated IRQ priority.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <anup@brainfault.org>
---
target/riscv/csr.c | 156 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 156 insertions(+)
diff --git a/target/riscv/csr.c b/target/riscv/csr.c
index 55e747fbf7..5a27c3bfbb 100644
--- a/target/riscv/csr.c
+++ b/target/riscv/csr.c
@@ -190,6 +190,15 @@ static int smode32(CPURISCVState *env, int csrno)
return smode(env, csrno);
}
+static int aia_smode(CPURISCVState *env, int csrno)
+{
+ if (!riscv_feature(env, RISCV_FEATURE_AIA)) {
+ return RISCV_EXCP_ILLEGAL_INST;
+ }
+
+ return smode(env, csrno);
+}
+
static int aia_smode32(CPURISCVState *env, int csrno)
{
if (!riscv_feature(env, RISCV_FEATURE_AIA)) {
@@ -502,6 +511,8 @@ static RISCVException read_timeh(CPURISCVState *env, int csrno,
#define VS_MODE_INTERRUPTS ((uint64_t)(MIP_VSSIP | MIP_VSTIP | MIP_VSEIP))
#define HS_MODE_INTERRUPTS ((uint64_t)(MIP_SGEIP | VS_MODE_INTERRUPTS))
+#define VSTOPI_NUM_SRCS 5
+
static const uint64_t delegable_ints = S_MODE_INTERRUPTS |
VS_MODE_INTERRUPTS;
static const uint64_t vs_delegable_ints = VS_MODE_INTERRUPTS;
@@ -862,6 +873,28 @@ static RISCVException rmw_mieh(CPURISCVState *env, int csrno,
return ret;
}
+static int read_mtopi(CPURISCVState *env, int csrno, target_ulong *val)
+{
+ int irq;
+ uint8_t iprio;
+
+ irq = riscv_cpu_mirq_pending(env);
+ if (irq <= 0 || irq > 63) {
+ *val = 0;
+ } else {
+ iprio = env->miprio[irq];
+ if (!iprio) {
+ if (riscv_cpu_default_priority(irq) > IPRIO_DEFAULT_M) {
+ iprio = IPRIO_MMAXIPRIO;
+ }
+ }
+ *val = (irq & TOPI_IID_MASK) << TOPI_IID_SHIFT;
+ *val |= iprio;
+ }
+
+ return RISCV_EXCP_NONE;
+}
+
static RISCVException read_mtvec(CPURISCVState *env, int csrno,
target_ulong *val)
{
@@ -1391,6 +1424,120 @@ static RISCVException write_satp(CPURISCVState *env, int csrno,
return RISCV_EXCP_NONE;
}
+static int read_vstopi(CPURISCVState *env, int csrno, target_ulong *val)
+{
+ int irq, ret;
+ target_ulong topei;
+ uint64_t vseip, vsgein;
+ uint32_t iid, iprio, hviid, hviprio, gein;
+ uint32_t s, scount = 0, siid[VSTOPI_NUM_SRCS], siprio[VSTOPI_NUM_SRCS];
+
+ gein = get_field(env->hstatus, HSTATUS_VGEIN);
+ hviid = get_field(env->hvictl, HVICTL_IID);
+ hviprio = get_field(env->hvictl, HVICTL_IPRIO);
+
+ if (gein) {
+ vsgein = (env->hgeip & (1ULL << gein)) ? MIP_VSEIP : 0;
+ vseip = env->mie & (env->mip | vsgein) & MIP_VSEIP;
+ if (gein <= env->geilen && vseip) {
+ siid[scount] = IRQ_S_EXT;
+ siprio[scount] = IPRIO_MMAXIPRIO + 1;
+ if (env->aia_ireg_rmw_fn[PRV_S]) {
+ /*
+ * Call machine specific IMSIC register emulation for
+ * reading TOPEI.
+ */
+ ret = env->aia_ireg_rmw_fn[PRV_S](
+ env->aia_ireg_rmw_fn_arg[PRV_S],
+ AIA_MAKE_IREG(ISELECT_IMSIC_TOPEI, PRV_S, true, gein,
+ riscv_cpu_mxl_bits(env)),
+ &topei, 0, 0);
+ if (!ret && topei) {
+ siprio[scount] = topei & IMSIC_TOPEI_IPRIO_MASK;
+ }
+ }
+ scount++;
+ }
+ } else {
+ if (hviid == IRQ_S_EXT && hviprio) {
+ siid[scount] = IRQ_S_EXT;
+ siprio[scount] = hviprio;
+ scount++;
+ }
+ }
+
+ if (env->hvictl & HVICTL_VTI) {
+ if (hviid != IRQ_S_EXT) {
+ siid[scount] = hviid;
+ siprio[scount] = hviprio;
+ scount++;
+ }
+ } else {
+ irq = riscv_cpu_vsirq_pending(env);
+ if (irq != IRQ_S_EXT && 0 < irq && irq <= 63) {
+ siid[scount] = irq;
+ siprio[scount] = env->hviprio[irq];
+ scount++;
+ }
+ }
+
+ iid = 0;
+ iprio = UINT_MAX;
+ for (s = 0; s < scount; s++) {
+ if (siprio[s] < iprio) {
+ iid = siid[s];
+ iprio = siprio[s];
+ }
+ }
+
+ if (iid) {
+ if (env->hvictl & HVICTL_IPRIOM) {
+ if (iprio > IPRIO_MMAXIPRIO) {
+ iprio = IPRIO_MMAXIPRIO;
+ }
+ if (!iprio) {
+ if (riscv_cpu_default_priority(iid) > IPRIO_DEFAULT_S) {
+ iprio = IPRIO_MMAXIPRIO;
+ }
+ }
+ } else {
+ iprio = 1;
+ }
+ } else {
+ iprio = 0;
+ }
+
+ *val = (iid & TOPI_IID_MASK) << TOPI_IID_SHIFT;
+ *val |= iprio;
+ return RISCV_EXCP_NONE;
+}
+
+static int read_stopi(CPURISCVState *env, int csrno, target_ulong *val)
+{
+ int irq;
+ uint8_t iprio;
+
+ if (riscv_cpu_virt_enabled(env)) {
+ return read_vstopi(env, CSR_VSTOPI, val);
+ }
+
+ irq = riscv_cpu_sirq_pending(env);
+ if (irq <= 0 || irq > 63) {
+ *val = 0;
+ } else {
+ iprio = env->siprio[irq];
+ if (!iprio) {
+ if (riscv_cpu_default_priority(irq) > IPRIO_DEFAULT_S) {
+ iprio = IPRIO_MMAXIPRIO;
+ }
+ }
+ *val = (irq & TOPI_IID_MASK) << TOPI_IID_SHIFT;
+ *val |= iprio;
+ }
+
+ return RISCV_EXCP_NONE;
+}
+
/* Hypervisor Extensions */
static RISCVException read_hstatus(CPURISCVState *env, int csrno,
target_ulong *val)
@@ -2389,6 +2536,9 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = {
[CSR_MTVAL] = { "mtval", any, read_mtval, write_mtval },
[CSR_MIP] = { "mip", any, NULL, NULL, rmw_mip },
+ /* Machine-Level Interrupts (AIA) */
+ [CSR_MTOPI] = { "mtopi", aia_any, read_mtopi },
+
/* Virtual Interrupts for Supervisor Level (AIA) */
[CSR_MVIEN] = { "mvien", aia_any, read_zero, write_ignore },
[CSR_MVIP] = { "mvip", aia_any, read_zero, write_ignore },
@@ -2416,6 +2566,9 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = {
/* Supervisor Protection and Translation */
[CSR_SATP] = { "satp", smode, read_satp, write_satp },
+ /* Supervisor-Level Interrupts (AIA) */
+ [CSR_STOPI] = { "stopi", aia_smode, read_stopi },
+
/* Supervisor-Level High-Half CSRs (AIA) */
[CSR_SIEH] = { "sieh", aia_smode32, NULL, NULL, rmw_sieh },
[CSR_SIPH] = { "siph", aia_smode32, NULL, NULL, rmw_siph },
@@ -2454,6 +2607,9 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = {
[CSR_HVIPRIO1] = { "hviprio1", aia_hmode, read_hviprio1, write_hviprio1 },
[CSR_HVIPRIO2] = { "hviprio2", aia_hmode, read_hviprio2, write_hviprio2 },
+ /* VS-Level Interrupts (H-extension with AIA) */
+ [CSR_VSTOPI] = { "vstopi", aia_hmode, read_vstopi },
+
/* Hypervisor and VS-Level High-Half CSRs (H-extension with AIA) */
[CSR_HIDELEGH] = { "hidelegh", aia_hmode32, NULL, NULL, rmw_hidelegh },
[CSR_HVIENH] = { "hvienh", aia_hmode32, read_zero, write_ignore },
--
2.25.1
next prev parent reply other threads:[~2021-12-30 12:47 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-30 12:35 [PATCH v6 00/23] QEMU RISC-V AIA support Anup Patel
2021-12-30 12:35 ` [PATCH v6 01/23] target/riscv: Fix trap cause for RV32 HS-mode CSR access from RV64 HS-mode Anup Patel
2022-01-12 12:29 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 02/23] target/riscv: Implement SGEIP bit in hip and hie CSRs Anup Patel
2022-01-13 14:35 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 03/23] target/riscv: Implement hgeie and hgeip CSRs Anup Patel
2022-01-14 6:37 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 04/23] target/riscv: Improve delivery of guest external interrupts Anup Patel
2022-01-13 7:51 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 05/23] target/riscv: Allow setting CPU feature from machine/device emulation Anup Patel
2022-01-12 12:34 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 06/23] target/riscv: Add AIA cpu feature Anup Patel
2022-01-12 12:34 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 07/23] target/riscv: Add defines for AIA CSRs Anup Patel
2022-01-12 12:57 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 08/23] target/riscv: Allow AIA device emulation to set ireg rmw callback Anup Patel
2022-01-12 12:59 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 09/23] target/riscv: Implement AIA local interrupt priorities Anup Patel
2022-01-10 13:08 ` Frank Chang
2022-01-11 17:18 ` Anup Patel
2022-01-12 3:00 ` Frank Chang
2022-01-13 10:45 ` Anup Patel
2022-01-13 14:21 ` Frank Chang
2022-01-10 13:25 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 10/23] target/riscv: Implement AIA CSRs for 64 local interrupts on RV32 Anup Patel
2022-01-14 9:48 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 11/23] target/riscv: Implement AIA hvictl and hviprioX CSRs Anup Patel
2022-01-12 13:15 ` Frank Chang
2022-01-13 10:49 ` Anup Patel
2021-12-30 12:35 ` [PATCH v6 12/23] target/riscv: Implement AIA interrupt filtering CSRs Anup Patel
2022-01-11 6:00 ` Frank Chang
2021-12-30 12:35 ` Anup Patel [this message]
2022-01-12 12:15 ` [PATCH v6 13/23] target/riscv: Implement AIA mtopi, stopi, and vstopi CSRs Frank Chang
2022-01-13 10:48 ` Anup Patel
2021-12-30 12:35 ` [PATCH v6 14/23] target/riscv: Implement AIA xiselect and xireg CSRs Anup Patel
2022-01-12 16:40 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 15/23] target/riscv: Implement AIA IMSIC interface CSRs Anup Patel
2022-01-05 3:30 ` Frank Chang
2022-01-08 12:03 ` Anup Patel
2021-12-30 12:35 ` [PATCH v6 16/23] hw/riscv: virt: Use AIA INTC compatible string when available Anup Patel
2022-01-12 16:47 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 17/23] target/riscv: Allow users to force enable AIA CSRs in HART Anup Patel
2022-01-12 13:19 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 18/23] hw/intc: Add RISC-V AIA APLIC device emulation Anup Patel
2022-01-07 8:52 ` Frank Chang
2022-01-08 13:28 ` Anup Patel
2022-01-08 6:35 ` Frank Chang
2022-01-08 12:00 ` Anup Patel
2022-01-14 12:02 ` Frank Chang
2022-01-14 12:59 ` Anup Patel
2021-12-30 12:35 ` [PATCH v6 19/23] hw/riscv: virt: Add optional AIA APLIC support to virt machine Anup Patel
2021-12-30 12:35 ` [PATCH v6 20/23] hw/intc: Add RISC-V AIA IMSIC device emulation Anup Patel
2022-01-13 7:26 ` Frank Chang
2022-01-13 12:22 ` Anup Patel
2021-12-30 12:35 ` [PATCH v6 21/23] hw/riscv: virt: Add optional AIA IMSIC support to virt machine Anup Patel
2021-12-30 12:35 ` [PATCH v6 22/23] docs/system: riscv: Document AIA options for " Anup Patel
2022-01-12 13:23 ` Frank Chang
2021-12-30 12:35 ` [PATCH v6 23/23] hw/riscv: virt: Increase maximum number of allowed CPUs Anup Patel
2022-01-05 21:50 ` Alistair Francis
2022-01-12 13:26 ` Frank Chang
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=20211230123539.52786-14-anup@brainfault.org \
--to=anup@brainfault.org \
--cc=Alistair.Francis@wdc.com \
--cc=atishp@atishpatra.org \
--cc=bmeng.cn@gmail.com \
--cc=palmer@dabbelt.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=sagark@eecs.berkeley.edu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).