diff options
| author |   Jason Baron <jbaron@redhat.com> | 2012-09-04 16:22:46 -0400 |
|---|---|---|
| committer |   Doug Goldstein <cardoe@cardoe.com> | 2012-10-24 02:07:21 -0500 |
| commit | a9f3f483c3d2f0667fc7f7cccfd3f50402712456 (patch) | |
| tree | 26ec3027a6f79c2fca5e921608c62a2135f1591a | |
| parent | ahci: properly reset PxCMD on HBA reset (diff) | |
| download | qemu-kvm-a9f3f483c3d2f0667fc7f7cccfd3f50402712456.tar.gz qemu-kvm-a9f3f483c3d2f0667fc7f7cccfd3f50402712456.tar.bz2 qemu-kvm-a9f3f483c3d2f0667fc7f7cccfd3f50402712456.zip | |
pcie_aer: clear cmask for Advanced Error Interrupt Message Number
The Advanced Error Interrupt Message Number (bits 31:27 of the Root
Error Status Register) is updated when the number of msi messages assigned to a
device changes. Migration of windows 7 on q35 chipset failed because the check
in get_pci_config_device() fails due to cmask being set on these bits. Its valid
to update these bits and we must restore this state across migration.
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 0e180d9c8a7429c55d23d2e7855f1e490a063aaa)
| -rw-r--r-- | hw/pcie_aer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c index 3b6981c7b..b04c164e2 100644 --- a/hw/pcie_aer.c +++ b/hw/pcie_aer.c @@ -738,6 +738,11 @@ void pcie_aer_root_init(PCIDevice *dev) PCI_ERR_ROOT_CMD_EN_MASK); pci_set_long(dev->w1cmask + pos + PCI_ERR_ROOT_STATUS, PCI_ERR_ROOT_STATUS_REPORT_MASK); + /* PCI_ERR_ROOT_IRQ is RO but devices change it using a + * device-specific method. + */ + pci_set_long(dev->cmask + pos + PCI_ERR_ROOT_STATUS, + ~PCI_ERR_ROOT_IRQ); } void pcie_aer_root_reset(PCIDevice *dev) |