mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-09-02 23:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

hw/isa/vt82c686: Keep track of PIRQ/PINT pins separately

Browse Source 
Move calculation of mask after the switch which sets the function
number for PIRQ/PINT pins to make sure the state of these pins are
kept track of separately and IRQ is raised if any of them is active.

Cc: qemu-stable@nongnu.org
Fixes: 7e01bd80c1 hw/isa/vt82c686: Bring back via_isa_set_irq()
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240410222543.0EA534E6005@zero.eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
(cherry picked from commit f33274265a)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
BALATON Zoltan
2024-04-11 00:25:43 +02:00
committed by Michael Tokarev
parent fcbb086ae5
commit dd784cb65d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hw/isa/vt82c686.c
View File

@ -613,7 +613,7 @@ void via_isa_set_irq(PCIDevice *d, int pin, int level)
ViaISAState *s = VIA_ISA(pci_get_function_0(d)); ViaISAState *s = VIA_ISA(pci_get_function_0(d));
uint8_t irq = d->config[PCI_INTERRUPT_LINE], max_irq = 15; uint8_t irq = d->config[PCI_INTERRUPT_LINE], max_irq = 15;
int f = PCI_FUNC(d->devfn); int f = PCI_FUNC(d->devfn);
uint16_t mask = BIT(f); uint16_t mask;
switch (f) { switch (f) {
case 0: /* PIRQ/PINT inputs */ case 0: /* PIRQ/PINT inputs */
@ -628,6 +628,7 @@ void via_isa_set_irq(PCIDevice *d, int pin, int level)
} }
/* Keep track of the state of all sources */ /* Keep track of the state of all sources */
mask = BIT(f);
if (level) { if (level) {
s->irq_state[0] |= mask; s->irq_state[0] |= mask;
} else { } else {