999512f123
- vdpa: suspend function return 0 when the vdpa device is stopped - vdpa: don't suspend/resume device when vdpa device not started - vdpa: support vdpa device suspend/resume - vdpa: correct param passed in when unregister save - vdpa: set vring enable only if the vring address has already been set - shadow_dev: introduce shadow dev for virtio-net device - revert "tcg/loongarch64: Fix tcg_out_mov() Aborted" - migration: Set downtime_start even for postcopy - gdb-xml: fix duplicate register in arm-neon.xml - iotests: fix default machine type detection - migration: fix RAMBlock add NULL check - s390x: Fix spelling errors - ppc: spelling fixes - hw/scsi/vhost-scsi: don't double close vhostfd on error - virtio/vhost-vsock: don't double close vhostfd, remove redundant cleanup - hw/scsi/vhost-scsi: don't leak vqs on error - hw/i386/pc: Add missing property descriptions - pcie_aer: Don't trigger a LSI if none are defined - pci: Export the pci_intx() function - hw/qdev: Cosmetic around documentation - tests/unit: fix a -Wformat-truncation warning - tests/avocado: mark ReplayKernelNormal.test_mips64el_malta as flaky - i386/sev: Avoid SEV-ES crash due to missing MSR_EFER_LMA bit - ui/vnc-clipboard: fix inflate_buffer - hw/usb/hcd-xhci.c: spelling: tranfer Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 68fee7dc06a6beb5f69d951e22a7f16091f269ff)
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 77633ce67c1cff764fe4951a6837462f51ace8aa Mon Sep 17 00:00:00 2001
|
|
From: boringandboring <wangjinlei_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 7 Dec 2023 17:00:28 +0800
|
|
Subject: [PATCH] pcie_aer: Don't trigger a LSI if none are defined
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cherry picked from 20766514d602c50b870ae943aaa8e5b9e2e8a161
|
|
|
|
Skip triggering an LSI when the AER root error status is updated if no
|
|
LSI is defined for the device. We can have a root bridge with no LSI,
|
|
MSI and MSI-X defined, for example on POWER systems.
|
|
|
|
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
|
|
Message-Id: <20211116170133.724751-4-fbarrat@linux.ibm.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Reviewed-by: Cédric Le Goater <clg@kaod.org>
|
|
Signed-off-by: boringandboring <wangjinlei_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/pci/pcie_aer.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
|
|
index 27f9cc56af..e1a8a88c8c 100644
|
|
--- a/hw/pci/pcie_aer.c
|
|
+++ b/hw/pci/pcie_aer.c
|
|
@@ -774,7 +774,9 @@ void pcie_aer_root_write_config(PCIDevice *dev,
|
|
uint32_t root_cmd = pci_get_long(aer_cap + PCI_ERR_ROOT_COMMAND);
|
|
/* 6.2.4.1.2 Interrupt Generation */
|
|
if (!msix_enabled(dev) && !msi_enabled(dev)) {
|
|
- pci_set_irq(dev, !!(root_cmd & enabled_cmd));
|
|
+ if (pci_intx(dev) != -1) {
|
|
+ pci_set_irq(dev, !!(root_cmd & enabled_cmd));
|
|
+ }
|
|
return;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|