78 lines
3.1 KiB
Diff
78 lines
3.1 KiB
Diff
|
From fe8a9f211fba3588d60507b3d2f48c41d8ee3c79 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Julia Suvorova <jusual@redhat.com>
|
||
|
|
Date: Mon, 4 May 2020 21:25:04 +0100
|
||
|
|
Subject: [PATCH 1/9] hw/pci/pcie: Forbid hot-plug if it's disabled on the slot
|
||
|
|
|
||
|
|
RH-Author: Julia Suvorova <jusual@redhat.com>
|
||
|
|
Message-id: <20200504212505.15977-2-jusual@redhat.com>
|
||
|
|
Patchwork-id: 96257
|
||
|
|
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 1/2] hw/pci/pcie: Forbid hot-plug if it's disabled on the slot
|
||
|
|
Bugzilla: 1820531
|
||
|
|
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
||
|
|
|
||
|
|
Raise an error when trying to hot-plug/unplug a device through QMP to a device
|
||
|
|
with disabled hot-plug capability. This makes the device behaviour more
|
||
|
|
consistent and provides an explanation of the failure in the case of
|
||
|
|
asynchronous unplug.
|
||
|
|
|
||
|
|
Signed-off-by: Julia Suvorova <jusual@redhat.com>
|
||
|
|
Message-Id: <20200427182440.92433-2-jusual@redhat.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
|
||
|
|
(cherry picked from commit 0501e1aa1d32a6e02dd06a79bba97fbe9d557cb5)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/pci/pcie.c | 19 +++++++++++++++++++
|
||
|
|
1 file changed, 19 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
|
||
|
|
index 0eb3a2a..6b48d04 100644
|
||
|
|
--- a/hw/pci/pcie.c
|
||
|
|
+++ b/hw/pci/pcie.c
|
||
|
|
@@ -415,6 +415,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||
|
|
{
|
||
|
|
PCIDevice *hotplug_pdev = PCI_DEVICE(hotplug_dev);
|
||
|
|
uint8_t *exp_cap = hotplug_pdev->config + hotplug_pdev->exp.exp_cap;
|
||
|
|
+ uint32_t sltcap = pci_get_word(exp_cap + PCI_EXP_SLTCAP);
|
||
|
|
PCIDevice *pci_dev = PCI_DEVICE(dev);
|
||
|
|
|
||
|
|
/* Don't send event when device is enabled during qemu machine creation:
|
||
|
|
@@ -430,6 +431,13 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /* Check if hot-plug is disabled on the slot */
|
||
|
|
+ if ((sltcap & PCI_EXP_SLTCAP_HPC) == 0) {
|
||
|
|
+ error_setg(errp, "Hot-plug failed: unsupported by the port device '%s'",
|
||
|
|
+ DEVICE(hotplug_pdev)->id);
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/* To enable multifunction hot-plug, we just ensure the function
|
||
|
|
* 0 added last. When function 0 is added, we set the sltsta and
|
||
|
|
* inform OS via event notification.
|
||
|
|
@@ -470,6 +478,17 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,
|
||
|
|
Error *local_err = NULL;
|
||
|
|
PCIDevice *pci_dev = PCI_DEVICE(dev);
|
||
|
|
PCIBus *bus = pci_get_bus(pci_dev);
|
||
|
|
+ PCIDevice *hotplug_pdev = PCI_DEVICE(hotplug_dev);
|
||
|
|
+ uint8_t *exp_cap = hotplug_pdev->config + hotplug_pdev->exp.exp_cap;
|
||
|
|
+ uint32_t sltcap = pci_get_word(exp_cap + PCI_EXP_SLTCAP);
|
||
|
|
+
|
||
|
|
+ /* Check if hot-unplug is disabled on the slot */
|
||
|
|
+ if ((sltcap & PCI_EXP_SLTCAP_HPC) == 0) {
|
||
|
|
+ error_setg(errp, "Hot-unplug failed: "
|
||
|
|
+ "unsupported by the port device '%s'",
|
||
|
|
+ DEVICE(hotplug_pdev)->id);
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
pcie_cap_slot_plug_common(PCI_DEVICE(hotplug_dev), dev, &local_err);
|
||
|
|
if (local_err) {
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|