All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Alex Williamson <alex.williamson@redhat.com>,
	Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
	Geoffrey McRae <geoff@hostfission.com>,
	Eric Auger <eric.auger@redhat.com>
Subject: [Qemu-devel] [PULL 11/31] pci: Sync PCIe downstream port LNKSTA on read
Date: Mon, 17 Dec 2018 23:17:25 -0500	[thread overview]
Message-ID: <20181218041625.24969-12-mst@redhat.com> (raw)
In-Reply-To: <20181218041625.24969-1-mst@redhat.com>

From: Alex Williamson <alex.williamson@redhat.com>

The PCIe link speed and width between a downstream device and its
upstream port is negotiated on real hardware and susceptible to
dynamic changes due to signal issues and power management.  In the
emulated device case there is no real hardware link, but we still
might wish to have some consistency between endpoint and downstream
port via a virtual negotiation.  There is of course a real link for
assigned devices and this same virtual negotiation allows the
downstream port to match the endpoint, synchronizing on every read
to support underlying physical hardware dynamically adjusting the
link.

This negotiation is intentionally unidirectional for compatibility.
If the endpoint exceeds the capabilities of the downstream port or
there is no endpoint device, the downstream port reports negotiation
to its maximum speed and width, matching the previous case where
negotiation was absent.  De-tuning the endpoint to match a virtual
link doesn't seem to benefit anyone and is a condition we've thus
far reported without functional issues.

Note that PCI_EXP_LNKSTA is already ignored for migration
compatibility via pcie_cap_v1_fill().

Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Tested-by: Geoffrey McRae <geoff@hostfission.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/hw/pci/pci.h  | 13 +++++++++++++
 include/hw/pci/pcie.h |  1 +
 hw/pci/pci.c          |  4 ++++
 hw/pci/pcie.c         | 39 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+)

diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index e6514bba23..eb12fa112e 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -737,6 +737,19 @@ static inline int pci_is_express(const PCIDevice *d)
     return d->cap_present & QEMU_PCI_CAP_EXPRESS;
 }
 
+static inline int pci_is_express_downstream_port(const PCIDevice *d)
+{
+    uint8_t type;
+
+    if (!pci_is_express(d) || !d->exp.exp_cap) {
+        return 0;
+    }
+
+    type = pcie_cap_get_type(d);
+
+    return type == PCI_EXP_TYPE_DOWNSTREAM || type == PCI_EXP_TYPE_ROOT_PORT;
+}
+
 static inline uint32_t pci_config_size(const PCIDevice *d)
 {
     return pci_is_express(d) ? PCIE_CONFIG_SPACE_SIZE : PCI_CONFIG_SPACE_SIZE;
diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
index b71e369703..1976909ab4 100644
--- a/include/hw/pci/pcie.h
+++ b/include/hw/pci/pcie.h
@@ -126,6 +126,7 @@ uint16_t pcie_find_capability(PCIDevice *dev, uint16_t cap_id);
 void pcie_add_capability(PCIDevice *dev,
                          uint16_t cap_id, uint8_t cap_ver,
                          uint16_t offset, uint16_t size);
+void pcie_sync_bridge_lnk(PCIDevice *dev);
 
 void pcie_ari_init(PCIDevice *dev, uint16_t offset, uint16_t nextfn);
 void pcie_dev_ser_num_init(PCIDevice *dev, uint16_t offset, uint64_t ser_num);
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index efb5ce196f..d831fa0a36 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1353,6 +1353,10 @@ uint32_t pci_default_read_config(PCIDevice *d,
 {
     uint32_t val = 0;
 
+    if (pci_is_express_downstream_port(d) &&
+        ranges_overlap(address, len, d->exp.exp_cap + PCI_EXP_LNKSTA, 2)) {
+        pcie_sync_bridge_lnk(d);
+    }
     memcpy(&val, d->config + address, len);
     return le32_to_cpu(val);
 }
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index aef84c665b..6891deb711 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -741,6 +741,45 @@ void pcie_add_capability(PCIDevice *dev,
     memset(dev->cmask + offset, 0xFF, size);
 }
 
+/*
+ * Sync the PCIe Link Status negotiated speed and width of a bridge with the
+ * downstream device.  If downstream device is not present, re-write with the
+ * Link Capability fields.  Limit width and speed to bridge capabilities for
+ * compatibility.  Use config_read to access the downstream device since it
+ * could be an assigned device with volatile link information.
+ */
+void pcie_sync_bridge_lnk(PCIDevice *bridge_dev)
+{
+    PCIBridge *br = PCI_BRIDGE(bridge_dev);
+    PCIBus *bus = pci_bridge_get_sec_bus(br);
+    PCIDevice *target = bus->devices[0];
+    uint8_t *exp_cap = bridge_dev->config + bridge_dev->exp.exp_cap;
+    uint16_t lnksta, lnkcap = pci_get_word(exp_cap + PCI_EXP_LNKCAP);
+
+    if (!target || !target->exp.exp_cap) {
+        lnksta = lnkcap;
+    } else {
+        lnksta = target->config_read(target,
+                                     target->exp.exp_cap + PCI_EXP_LNKSTA,
+                                     sizeof(lnksta));
+
+        if ((lnksta & PCI_EXP_LNKSTA_NLW) > (lnkcap & PCI_EXP_LNKCAP_MLW)) {
+            lnksta &= ~PCI_EXP_LNKSTA_NLW;
+            lnksta |= lnkcap & PCI_EXP_LNKCAP_MLW;
+        }
+
+        if ((lnksta & PCI_EXP_LNKSTA_CLS) > (lnkcap & PCI_EXP_LNKCAP_SLS)) {
+            lnksta &= ~PCI_EXP_LNKSTA_CLS;
+            lnksta |= lnkcap & PCI_EXP_LNKCAP_SLS;
+        }
+    }
+
+    pci_word_test_and_clear_mask(exp_cap + PCI_EXP_LNKSTA,
+                                 PCI_EXP_LNKSTA_CLS | PCI_EXP_LNKSTA_NLW);
+    pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA, lnksta &
+                               (PCI_EXP_LNKSTA_CLS | PCI_EXP_LNKSTA_NLW));
+}
+
 /**************************************************************************
  * pci express extended capability helper functions
  */
-- 
MST

  parent reply	other threads:[~2018-12-18  4:17 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-18  4:16 [Qemu-devel] [PULL 00/31] pci, pc, virtio: fixes, features Michael S. Tsirkin
2018-12-18  4:16 ` [Qemu-devel] [PULL 01/31] pcie: set link state inactive/active after hot unplug/plug Michael S. Tsirkin
2018-12-18  4:16 ` [Qemu-devel] [PULL 02/31] pc:piix4: Update smbus I/O space after a migration Michael S. Tsirkin
2018-12-18  4:16 ` [Qemu-devel] [PULL 03/31] virtio: Helper for registering virtio device types Michael S. Tsirkin
2018-12-18  4:16 ` [Qemu-devel] [PULL 04/31] virtio: Provide version-specific variants of virtio PCI devices Michael S. Tsirkin
2018-12-18  4:16 ` [Qemu-devel] [PULL 05/31] tests: Remove unused include Michael S. Tsirkin
2018-12-18  4:17 ` [Qemu-devel] [PULL 06/31] hw/smbios: Restrict access to "hw/smbios/ipmi.h" Michael S. Tsirkin
2018-12-18  4:17 ` [Qemu-devel] [PULL 07/31] hw/smbios: Remove "smbios_ipmi.h" Michael S. Tsirkin
2018-12-18  4:17 ` [Qemu-devel] [PULL 08/31] hw/smbios: Move to the hw/firmware/ subdirectory Michael S. Tsirkin
2018-12-18  4:17 ` [Qemu-devel] [PULL 09/31] hw/pci-bridge: Fix invalid free() Michael S. Tsirkin
2018-12-18  4:17 ` [Qemu-devel] [PULL 10/31] pcie: Create enums for link speed and width Michael S. Tsirkin
2018-12-18  4:17 ` Michael S. Tsirkin [this message]
2018-12-18  4:17 ` [Qemu-devel] [PULL 12/31] qapi: Define PCIe link speed and width properties Michael S. Tsirkin
2018-12-18  4:17 ` [Qemu-devel] [PULL 13/31] pcie: Add link speed and width fields to PCIESlot Michael S. Tsirkin
2018-12-18  4:17 ` [Qemu-devel] [PULL 14/31] pcie: Fill PCIESlot link fields to support higher speeds and widths Michael S. Tsirkin
2018-12-18  4:17 ` [Qemu-devel] [PULL 15/31] pcie: Allow generic PCIe root port to specify link speed and width Michael S. Tsirkin
2018-12-18  4:17 ` [Qemu-devel] [PULL 16/31] vfio/pci: Remove PCIe Link Status emulation Michael S. Tsirkin
2018-12-18  4:17 ` [Qemu-devel] [PULL 17/31] pcie: Fast PCIe root ports for new machines Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 18/31] intel_iommu: dump correct iova when failed Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 19/31] intel_iommu: convert invalid traces into error reports Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 20/31] intel_iommu: dma read/write draining support Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 21/31] intel_iommu: remove "x-" prefix for "aw-bits" Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 22/31] intel_iommu: turn on IR by default Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 23/31] hw: acpi: The RSDP build API can return void Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 24/31] hw: arm: acpi: Fix incorrect checksums in RSDP Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 25/31] hw: i386: Use correct RSDT length for checksum Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 26/31] hw: arm: Carry RSDP specific data through AcpiRsdpData Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 27/31] hw: arm: Convert the RSDP build to the buid_append_foo() API Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 28/31] hw: arm: Support both legacy and current RSDP build Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 29/31] hw: acpi: Export and share the ARM " Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 30/31] hw: acpi: Remove AcpiRsdpDescriptor and fix tests Michael S. Tsirkin
2018-12-18  4:18 ` [Qemu-devel] [PULL 31/31] hw/i386: Remove deprecated machines pc-0.10 and pc-0.11 Michael S. Tsirkin
2018-12-18  4:37 ` [Qemu-devel] [PULL 00/31] pci, pc, virtio: fixes, features Michael S. Tsirkin
2018-12-24 12:34 ` no-reply

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=20181218041625.24969-12-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=geoff@hostfission.com \
    --cc=marcel.apfelbaum@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.