ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/ide/via: Wire up IDE legacy interrupts in host device 

Resolves circular depencency between IDE function and south bridge.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20230531211043.41724-3-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Bernhard Beschow 2023-05-31 23:10:38 +02:00 committed by Philippe Mathieu-Daudé
parent e2b84ee416
commit 68eadfa2c6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ide/via.c
View File

@ -31,6 +31,7 @@
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include "hw/isa/vt82c686.h" #include "hw/isa/vt82c686.h"
#include "hw/ide/pci.h" #include "hw/ide/pci.h"
#include "hw/irq.h"
#include "trace.h" #include "trace.h"
static uint64_t bmdma_read(void *opaque, hwaddr addr, static uint64_t bmdma_read(void *opaque, hwaddr addr,
@ -104,7 +105,8 @@ static void bmdma_setup_bar(PCIIDEState *d)
static void via_ide_set_irq(void *opaque, int n, int level) static void via_ide_set_irq(void *opaque, int n, int level)
{ {
PCIDevice *d = PCI_DEVICE(opaque); PCIIDEState *s = opaque;
PCIDevice *d = PCI_DEVICE(s);
if (level) { if (level) {
d->config[0x70 + n * 8] |= 0x80; d->config[0x70 + n * 8] |= 0x80;
@ -112,7 +114,7 @@ static void via_ide_set_irq(void *opaque, int n, int level)
d->config[0x70 + n * 8] &= ~0x80; d->config[0x70 + n * 8] &= ~0x80;
} }
via_isa_set_irq(pci_get_function_0(d), 14 + n, level); qemu_set_irq(s->isa_irq[n], level);
} }
static void via_ide_reset(DeviceState *dev) static void via_ide_reset(DeviceState *dev)

5
hw/isa/vt82c686.c
View File

@ -692,6 +692,10 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) { if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) {
return; return;
} }
for (i = 0; i < 2; i++) {
qdev_connect_gpio_out_named(DEVICE(&s->ide), "isa-irq", i,
s->isa_irqs_in[14 + i]);
}
/* Functions 2-3: USB Ports */ /* Functions 2-3: USB Ports */
for (i = 0; i < ARRAY_SIZE(s->uhci); i++) { for (i = 0; i < ARRAY_SIZE(s->uhci); i++) {
@ -814,6 +818,7 @@ static void vt8231_isa_reset(DeviceState *dev)
PCI_COMMAND_MASTER | PCI_COMMAND_SPECIAL); PCI_COMMAND_MASTER | PCI_COMMAND_SPECIAL);
pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM); pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM);
pci_conf[0x4c] = 0x04; /* IDE interrupt Routing */
pci_conf[0x58] = 0x40; /* Miscellaneous Control 0 */ pci_conf[0x58] = 0x40; /* Miscellaneous Control 0 */
pci_conf[0x67] = 0x08; /* Fast IR Config */ pci_conf[0x67] = 0x08; /* Fast IR Config */
pci_conf[0x6b] = 0x01; /* Fast IR I/O Base */ pci_conf[0x6b] = 0x01; /* Fast IR I/O Base */