qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Gerd Hoffmann <kraxel@redhat.com>
Subject: [PULL 16/20] pcie: implement slot power control for pcie root ports
Date: Mon, 15 Nov 2021 11:38:51 -0500	[thread overview]
Message-ID: <20211115163607.177432-17-mst@redhat.com> (raw)
In-Reply-To: <20211115163607.177432-1-mst@redhat.com>

From: Gerd Hoffmann <kraxel@redhat.com>

With this patch hot-plugged pci devices will only be visible to the
guest if the guests hotplug driver has enabled slot power.

This should fix the hot-plug race which one can hit when hot-plugging
a pci device at boot, while the guest is in the middle of the pci bus
scan.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20211111130859.1171890-3-kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/pci/pcie.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 914a9bf3d1..13d11a57c7 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -366,6 +366,29 @@ static void hotplug_event_clear(PCIDevice *dev)
     }
 }
 
+static void pcie_set_power_device(PCIBus *bus, PCIDevice *dev, void *opaque)
+{
+    bool *power = opaque;
+
+    pci_set_power(dev, *power);
+}
+
+static void pcie_cap_update_power(PCIDevice *hotplug_dev)
+{
+    uint8_t *exp_cap = hotplug_dev->config + hotplug_dev->exp.exp_cap;
+    PCIBus *sec_bus = pci_bridge_get_sec_bus(PCI_BRIDGE(hotplug_dev));
+    uint32_t sltcap = pci_get_long(exp_cap + PCI_EXP_SLTCAP);
+    uint16_t sltctl = pci_get_word(exp_cap + PCI_EXP_SLTCTL);
+    bool power = true;
+
+    if (sltcap & PCI_EXP_SLTCAP_PCP) {
+        power = (sltctl & PCI_EXP_SLTCTL_PCC) == PCI_EXP_SLTCTL_PWR_ON;
+    }
+
+    pci_for_each_device(sec_bus, pci_bus_num(sec_bus),
+                        pcie_set_power_device, &power);
+}
+
 /*
  * A PCI Express Hot-Plug Event has occurred, so update slot status register
  * and notify OS of the event if necessary.
@@ -434,6 +457,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
             pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA,
                                        PCI_EXP_LNKSTA_DLLLA);
         }
+        pcie_cap_update_power(hotplug_pdev);
         return;
     }
 
@@ -451,6 +475,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
         }
         pcie_cap_slot_event(hotplug_pdev,
                             PCI_EXP_HP_EV_PDC | PCI_EXP_HP_EV_ABP);
+        pcie_cap_update_power(hotplug_pdev);
     }
 }
 
@@ -625,6 +650,7 @@ void pcie_cap_slot_reset(PCIDevice *dev)
                                  PCI_EXP_SLTSTA_PDC |
                                  PCI_EXP_SLTSTA_ABP);
 
+    pcie_cap_update_power(dev);
     hotplug_event_update_event_status(dev);
 }
 
@@ -705,6 +731,7 @@ void pcie_cap_slot_write_config(PCIDevice *dev,
         pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA,
                                        PCI_EXP_SLTSTA_PDC);
     }
+    pcie_cap_update_power(dev);
 
     hotplug_event_notify(dev);
 
@@ -731,6 +758,7 @@ int pcie_cap_slot_post_load(void *opaque, int version_id)
 {
     PCIDevice *dev = opaque;
     hotplug_event_update_event_status(dev);
+    pcie_cap_update_power(dev);
     return 0;
 }
 
-- 
MST



  parent reply	other threads:[~2021-11-15 16:53 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-15 16:37 [PULL 00/20] pci,pc,virtio: bugfixes Michael S. Tsirkin
2021-11-15 16:37 ` [PULL 01/20] net/vhost-vdpa: fix memory leak in vhost_vdpa_get_max_queue_pairs() Michael S. Tsirkin
2021-11-15 16:37 ` [PULL 02/20] softmmu/qdev-monitor: fix use-after-free in qdev_set_id() Michael S. Tsirkin
2021-11-15 16:37 ` [PULL 03/20] vhost: Rename last_index to vq_index_end Michael S. Tsirkin
2021-11-15 16:37 ` [PULL 04/20] vhost: Fix last vq queue index of devices with no cvq Michael S. Tsirkin
2021-11-15 16:37 ` [PULL 05/20] hw/mem/pc-dimm: Restrict NUMA-specific code to NUMA machines Michael S. Tsirkin
2021-11-15 16:37 ` [PULL 06/20] pcie: rename 'native-hotplug' to 'x-native-hotplug' Michael S. Tsirkin
2021-11-15 16:38 ` [PULL 07/20] hw/acpi/ich9: Add compat prop to keep HPC bit set for 6.1 machine type Michael S. Tsirkin
2021-11-15 16:38 ` [PULL 08/20] bios-tables-test: Allow changes in DSDT ACPI tables Michael S. Tsirkin
2021-11-15 16:38 ` [PULL 09/20] hw/i386/acpi-build: Deny control on PCIe Native Hot-plug in _OSC Michael S. Tsirkin
2021-11-15 16:38 ` [PULL 10/20] tests: bios-tables-test update expected blobs Michael S. Tsirkin
2021-11-15 16:38 ` [PULL 11/20] virtio: use virtio accessor to access packed descriptor flags Michael S. Tsirkin
2021-11-15 16:38 ` [PULL 12/20] virtio: use virtio accessor to access packed event Michael S. Tsirkin
2021-11-15 16:38 ` [PULL 13/20] vdpa: Replace qemu_open_old by qemu_open at Michael S. Tsirkin
2021-11-15 16:38 ` [PULL 14/20] vdpa: Check for existence of opts.vhostdev Michael S. Tsirkin
2021-11-15 16:38 ` [PULL 15/20] pci: implement power state Michael S. Tsirkin
2021-11-15 16:38 ` Michael S. Tsirkin [this message]
2021-11-15 16:38 ` [PULL 17/20] pcie: add power indicator blink check Michael S. Tsirkin
2021-11-15 16:39 ` [PULL 18/20] pcie: factor out pcie_cap_slot_unplug() Michael S. Tsirkin
2021-11-15 16:39 ` [PULL 19/20] pcie: fast unplug when slot power is off Michael S. Tsirkin
2021-11-15 16:39 ` [PULL 20/20] pcie: expire pending delete Michael S. Tsirkin
2021-11-16 19:32   ` Igor Mammedov
2021-11-17  8:30     ` Gerd Hoffmann
2021-11-15 22:43 ` [PULL 00/20] pci,pc,virtio: bugfixes Philippe Mathieu-Daudé
2021-11-16  8:50   ` Richard Henderson
2021-11-16  8:55 ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211115163607.177432-17-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).