From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: iommu@lists.linux-foundation.org
Cc: Joerg Roedel <joro@8bytes.org>,
David Woodhouse <dwmw2@infradead.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
Ashok Raj <ashok.raj@intel.com>,
Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Jacob jun Pan <jacob.jun.pan@intel.com>,
Andreas Noever <andreas.noever@gmail.com>,
Michael Jamet <michael.jamet@intel.com>,
Yehezkel Bernat <YehezkelShB@gmail.com>,
Lukas Wunner <lukas@wunner.de>,
Christian Kellner <ckellner@redhat.com>,
Mario.Limonciello@dell.com,
Anthony Wong <anthony.wong@canonical.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] PCI / ACPI: Identify external PCI devices
Date: Mon, 12 Nov 2018 19:06:25 +0300 [thread overview]
Message-ID: <20181112160628.86620-2-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20181112160628.86620-1-mika.westerberg@linux.intel.com>
Recent systems shipping Windows 10 version 1803 or later may support
IOMMU based DMA protection. This means that the platform utilizes IOMMU
to prevent DMA attacks over externally exposed PCIe root ports
(typically Thunderbolt ports)
The system BIOS marks these PCIe root ports as being externally facing
ports by implementing following ACPI _DSD under the root port in
question:
Name (_DSD, Package () {
ToUUID ("efcc06cc-73ac-4bc3-bff0-76143807c389"),
Package () {
Package () {"ExternalFacingPort", 1},
Package () {"UID", 0 }
}
})
This is documented [1].
To make it possible for IOMMU code to identify these external devices,
we look up for this property and mark all children devices (including
the root port itself) with a new flag (->is_external).
[1] https://docs.microsoft.com/en-us/windows-hardware/drivers/pci/dsd-for-pcie-root-ports#identifying-externally-exposed-pcie-root-ports
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/acpi/property.c | 3 +++
drivers/pci/pci-acpi.c | 13 +++++++++++++
drivers/pci/probe.c | 23 +++++++++++++++++++++++
include/linux/pci.h | 1 +
4 files changed, 40 insertions(+)
diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 8c7c4583b52d..4bdad32f62c8 100644
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -31,6 +31,9 @@ static const guid_t prp_guids[] = {
/* Hotplug in D3 GUID: 6211e2c0-58a3-4af3-90e1-927a4e0c55a4 */
GUID_INIT(0x6211e2c0, 0x58a3, 0x4af3,
0x90, 0xe1, 0x92, 0x7a, 0x4e, 0x0c, 0x55, 0xa4),
+ /* External facing port GUID: efcc06cc-73ac-4bc3-bff0-76143807c389 */
+ GUID_INIT(0xefcc06cc, 0x73ac, 0x4bc3,
+ 0xbf, 0xf0, 0x76, 0x14, 0x38, 0x07, 0xc3, 0x89),
};
static const guid_t ads_guid =
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 2a4aa6468579..fc193279d24d 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -789,6 +789,18 @@ static void pci_acpi_optimize_delay(struct pci_dev *pdev,
ACPI_FREE(obj);
}
+static void pci_acpi_set_external(struct pci_dev *dev)
+{
+ u8 val;
+
+ if (pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT)
+ return;
+ if (device_property_read_u8(&dev->dev, "ExternalFacingPort", &val))
+ return;
+
+ dev->is_external = val == 1;
+}
+
static void pci_acpi_setup(struct device *dev)
{
struct pci_dev *pci_dev = to_pci_dev(dev);
@@ -803,6 +815,7 @@ static void pci_acpi_setup(struct device *dev)
set_dev_node(dev, node);
pci_acpi_optimize_delay(pci_dev, adev->handle);
+ pci_acpi_set_external(pci_dev);
pci_acpi_add_pm_notifier(adev, pci_dev);
if (!adev->wakeup.flags.valid)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index b1c05b5054a0..f1db195a4a90 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1378,6 +1378,27 @@ static void set_pcie_thunderbolt(struct pci_dev *dev)
}
}
+static void set_pcie_external(struct pci_dev *dev)
+{
+ struct pci_dev *parent;
+
+ /*
+ * Walk up the device hierarchy and check for any upstream
+ * bridge that has is_external_facing set to true. This means
+ * the hierarchy is below PCIe port that is exposed externally
+ * (such as Thunderbolt).
+ */
+ parent = pci_upstream_bridge(dev);
+ while (parent) {
+ if (parent->is_external) {
+ dev->is_external = true;
+ break;
+ }
+
+ parent = pci_upstream_bridge(parent);
+ }
+}
+
/**
* pci_ext_cfg_is_aliased - Is ext config space just an alias of std config?
* @dev: PCI device
@@ -1638,6 +1659,8 @@ int pci_setup_device(struct pci_dev *dev)
/* Need to have dev->cfg_size ready */
set_pcie_thunderbolt(dev);
+ set_pcie_external(dev);
+
/* "Unknown power state" */
dev->current_state = PCI_UNKNOWN;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 11c71c4ecf75..e1c0e032da55 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -396,6 +396,7 @@ struct pci_dev {
unsigned int is_hotplug_bridge:1;
unsigned int shpc_managed:1; /* SHPC owned by shpchp */
unsigned int is_thunderbolt:1; /* Thunderbolt controller */
+ unsigned int is_external:1; /* External PCIe device */
unsigned int __aer_firmware_first_valid:1;
unsigned int __aer_firmware_first:1;
unsigned int broken_intx_masking:1; /* INTx masking can't be used */
--
2.19.1
next prev parent reply other threads:[~2018-11-12 16:06 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-12 16:06 [PATCH 0/4] PCI / iommu / thunderbolt: IOMMU based DMA protection Mika Westerberg
2018-11-12 16:06 ` Mika Westerberg [this message]
2018-11-12 18:02 ` [PATCH 1/4] PCI / ACPI: Identify external PCI devices Lukas Wunner
2018-11-13 10:56 ` Lorenzo Pieralisi
2018-11-13 11:27 ` Mika Westerberg
2018-11-13 11:45 ` Lorenzo Pieralisi
2018-11-15 10:22 ` Mika Westerberg
2018-11-15 11:13 ` Lorenzo Pieralisi
2018-11-15 11:37 ` Mika Westerberg
2018-11-15 12:07 ` Lukas Wunner
2018-11-15 12:16 ` Mika Westerberg
2018-11-15 17:46 ` Lorenzo Pieralisi
2018-11-15 17:58 ` Yehezkel Bernat
2018-11-15 19:10 ` Mika Westerberg
2018-11-15 19:27 ` Lukas Wunner
2018-11-15 19:32 ` Mika Westerberg
2018-11-16 9:18 ` Christoph Hellwig
2018-11-16 9:32 ` Mika Westerberg
2018-11-22 10:48 ` Mika Westerberg
2018-11-22 10:59 ` Christoph Hellwig
2018-11-15 19:00 ` Mika Westerberg
2018-11-15 19:33 ` Mario.Limonciello
2018-11-16 10:57 ` Lorenzo Pieralisi
2018-11-20 21:43 ` Rafael J. Wysocki
2018-11-21 12:40 ` Lorenzo Pieralisi
2018-11-16 7:01 ` Mika Westerberg
2018-11-12 16:06 ` [PATCH 2/4] iommu/vt-d: Force IOMMU on for platform opt in hint Mika Westerberg
2018-11-12 17:49 ` Raj, Ashok
2018-11-12 18:09 ` Alex Williamson
2018-11-12 19:51 ` Raj, Ashok
2018-11-12 16:06 ` [PATCH 3/4] iommu/vt-d: Do not enable ATS for external devices Mika Westerberg
2018-11-12 17:53 ` Raj, Ashok
2018-11-12 16:06 ` [PATCH 4/4] thunderbolt: Export IOMMU based DMA protection support to userspace Mika Westerberg
2018-11-12 16:22 ` Mario.Limonciello
2018-11-13 10:36 ` Mika Westerberg
2018-11-12 16:59 ` Yehezkel Bernat
2018-11-13 10:55 ` Mika Westerberg
2018-11-13 11:13 ` Yehezkel Bernat
2018-11-13 11:40 ` Mika Westerberg
2018-11-13 14:42 ` Yehezkel Bernat
[not found] ` <20181113152038.GD2500@lahna.fi.intel.com>
2018-11-13 15:38 ` Yehezkel Bernat
2018-11-13 16:12 ` Mika Westerberg
2018-11-12 18:12 ` [PATCH 0/4] PCI / iommu / thunderbolt: IOMMU based DMA protection Lukas Wunner
2018-11-12 19:04 ` Yehezkel Bernat
2018-11-13 11:13 ` Mika Westerberg
2018-11-13 8:54 ` Joerg Roedel
2018-11-13 11:32 ` 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=20181112160628.86620-2-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=Mario.Limonciello@dell.com \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=anthony.wong@canonical.com \
--cc=ashok.raj@intel.com \
--cc=baolu.lu@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=ckellner@redhat.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jacob.jun.pan@intel.com \
--cc=joro@8bytes.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=michael.jamet@intel.com \
--cc=rjw@rjwysocki.net \
/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).