[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/7] pci: Honour wmask when resetting PCI_INTERRUPT_LINE
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 3/7] pci: Honour wmask when resetting PCI_INTERRUPT_LINE |
Date: |
Fri, 13 Mar 2020 08:24:40 +0000 |
From: BALATON Zoltan <address@hidden>
The pci_do_device_reset() function (called from pci_device_reset)
clears the PCI_INTERRUPT_LINE config reg of devices on the bus but did
this without taking wmask into account. We'll have a device model now
that needs to set a constant value for this reg and this patch allows
to do that without additional workaround in device emulation to
reverse the effect of this PCI bus reset function.
Suggested-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
---
hw/pci/pci.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index e1ed6677e1..b5bc842fac 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -302,8 +302,11 @@ static void pci_do_device_reset(PCIDevice *dev)
pci_word_test_and_clear_mask(dev->config + PCI_STATUS,
pci_get_word(dev->wmask + PCI_STATUS) |
pci_get_word(dev->w1cmask + PCI_STATUS));
+ /* Some devices make bits of PCI_INTERRUPT_LINE read only */
+ pci_byte_test_and_clear_mask(dev->config + PCI_INTERRUPT_LINE,
+ pci_get_word(dev->wmask + PCI_INTERRUPT_LINE) |
+ pci_get_word(dev->w1cmask + PCI_INTERRUPT_LINE));
dev->config[PCI_CACHE_LINE_SIZE] = 0x0;
- dev->config[PCI_INTERRUPT_LINE] = 0x0;
for (r = 0; r < PCI_NUM_REGIONS; ++r) {
PCIIORegion *region = &dev->io_regions[r];
if (!region->size) {
--
2.20.1
- [PATCH 0/7] via-ide: fixes and improvements, Mark Cave-Ayland, 2020/03/13
- [PATCH 1/7] via-ide: move registration of VMStateDescription to DeviceClass, Mark Cave-Ayland, 2020/03/13
- [PATCH 2/7] ide/via: Get rid of via_ide_init(), Mark Cave-Ayland, 2020/03/13
- [PATCH 3/7] pci: Honour wmask when resetting PCI_INTERRUPT_LINE,
Mark Cave-Ayland <=
- [PATCH 4/7] via-ide: ensure that PCI_INTERRUPT_LINE is hard-wired to its default value, Mark Cave-Ayland, 2020/03/13
- [PATCH 5/7] via-ide: initialise IDE controller in legacy mode, Mark Cave-Ayland, 2020/03/13
- [PATCH 6/7] via-ide: allow guests to write to PCI_CLASS_PROG, Mark Cave-Ayland, 2020/03/13
- [PATCH 7/7] via-ide: always use legacy IRQ 14/15 routing, Mark Cave-Ayland, 2020/03/13
- Re: [PATCH 0/7] via-ide: fixes and improvements, BALATON Zoltan, 2020/03/13
- Re: [EXTERNAL][PATCH 0/7] via-ide: fixes and improvements, Aleksandar Markovic, 2020/03/13
- Re: [PATCH 0/7] via-ide: fixes and improvements, John Snow, 2020/03/13