[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 08/23] target/riscv: Allow AIA device emulation to set ireg rm
From: |
Anup Patel |
Subject: |
[PATCH v6 08/23] target/riscv: Allow AIA device emulation to set ireg rmw callback |
Date: |
Thu, 30 Dec 2021 18:05:24 +0530 |
From: Anup Patel <anup.patel@wdc.com>
The AIA device emulation (such as AIA IMSIC) should be able to set
(or provide) AIA ireg read-modify-write callback for each privilege
level of a RISC-V HART.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
target/riscv/cpu.h | 23 +++++++++++++++++++++++
target/riscv/cpu_helper.c | 14 ++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index d0c1725eaf..02f3ef2c3c 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -242,6 +242,22 @@ struct CPURISCVState {
uint64_t (*rdtime_fn)(uint32_t);
uint32_t rdtime_fn_arg;
+ /* machine specific AIA ireg read-modify-write callback */
+#define AIA_MAKE_IREG(__isel, __priv, __virt, __vgein, __xlen) \
+ ((((__xlen) & 0xff) << 24) | \
+ (((__vgein) & 0x3f) << 20) | \
+ (((__virt) & 0x1) << 18) | \
+ (((__priv) & 0x3) << 16) | \
+ (__isel & 0xffff))
+#define AIA_IREG_ISEL(__ireg) ((__ireg) & 0xffff)
+#define AIA_IREG_PRIV(__ireg) (((__ireg) >> 16) & 0x3)
+#define AIA_IREG_VIRT(__ireg) (((__ireg) >> 18) & 0x1)
+#define AIA_IREG_VGEIN(__ireg) (((__ireg) >> 20) & 0x3f)
+#define AIA_IREG_XLEN(__ireg) (((__ireg) >> 24) & 0xff)
+ int (*aia_ireg_rmw_fn[4])(void *arg, target_ulong reg,
+ target_ulong *val, target_ulong new_val, target_ulong write_mask);
+ void *aia_ireg_rmw_fn_arg[4];
+
/* True if in debugger mode. */
bool debugger;
@@ -397,6 +413,13 @@ uint32_t riscv_cpu_update_mip(RISCVCPU *cpu, uint32_t
mask, uint32_t value);
#define BOOL_TO_MASK(x) (-!!(x)) /* helper for riscv_cpu_update_mip value */
void riscv_cpu_set_rdtime_fn(CPURISCVState *env, uint64_t (*fn)(uint32_t),
uint32_t arg);
+void riscv_cpu_set_aia_ireg_rmw_fn(CPURISCVState *env, uint32_t priv,
+ int (*rmw_fn)(void *arg,
+ target_ulong reg,
+ target_ulong *val,
+ target_ulong new_val,
+ target_ulong write_mask),
+ void *rmw_fn_arg);
#endif
void riscv_cpu_set_mode(CPURISCVState *env, target_ulong newpriv);
diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index 43d6311e49..f94a36fa89 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -395,6 +395,20 @@ void riscv_cpu_set_rdtime_fn(CPURISCVState *env, uint64_t
(*fn)(uint32_t),
env->rdtime_fn_arg = arg;
}
+void riscv_cpu_set_aia_ireg_rmw_fn(CPURISCVState *env, uint32_t priv,
+ int (*rmw_fn)(void *arg,
+ target_ulong reg,
+ target_ulong *val,
+ target_ulong new_val,
+ target_ulong write_mask),
+ void *rmw_fn_arg)
+{
+ if (priv <= PRV_M) {
+ env->aia_ireg_rmw_fn[priv] = rmw_fn;
+ env->aia_ireg_rmw_fn_arg[priv] = rmw_fn_arg;
+ }
+}
+
void riscv_cpu_set_mode(CPURISCVState *env, target_ulong newpriv)
{
if (newpriv > PRV_M) {
--
2.25.1
- [PATCH v6 14/23] target/riscv: Implement AIA xiselect and xireg CSRs, (continued)
- [PATCH v6 14/23] target/riscv: Implement AIA xiselect and xireg CSRs, Anup Patel, 2021/12/30
- [PATCH v6 15/23] target/riscv: Implement AIA IMSIC interface CSRs, Anup Patel, 2021/12/30
- [PATCH v6 16/23] hw/riscv: virt: Use AIA INTC compatible string when available, Anup Patel, 2021/12/30
- [PATCH v6 17/23] target/riscv: Allow users to force enable AIA CSRs in HART, Anup Patel, 2021/12/30
- [PATCH v6 18/23] hw/intc: Add RISC-V AIA APLIC device emulation, Anup Patel, 2021/12/30
- [PATCH v6 19/23] hw/riscv: virt: Add optional AIA APLIC support to virt machine, Anup Patel, 2021/12/30
- [PATCH v6 20/23] hw/intc: Add RISC-V AIA IMSIC device emulation, Anup Patel, 2021/12/30
- [PATCH v6 21/23] hw/riscv: virt: Add optional AIA IMSIC support to virt machine, Anup Patel, 2021/12/30
- [PATCH v6 22/23] docs/system: riscv: Document AIA options for virt machine, Anup Patel, 2021/12/30
- [PATCH v6 23/23] hw/riscv: virt: Increase maximum number of allowed CPUs, Anup Patel, 2021/12/30
- [PATCH v6 08/23] target/riscv: Allow AIA device emulation to set ireg rmw callback,
Anup Patel <=