[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/8] hw/pci-host/bonito: Sysbus'ify outgoing IRQ
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 6/8] hw/pci-host/bonito: Sysbus'ify outgoing IRQ |
Date: |
Thu, 5 Jan 2023 14:07:08 +0100 |
Since TYPE_BONITO_PCI_HOST_BRIDGE inherits the TYPE_SYSBUS
interface, use its API the manage the outgoing IRQ.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/pci-host/bonito.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 7722636e9e..5f777f95bd 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -233,7 +233,7 @@ typedef struct PCIBonitoState PCIBonitoState;
struct BonitoState {
PCIHostState parent_obj;
- qemu_irq *pic;
+ qemu_irq irq;
PCIBonitoState *pci_dev;
MemoryRegion pci_mem;
};
@@ -556,17 +556,16 @@ static const MemoryRegionOps bonito_spciconf_ops = {
static void pci_bonito_set_irq(void *opaque, int irq_num, int level)
{
BonitoState *s = opaque;
- qemu_irq *pic = s->pic;
PCIBonitoState *bonito_state = s->pci_dev;
int internal_irq = irq_num - BONITO_IRQ_BASE;
if (bonito_state->regs[BONITO_INTEDGE] & (1 << internal_irq)) {
- qemu_irq_pulse(*pic);
+ qemu_irq_pulse(s->irq);
} else { /* level triggered */
if (bonito_state->regs[BONITO_INTPOL] & (1 << internal_irq)) {
- qemu_irq_raise(*pic);
+ qemu_irq_raise(s->irq);
} else {
- qemu_irq_lower(*pic);
+ qemu_irq_lower(s->irq);
}
}
}
@@ -633,6 +632,7 @@ static void bonito_host_realize(DeviceState *dev, Error
**errp)
BonitoState *bs = BONITO_PCI_HOST_BRIDGE(dev);
MemoryRegion *pcimem_lo_alias = g_new(MemoryRegion, 3);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &bs->irq);
memory_region_init(&bs->pci_mem, OBJECT(dev), "pci.mem",
BONITO_PCIHI_SIZE);
phb->bus = pci_register_root_bus(dev, "pci",
pci_bonito_set_irq, pci_bonito_map_irq,
@@ -755,15 +755,14 @@ static void bonito_pci_realize(PCIDevice *dev, Error
**errp)
PCIBus *bonito_init(qemu_irq *pic)
{
DeviceState *dev;
- BonitoState *pcihost;
PCIHostState *phb;
dev = qdev_new(TYPE_BONITO_PCI_HOST_BRIDGE);
phb = PCI_HOST_BRIDGE(dev);
- pcihost = BONITO_PCI_HOST_BRIDGE(dev);
- pcihost->pic = pic;
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, *pic);
+
return phb->bus;
}
--
2.38.1
- [PATCH 3/8] hw/pci-host/bonito: Use 'bonito_pci' for PCI function #0 code, (continued)
- [PATCH 3/8] hw/pci-host/bonito: Use 'bonito_pci' for PCI function #0 code, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 4/8] hw/pci-host/bonito: Set reference using object_property_add_const_link(), Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 8/8] hw/mips/fuloong2e: Open code bonito_init(), Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 5/8] hw/pci-host/bonito: Create PCI function #0 in bridge realize() handler, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 7/8] hw/pci-host/bonito: Declare TYPE_BONITO_PCI_HOST_BRIDGE in header, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 6/8] hw/pci-host/bonito: Sysbus'ify outgoing IRQ,
Philippe Mathieu-Daudé <=
- Re: [PATCH 0/8] hw/pci-host/bonito: Housekeeping, Philippe Mathieu-Daudé, 2023/01/13