Re: [PATCH 05/16] hw/intc/sifive_plic: Take a MemoryRegion for the created device

[Daniel Henrique Barboza]

On 8/26/2026 7:05 PM, Joel Stanley wrote:

sifive_plic_create() maps the device it creates into system_memory,
which prevents its use by SoCs that map devices into their own memory
container.

Add a MemoryRegion parameter and map the device into it instead of
calling sysbus_mmio_map(). All callers pass system_memory, so there is
no change in behaviour.

Signed-off-by: Joel Stanley <j...@jms.id.au>
---

Reviewed-by: Daniel Henrique Barboza <daniel.barb...@oss.qualcomm.com>

  include/hw/intc/sifive_plic.h | 3 ++-
  hw/intc/sifive_plic.c         | 6 ++++--
  hw/riscv/k230.c               | 3 ++-
  hw/riscv/microchip_pfsoc.c    | 3 ++-
  hw/riscv/shakti_c.c           | 3 ++-
  hw/riscv/sifive_e.c           | 2 +-
  hw/riscv/sifive_u.c           | 3 ++-
  hw/riscv/virt.c               | 1 +
  8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/include/hw/intc/sifive_plic.h b/include/hw/intc/sifive_plic.h
index 32973dbf281e..13fe6b2909d2 100644
--- a/include/hw/intc/sifive_plic.h
+++ b/include/hw/intc/sifive_plic.h
@@ -76,7 +76,8 @@ struct SiFivePLICState {
      qemu_irq *s_external_irqs;
  };

-DeviceState *sifive_plic_create(hwaddr addr, char *hart_config,

+DeviceState *sifive_plic_create(MemoryRegion *mr, hwaddr addr,
+    char *hart_config,
      uint32_t num_harts,
      uint32_t hartid_base, uint32_t num_sources,
      uint32_t num_priorities, uint32_t priority_base,
diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c
index 9c84ff06a9fd..b6472443276b 100644
--- a/hw/intc/sifive_plic.c
+++ b/hw/intc/sifive_plic.c
@@ -473,7 +473,8 @@ type_init(sifive_plic_register_types)
  /*
   * Create PLIC device.
   */
-DeviceState *sifive_plic_create(hwaddr addr, char *hart_config,
+DeviceState *sifive_plic_create(MemoryRegion *mr, hwaddr addr,
+    char *hart_config,
      uint32_t num_harts,
      uint32_t hartid_base, uint32_t num_sources,
      uint32_t num_priorities, uint32_t priority_base,
@@ -499,7 +500,8 @@ DeviceState *sifive_plic_create(hwaddr addr, char 
*hart_config,
      qdev_prop_set_uint32(dev, "context-stride", context_stride);
      qdev_prop_set_uint32(dev, "aperture-size", aperture_size);
      sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
-    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, addr);
+    memory_region_add_subregion(mr, addr,
+        sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0));

plic = SIFIVE_PLIC(dev); diff --git a/hw/riscv/k230.c b/hw/riscv/k230.c

index 1ef4260c5391..6b0f0453c80b 100644
--- a/hw/riscv/k230.c
+++ b/hw/riscv/k230.c
@@ -134,7 +134,8 @@ static DeviceState *k230_create_plic(int base_hartid, int 
hartid_count)
      plic_hart_config = riscv_plic_hart_config_string(hartid_count);

/* Per-socket PLIC */

-    return sifive_plic_create(memmap[K230_DEV_PLIC].base,
+    return sifive_plic_create(get_system_memory(),
+                              memmap[K230_DEV_PLIC].base,
                                plic_hart_config, hartid_count, base_hartid,
                                K230_PLIC_NUM_SOURCES,
                                K230_PLIC_NUM_PRIORITIES,
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index a6026776d4de..1f6d9f5ae1ed 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -282,7 +282,8 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, 
Error **errp)
      plic_hart_config = riscv_plic_hart_config_string(ms->smp.cpus);

/* PLIC */

-    s->plic = sifive_plic_create(memmap[MICROCHIP_PFSOC_PLIC].base,
+    s->plic = sifive_plic_create(system_memory,
+        memmap[MICROCHIP_PFSOC_PLIC].base,
          plic_hart_config, ms->smp.cpus, 0,
          MICROCHIP_PFSOC_PLIC_NUM_SOURCES,
          MICROCHIP_PFSOC_PLIC_NUM_PRIORITIES,
diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
index 86ff8f8fcaab..62052bf7c61e 100644
--- a/hw/riscv/shakti_c.c
+++ b/hw/riscv/shakti_c.c
@@ -115,7 +115,8 @@ static void shakti_c_soc_state_realize(DeviceState *dev, 
Error **errp)

sysbus_realize(SYS_BUS_DEVICE(&sss->cpus), &error_abort); - sss->plic = sifive_plic_create(shakti_c_memmap[SHAKTI_C_PLIC].base,

+    sss->plic = sifive_plic_create(system_memory,
+        shakti_c_memmap[SHAKTI_C_PLIC].base,
          (char *)SHAKTI_C_PLIC_HART_CONFIG, ms->smp.cpus, 0,
          SHAKTI_C_PLIC_NUM_SOURCES,
          SHAKTI_C_PLIC_NUM_PRIORITIES,
diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index 0ea444f43bc5..81d7995ddcfb 100644
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -214,7 +214,7 @@ static void sifive_e_soc_realize(DeviceState *dev, Error 
**errp)
          memmap[SIFIVE_E_DEV_MROM].base, &s->mask_rom);

/* MMIO */

-    s->plic = sifive_plic_create(memmap[SIFIVE_E_DEV_PLIC].base,
+    s->plic = sifive_plic_create(sys_mem, memmap[SIFIVE_E_DEV_PLIC].base,
          (char *)SIFIVE_E_PLIC_HART_CONFIG, ms->smp.cpus, 0,
          SIFIVE_E_PLIC_NUM_SOURCES,
          SIFIVE_E_PLIC_NUM_PRIORITIES,
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 58b4744318f8..1cc6be744f08 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -772,7 +772,8 @@ static void sifive_u_soc_realize(DeviceState *dev, Error 
**errp)
      plic_hart_config = riscv_plic_hart_config_string(ms->smp.cpus);

/* MMIO */

-    s->plic = sifive_plic_create(memmap[SIFIVE_U_DEV_PLIC].base,
+    s->plic = sifive_plic_create(system_memory,
+        memmap[SIFIVE_U_DEV_PLIC].base,
          plic_hart_config, ms->smp.cpus, 0,
          SIFIVE_U_PLIC_NUM_SOURCES,
          SIFIVE_U_PLIC_NUM_PRIORITIES,
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 6e4b39315aaa..6d061a80ca9e 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -1138,6 +1138,7 @@ static DeviceState *virt_create_plic(const MemMapEntry 
*memmap, int socket,

/* Per-socket PLIC */

      return sifive_plic_create(
+             get_system_memory(),
               memmap[VIRT_PLIC].base + socket * memmap[VIRT_PLIC].size,
               plic_hart_config, hart_count, base_hartid,
               VIRT_IRQCHIP_NUM_SOURCES,