From: Mario Limonciello <mario.limonciello@amd.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
"open list:PCI SUBSYSTEM" <linux-pci@vger.kernel.org>,
"open list:THUNDERBOLT DRIVER" <linux-usb@vger.kernel.org>,
"open list:RADEON and AMDGPU DRM DRIVERS"
<amd-gfx@lists.freedesktop.org>,
"open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>,
"open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS"
<nouveau@lists.freedesktop.org>
Cc: Andreas Noever <andreas.noever@gmail.com>,
Michael Jamet <michael.jamet@intel.com>,
Yehezkel Bernat <YehezkelShB@gmail.com>,
"Lukas Wunner" <lukas@wunner.de>, <Alexander.Deucher@amd.com>,
Hans de Goede <hdegoede@redhat.com>,
Mario Limonciello <mario.limonciello@amd.com>
Subject: [PATCH v4 03/10] PCI: Detect root port of internal USB4 controllers
Date: Mon, 14 Feb 2022 18:01:53 -0600 [thread overview]
Message-ID: <20220215000200.242799-4-mario.limonciello@amd.com> (raw)
In-Reply-To: <20220215000200.242799-1-mario.limonciello@amd.com>
The root port used for PCIe tunneling is the root of the hierarchy used
for all PCIe devices that are connected downstream. Tunnels are created
and destroyed by the USB4 SW CM. So this port should be marked as external
meaning all devices connected to it are appropriately marked as removable
for downstream drivers to detect.
This can be done by looking for the device property specified in
the ACPI tables `usb4-host-interface`.
Suggested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Link: https://docs.microsoft.com/en-us/windows-hardware/drivers/pci/dsd-for-pcie-root-ports#mapping-native-protocols-pcie-displayport-tunneled-through-usb4-to-usb4-host-routers
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/pci/pci-acpi.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index a42dbf448860..695dbd88b8b7 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -1335,12 +1335,21 @@ static void pci_acpi_optimize_delay(struct pci_dev *pdev,
static void pci_acpi_set_external_facing(struct pci_dev *dev)
{
- u8 val;
+ u8 val = 0;
if (pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT)
return;
- if (device_property_read_u8(&dev->dev, "ExternalFacingPort", &val))
- return;
+ device_property_read_u8(&dev->dev, "ExternalFacingPort", &val);
+
+ /* check for root port for PCIe tunnels on integrated controllers */
+ if (!val) {
+ struct acpi_device *adev = ACPI_COMPANION(&dev->dev);
+
+ if (!adev)
+ return;
+ val = fwnode_property_present(acpi_fwnode_handle(adev),
+ "usb4-host-interface");
+ }
/*
* These root ports expose PCIe (including DMA) outside of the
--
2.34.1
next prev parent reply other threads:[~2022-02-15 0:04 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 0:01 [PATCH v4 00/10] Overhaul `is_thunderbolt` Mario Limonciello
2022-02-15 0:01 ` [PATCH v4 01/10] PCI: Add USB4 class definition Mario Limonciello
2022-02-15 0:01 ` [PATCH v4 02/10] PCI: Move `is_thunderbolt` check for lack of command completed to a quirk Mario Limonciello
2022-02-15 0:01 ` Mario Limonciello [this message]
2022-02-15 0:01 ` [PATCH v4 04/10] PCI: Detect PCIe root ports for discrete USB4 controllers Mario Limonciello
2022-02-15 0:01 ` [PATCH v4 05/10] PCI: Move check for old Apple Thunderbolt controllers into a quirk Mario Limonciello
2022-02-15 0:01 ` [PATCH v4 06/10] PCI: Drop the `is_thunderbolt` attribute from PCI core Mario Limonciello
2022-02-15 0:01 ` [PATCH v4 07/10] drm/amd: drop the use of `pci_is_thunderbolt_attached` Mario Limonciello
2022-02-15 0:01 ` [PATCH v4 08/10] drm/nouveau: " Mario Limonciello
2022-02-15 0:01 ` [PATCH v4 09/10] drm/radeon: " Mario Limonciello
2022-02-15 0:02 ` [PATCH v4 10/10] PCI: drop `pci_is_thunderbolt_attached` Mario Limonciello
2022-02-15 7:29 ` [PATCH v4 00/10] Overhaul `is_thunderbolt` Lukas Wunner
2022-02-15 19:07 ` Limonciello, Mario
2022-02-16 14:34 ` Mika Westerberg
2022-02-16 14:44 ` Alex Deucher
2022-02-16 16:50 ` Limonciello, Mario
2022-02-17 9:33 ` Mika Westerberg
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=20220215000200.242799-4-mario.limonciello@amd.com \
--to=mario.limonciello@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=YehezkelShB@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=andreas.noever@gmail.com \
--cc=bhelgaas@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=michael.jamet@intel.com \
--cc=mika.westerberg@linux.intel.com \
--cc=nouveau@lists.freedesktop.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