From: Mario Limonciello <mario.limonciello@amd.com>
To: <bhelgaas@google.com>, <mika.westerberg@linux.intel.com>
Cc: <andreas.noever@gmail.com>, <michael.jamet@intel.com>,
<YehezkelShB@gmail.com>, <linux-pci@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-usb@vger.kernel.org>,
<Alexander.Deucher@amd.com>,
Mario Limonciello <mario.limonciello@amd.com>
Subject: [PATCH 2/2] PCI: Ignore PCIe ports used for tunneling in pcie_bandwidth_available()
Date: Tue, 31 Oct 2023 08:34:38 -0500 [thread overview]
Message-ID: <20231031133438.5299-2-mario.limonciello@amd.com> (raw)
In-Reply-To: <20231031133438.5299-1-mario.limonciello@amd.com>
The USB4 spec specifies that PCIe ports that are used for tunneling
PCIe traffic over USB4 fabric will be hardcoded to advertise 2.5GT/s.
In reality these ports speed is controlled by the fabric implementation.
Downstream drivers such as amdgpu which utilize pcie_bandwidth_available()
to program the device will always find the PCIe ports used for
tunneling as a limiting factor and may make incorrect decisions.
To prevent problems in downstream drivers check explicitly for ports
being used for PCIe tunneling and skip them when looking for bandwidth
limitations.
2 types of devices are detected:
1) PCIe root port used for PCIe tunneling
2) Intel Thunderbolt 3 bridge
Downstream drivers could make this change on their own but then they
wouldn't be able to detect other potential speed bottlenecks.
Link: https://lore.kernel.org/linux-pci/7ad4b2ce-4ee4-429d-b5db-3dfc360f4c3e@amd.com/
Link: https://www.usb.org/document-library/usb4r-specification-v20
USB4 V2 with Errata and ECN through June 2023 - CLEAN p710
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2925
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/pci/pci.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 59c01d68c6d5..4a7dc9c2b8f4 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -6223,6 +6223,40 @@ int pcie_set_mps(struct pci_dev *dev, int mps)
}
EXPORT_SYMBOL(pcie_set_mps);
+/**
+ * pcie_is_tunneling_port - Check if a PCI device is used for TBT3/USB4 tunneling
+ * @dev: PCI device to check
+ *
+ * Returns true if the device is used for PCIe tunneling, false otherwise.
+ */
+static bool
+pcie_is_tunneling_port(struct pci_dev *pdev)
+{
+ struct device_link *link;
+ struct pci_dev *supplier;
+
+ /* Intel TBT3 bridge */
+ if (pdev->is_thunderbolt)
+ return true;
+
+ if (!pci_is_pcie(pdev))
+ return false;
+
+ if (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT)
+ return false;
+
+ /* PCIe root port used for tunneling linked to USB4 router */
+ list_for_each_entry(link, &pdev->dev.links.suppliers, c_node) {
+ supplier = to_pci_dev(link->supplier);
+ if (!supplier)
+ continue;
+ if (supplier->class == PCI_CLASS_SERIAL_USB_USB4)
+ return true;
+ }
+
+ return false;
+}
+
/**
* pcie_bandwidth_available - determine minimum link settings of a PCIe
* device and its bandwidth limitation
@@ -6236,6 +6270,8 @@ EXPORT_SYMBOL(pcie_set_mps);
* limiting_dev, speed, and width pointers are supplied) information about
* that point. The bandwidth returned is in Mb/s, i.e., megabits/second of
* raw bandwidth.
+ *
+ * This function excludes root ports and bridges used for USB4 and TBT3 tunneling.
*/
u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev,
enum pci_bus_speed *speed,
@@ -6254,6 +6290,10 @@ u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev,
bw = 0;
while (dev) {
+ /* skip root ports and bridges used for tunneling */
+ if (pcie_is_tunneling_port(dev))
+ goto skip;
+
pcie_capability_read_word(dev, PCI_EXP_LNKSTA, &lnksta);
next_speed = pcie_link_speed[lnksta & PCI_EXP_LNKSTA_CLS];
@@ -6274,6 +6314,7 @@ u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev,
*width = next_width;
}
+skip:
dev = pci_upstream_bridge(dev);
}
--
2.34.1
next prev parent reply other threads:[~2023-10-31 13:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-31 13:34 [PATCH 1/2] PCI: Move the `PCI_CLASS_SERIAL_USB_USB4` definition to common header Mario Limonciello
2023-10-31 13:34 ` Mario Limonciello [this message]
2023-10-31 23:02 ` [PATCH 2/2] PCI: Ignore PCIe ports used for tunneling in pcie_bandwidth_available() kernel test robot
2023-11-01 22:52 ` Bjorn Helgaas
2023-11-02 1:14 ` Mario Limonciello
2023-11-02 10:31 ` Mika Westerberg
2023-11-02 12:07 ` Bjorn Helgaas
2023-11-02 12:17 ` Mika Westerberg
2023-11-02 15:21 ` Lukas Wunner
2023-11-02 15:26 ` Mario Limonciello
2023-11-02 15:33 ` Lukas Wunner
2023-11-02 16:22 ` Mario Limonciello
2023-11-03 5:48 ` Mika Westerberg
2023-11-02 15:47 ` Bjorn Helgaas
2023-11-02 17:28 ` Lukas Wunner
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=20231031133438.5299-2-mario.limonciello@amd.com \
--to=mario.limonciello@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=michael.jamet@intel.com \
--cc=mika.westerberg@linux.intel.com \
/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
all inboxes | Powered by JetHome®