[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 7/7] Revert "hw/isa/vt82c686: Remove intermediate IRQ forwarde
From: |
BALATON Zoltan |
Subject: |
[PATCH v6 7/7] Revert "hw/isa/vt82c686: Remove intermediate IRQ forwarder" |
Date: |
Sat, 4 Mar 2023 15:48:25 +0100 (CET) |
This partially reverts commit bb98e0f59cde846666d9fddc60ae74ef7ddfca17
keeping the rename of a state field but reverting other cahanges which
break interrupts on pegasos2.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Tested-by: Rene Engel <ReneEngel80@emailn.de>
---
hw/isa/vt82c686.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 147ac78051..ec108d992b 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -598,6 +598,12 @@ void via_isa_set_irq(PCIDevice *d, int n, int level)
qemu_set_irq(s->isa_irqs_in[n], level);
}
+static void via_isa_request_i8259_irq(void *opaque, int irq, int level)
+{
+ ViaISAState *s = opaque;
+ qemu_set_irq(s->cpu_intr, level);
+}
+
static int via_isa_get_pci_irq(const ViaISAState *s, int irq_num)
{
switch (irq_num) {
@@ -639,10 +645,12 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
ViaISAState *s = VIA_ISA(d);
DeviceState *dev = DEVICE(d);
PCIBus *pci_bus = pci_get_bus(d);
+ qemu_irq *isa_irq;
ISABus *isa_bus;
int i;
qdev_init_gpio_out(dev, &s->cpu_intr, 1);
+ isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1);
isa_bus = isa_bus_new(dev, pci_address_space(d), pci_address_space_io(d),
errp);
@@ -650,7 +658,7 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
return;
}
- s->isa_irqs_in = i8259_init(isa_bus, s->cpu_intr);
+ s->isa_irqs_in = i8259_init(isa_bus, *isa_irq);
isa_bus_register_input_irqs(isa_bus, s->isa_irqs_in);
i8254_pit_init(isa_bus, 0x40, 0, NULL);
i8257_dma_init(isa_bus, 0);
--
2.30.8
- [PATCH v6 0/7] Pegasos2 fixes and audio output support, BALATON Zoltan, 2023/03/04
- [PATCH v6 1/7] hw/display/sm501: Add debug property to control pixman usage, BALATON Zoltan, 2023/03/04
- [PATCH v6 2/7] hw/intc/i8259: Implement legacy LTIM Edge/Level Bank Select, BALATON Zoltan, 2023/03/04
- [PATCH v6 3/7] hw/isa/vt82c686: Implement PCI IRQ routing, BALATON Zoltan, 2023/03/04
- [PATCH v6 5/7] hw/usb/vt82c686-uhci-pci: Use PCI IRQ routing, BALATON Zoltan, 2023/03/04
- [PATCH v6 7/7] Revert "hw/isa/vt82c686: Remove intermediate IRQ forwarder",
BALATON Zoltan <=
- [PATCH v6 4/7] hw/ppc/pegasos2: Fix PCI interrupt routing, BALATON Zoltan, 2023/03/04
- [PATCH v6 6/7] hw/audio/via-ac97: Basic implementation of audio playback, BALATON Zoltan, 2023/03/04