[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 16/22] hw/riscv: virt: Use AIA INTC compatible string when ava
|
From: |
Anup Patel |
|
Subject: |
[PATCH v4 16/22] hw/riscv: virt: Use AIA INTC compatible string when available |
|
Date: |
Tue, 26 Oct 2021 12:12:21 +0530 |
We should use the AIA INTC compatible string in the CPU INTC
DT nodes when the CPUs support AIA feature. This will allow
Linux INTC driver to use AIA local interrupt CSRs.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
hw/riscv/virt.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index b3b431c847..83f784bdee 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -211,8 +211,17 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int
socket,
qemu_fdt_add_subnode(mc->fdt, intc_name);
qemu_fdt_setprop_cell(mc->fdt, intc_name, "phandle",
intc_phandles[cpu]);
- qemu_fdt_setprop_string(mc->fdt, intc_name, "compatible",
- "riscv,cpu-intc");
+ if (riscv_feature(&s->soc[socket].harts[cpu].env,
+ RISCV_FEATURE_AIA)) {
+ static const char * const compat[2] = {
+ "riscv,cpu-intc-aia", "riscv,cpu-intc"
+ };
+ qemu_fdt_setprop_string_array(mc->fdt, name, "compatible",
+ (char **)&compat, ARRAY_SIZE(compat));
+ } else {
+ qemu_fdt_setprop_string(mc->fdt, intc_name, "compatible",
+ "riscv,cpu-intc");
+ }
qemu_fdt_setprop(mc->fdt, intc_name, "interrupt-controller", NULL, 0);
qemu_fdt_setprop_cell(mc->fdt, intc_name, "#interrupt-cells", 1);
--
2.25.1
- [PATCH v4 02/22] target/riscv: Implement SGEIP bit in hip and hie CSRs, (continued)
- [PATCH v4 02/22] target/riscv: Implement SGEIP bit in hip and hie CSRs, Anup Patel, 2021/10/26
- [PATCH v4 06/22] target/riscv: Add AIA cpu feature, Anup Patel, 2021/10/26
- [PATCH v4 08/22] target/riscv: Allow AIA device emulation to set ireg rmw callback, Anup Patel, 2021/10/26
- [PATCH v4 09/22] target/riscv: Implement AIA local interrupt priorities, Anup Patel, 2021/10/26
- [PATCH v4 11/22] target/riscv: Implement AIA hvictl and hviprioX CSRs, Anup Patel, 2021/10/26
- [PATCH v4 10/22] target/riscv: Implement AIA CSRs for 64 local interrupts on RV32, Anup Patel, 2021/10/26
- [PATCH v4 12/22] target/riscv: Implement AIA interrupt filtering CSRs, Anup Patel, 2021/10/26
- [PATCH v4 13/22] target/riscv: Implement AIA mtopi, stopi, and vstopi CSRs, Anup Patel, 2021/10/26
- [PATCH v4 14/22] target/riscv: Implement AIA xiselect and xireg CSRs, Anup Patel, 2021/10/26
- [PATCH v4 15/22] target/riscv: Implement AIA IMSIC interface CSRs, Anup Patel, 2021/10/26
- [PATCH v4 16/22] hw/riscv: virt: Use AIA INTC compatible string when available,
Anup Patel <=
- [PATCH v4 17/22] target/riscv: Allow users to force enable AIA CSRs in HART, Anup Patel, 2021/10/26
- [PATCH v4 18/22] hw/intc: Add RISC-V AIA APLIC device emulation, Anup Patel, 2021/10/26
- [PATCH v4 20/22] hw/intc: Add RISC-V AIA IMSIC device emulation, Anup Patel, 2021/10/26
- [PATCH v4 19/22] hw/riscv: virt: Add optional AIA APLIC support to virt machine, Anup Patel, 2021/10/26
- [PATCH v4 22/22] docs/system: riscv: Document AIA options for virt machine, Anup Patel, 2021/10/26
- [PATCH v4 21/22] hw/riscv: virt: Add optional AIA IMSIC support to virt machine, Anup Patel, 2021/10/26