| Message ID | 20240410222543.0EA534E6005@zero.eik.bme.hu |
|---|---|
| State | New |
| Headers | show |
| Series | hw/isa/vt82c686: Keep track of PIRQ/PINT pins separately | expand |
On 11/4/24 00:25, BALATON Zoltan wrote: > 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. > > Fixes: 7e01bd80c1 hw/isa/vt82c686: Bring back via_isa_set_irq() > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > --- > Preferably for 9.0 if there will be another RC. > > hw/isa/vt82c686.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 11/4/24 00:25, BALATON Zoltan wrote: > 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. > > Fixes: 7e01bd80c1 hw/isa/vt82c686: Bring back via_isa_set_irq() > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > --- > Preferably for 9.0 if there will be another RC. > > hw/isa/vt82c686.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Queued, thanks.
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index aa91942745..8582ac0322 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -658,7 +658,7 @@ void via_isa_set_irq(PCIDevice *d, int pin, int level) ViaISAState *s = VIA_ISA(pci_get_function_0(d)); uint8_t irq = d->config[PCI_INTERRUPT_LINE], max_irq = 15; int f = PCI_FUNC(d->devfn); - uint16_t mask = BIT(f); + uint16_t mask; switch (f) { case 0: /* PIRQ/PINT inputs */ @@ -673,6 +673,7 @@ void via_isa_set_irq(PCIDevice *d, int pin, int level) } /* Keep track of the state of all sources */ + mask = BIT(f); if (level) { s->irq_state[0] |= mask; } else {
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. Fixes: 7e01bd80c1 hw/isa/vt82c686: Bring back via_isa_set_irq() Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- Preferably for 9.0 if there will be another RC. hw/isa/vt82c686.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)