7e5f6fca0d
- target/i386: Export RFDS bit to guests - target/i386: Add new CPU model SierraForest - target/i386: Introduce Icelake-Server-v7 to enable TSX - hw/isa/vt82c686: Keep track of PIRQ/PINT pins separately - kvm/arm: Fix compatibility of cold-plug CPU with SVE - arm/virt/acpi: Extend cpufreq to support max_cpus - kvm/arm: Fix SVE related logic for vcpu hotplug feature - arm/virt: Don't modify smp.max_cpus when vcpu hotplug disabled - acpi/cpu: Fix detection of present cpu Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 74817cbc4ccb4e3b0f6d7b464b5707d3fbc5f686 Mon Sep 17 00:00:00 2001
|
|
From: qihao <qihao_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 23 Apr 2024 10:40:32 +0800
|
|
Subject: [PATCH] hw/isa/vt82c686: Keep track of PIRQ/PINT pins separately
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cheery-pick from f33274265a242df5d9fdb00915fe72fbb1b2a3c4
|
|
|
|
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>
|
|
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/isa/vt82c686.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
|
|
index 9c2333a277..0334431219 100644
|
|
--- a/hw/isa/vt82c686.c
|
|
+++ b/hw/isa/vt82c686.c
|
|
@@ -613,7 +613,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 */
|
|
@@ -628,6 +628,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 {
|
|
--
|
|
2.27.0
|
|
|