qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <ani@anisinha.ca>,
	Peter Maydell <peter.maydell@linaro.org>,
	Igor Mammedov <imammedo@redhat.com>
Subject: [PULL 38/45] acpi: pcihp: pcie: set power on cap on parent slot
Date: Fri, 4 Mar 2022 08:42:10 -0500	[thread overview]
Message-ID: <20220304133556.233983-39-mst@redhat.com> (raw)
In-Reply-To: <20220304133556.233983-1-mst@redhat.com>

From: Igor Mammedov <imammedo@redhat.com>

on creation a PCIDevice has power turned on at the end of pci_qdev_realize()
however later on if PCIe slot isn't populated with any children
it's power is turned off. It's fine if native hotplug is used
as plug callback will power slot on among other things.
However when ACPI hotplug is enabled it replaces native PCIe plug
callbacks with ACPI specific ones (acpi_pcihp_device_*plug_cb) and
as result slot stays powered off. It works fine as ACPI hotplug
on guest side takes care of enumerating/initializing hotplugged
device. But when later guest is migrated, call chain introduced by]
commit d5daff7d312 (pcie: implement slot power control for pcie root ports)

   pcie_cap_slot_post_load()
       -> pcie_cap_update_power()
           -> pcie_set_power_device()
               -> pci_set_power()
                   -> pci_update_mappings()

will disable earlier initialized BARs for the hotplugged device
in powered off slot due to commit 23786d13441 (pci: implement power state)
which disables BARs if power is off.

Fix it by setting PCI_EXP_SLTCTL_PCC to PCI_EXP_SLTCTL_PWR_ON
on slot (root port/downstream port) at the time a device
hotplugged into it. As result PCI_EXP_SLTCTL_PWR_ON is migrated
to target and above call chain keeps device plugged into it
powered on.

Fixes: d5daff7d312 ("pcie: implement slot power control for pcie root ports")
Fixes: 23786d13441 ("pci: implement power state")
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2053584
Suggested-by: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20220301151200.3507298-3-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/hw/pci/pcie.h |  1 +
 hw/acpi/pcihp.c       | 12 +++++++++++-
 hw/pci/pcie.c         | 11 +++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
index 168950a83b..798a262a0a 100644
--- a/include/hw/pci/pcie.h
+++ b/include/hw/pci/pcie.h
@@ -118,6 +118,7 @@ void pcie_cap_slot_write_config(PCIDevice *dev,
                                 uint32_t addr, uint32_t val, int len);
 int pcie_cap_slot_post_load(void *opaque, int version_id);
 void pcie_cap_slot_push_attention_button(PCIDevice *dev);
+void pcie_cap_slot_enable_power(PCIDevice *dev);
 
 void pcie_cap_root_init(PCIDevice *dev);
 void pcie_cap_root_reset(PCIDevice *dev);
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index 6befd23e16..6351bd3424 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -32,6 +32,7 @@
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pcie_port.h"
+#include "hw/pci-bridge/xio3130_downstream.h"
 #include "hw/i386/acpi-build.h"
 #include "hw/acpi/acpi.h"
 #include "hw/pci/pci_bus.h"
@@ -336,6 +337,8 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s,
 {
     PCIDevice *pdev = PCI_DEVICE(dev);
     int slot = PCI_SLOT(pdev->devfn);
+    PCIDevice *bridge;
+    PCIBus *bus;
     int bsel;
 
     /* Don't send event when device is enabled during qemu machine creation:
@@ -365,7 +368,14 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s,
         return;
     }
 
-    bsel = acpi_pcihp_get_bsel(pci_get_bus(pdev));
+    bus = pci_get_bus(pdev);
+    bridge = pci_bridge_get_device(bus);
+    if (object_dynamic_cast(OBJECT(bridge), TYPE_PCIE_ROOT_PORT) ||
+        object_dynamic_cast(OBJECT(bridge), TYPE_XIO3130_DOWNSTREAM)) {
+        pcie_cap_slot_enable_power(bridge);
+    }
+
+    bsel = acpi_pcihp_get_bsel(bus);
     g_assert(bsel >= 0);
     s->acpi_pcihp_pci_status[bsel].up |= (1U << slot);
     acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS);
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 3c44204cf3..67a5d67372 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -366,6 +366,17 @@ static void hotplug_event_clear(PCIDevice *dev)
     }
 }
 
+void pcie_cap_slot_enable_power(PCIDevice *dev)
+{
+    uint8_t *exp_cap = dev->config + dev->exp.exp_cap;
+    uint32_t sltcap = pci_get_long(exp_cap + PCI_EXP_SLTCAP);
+
+    if (sltcap & PCI_EXP_SLTCAP_PCP) {
+        pci_set_word_by_mask(exp_cap + PCI_EXP_SLTCTL,
+                             PCI_EXP_SLTCTL_PCC, PCI_EXP_SLTCTL_PWR_ON);
+    }
+}
+
 static void pcie_set_power_device(PCIBus *bus, PCIDevice *dev, void *opaque)
 {
     bool *power = opaque;
-- 
MST



  parent reply	other threads:[~2022-03-04 14:30 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-04 13:36 [PULL 00/45] virtio,pc,pci: features, cleanups, fixes Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 01/45] qom: assert integer does not overflow Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 02/45] ACPI ERST: specification for ERST support Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 03/45] MAINTAINERS: no need to add my name explicitly as a reviewer for VIOT tables Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 04/45] docs/acpi/erst: add device id for ACPI ERST device in pci-ids.txt Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 05/45] hw/acpi/erst: clean up unused IS_UEFI_CPER_RECORD macro Michael S. Tsirkin
2022-03-04 13:37 ` [PULL 06/45] hw/smbios: code cleanup - use macro definitions for table header handles Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 07/45] hw/smbios: fix overlapping table handle numbers with large memory vms Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 08/45] hw/smbios: add assertion to ensure handles of tables 19 and 32 do not collide Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 09/45] vhost-user: remove VirtQ notifier restore Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 10/45] vhost-user: fix VirtQ notifier cleanup Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 11/45] virtio: fix the condition for iommu_platform not supported Michael S. Tsirkin
2022-03-04 13:38 ` [PULL 12/45] hw/vhost-user-i2c: Add support for VIRTIO_I2C_F_ZERO_LENGTH_REQUEST Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 13/45] tests/qtest/libqos/pci: Introduce pio_limit Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 14/45] tests/qtest/libqos: Skip hotplug tests if pci root bus is not hotpluggable Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 15/45] tests/qtest/vhost-user-blk-test: Temporary hack to get tests passing on aarch64 Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 16/45] tests/qtest/libqos: Add generic pci host bridge in arm-virt machine Michael S. Tsirkin
2022-03-07 10:02   ` Michael S. Tsirkin
2022-03-07 11:07     ` Eric Auger
2022-03-04 13:39 ` [PULL 17/45] hw/virtio: vdpa: Fix leak of host-notifier memory-region Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 18/45] vhost-vdpa: make notifiers _init()/_uninit() symmetric Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 19/45] intel_iommu: support snoop control Michael S. Tsirkin
2022-03-04 13:39 ` [PULL 20/45] hw/i386: Improve bounds checking in OVMF table parsing Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 21/45] hw/i386: Replace magic number with field length calculation Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 22/45] virtio-iommu: Default to bypass during boot Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 23/45] virtio-iommu: Support bypass domain Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 24/45] tests/qtest/virtio-iommu-test: Check bypass config Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 25/45] hw/i386/pc_piix: Mark the machine types from version 1.4 to 1.7 as deprecated Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 26/45] hw/pci-bridge/pxb: Fix missing swizzle Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 27/45] virtio-net: Unlimit tx queue size if peer is vdpa Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 28/45] pcie: Add support for Single Root I/O Virtualization (SR/IOV) Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 29/45] pcie: Add some SR/IOV API documentation in docs/pcie_sriov.txt Michael S. Tsirkin
2022-03-04 13:40 ` [PULL 30/45] pcie: Add a helper to the SR/IOV API Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 31/45] pcie: Add 1.2 version token for the Power Management Capability Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 32/45] pci-bridge/xio3130_upstream: Fix error handling Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 33/45] pci-bridge/xio3130_downstream: " Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 34/45] headers: Add pvpanic.h Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 35/45] hw/misc/pvpanic: Use standard headers instead Michael S. Tsirkin
2022-03-04 13:41 ` [PULL 36/45] pci: show id info when pci BDF conflict Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 37/45] pci: expose TYPE_XIO3130_DOWNSTREAM name Michael S. Tsirkin
2022-03-04 13:42 ` Michael S. Tsirkin [this message]
2022-03-04 13:42 ` [PULL 39/45] pc: add option to disable PS/2 mouse/keyboard Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 40/45] vhost-vsock: detach the virqueue element in case of error Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 41/45] x86: cleanup unused compat_apic_id_mode Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 42/45] event_notifier: add event_notifier_get_wfd() Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 43/45] vhost: use wfd on functions setting vring call fd Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 44/45] configure, meson: allow enabling vhost-user on all POSIX systems Michael S. Tsirkin
2022-03-04 13:42 ` [PULL 45/45] docs: vhost-user: add subsection for non-Linux platforms Michael S. Tsirkin
2022-03-04 22:13 ` [PULL 00/45] virtio,pc,pci: features, cleanups, fixes Peter Maydell
2022-03-06 10:37   ` Michael S. Tsirkin
2022-03-07 10:48   ` Eric Auger
2022-03-07 11:55     ` Peter Maydell

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=20220304133556.233983-39-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=ani@anisinha.ca \
    --cc=imammedo@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).