From: Lukas Wunner <lukas@wunner.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org
Cc: Andreas Noever <andreas.noever@gmail.com>,
linux-pci@vger.kernel.org, linux-pm@vger.kernel.org,
Bjorn Helgaas <helgaas@kernel.org>
Subject: [PATCH v5 1/8] PCI: Recognize Thunderbolt devices
Date: Sun, 15 Jan 2017 21:03:45 +0100 [thread overview]
Message-ID: <bfabf33fc63abbeb84e11e544456098dff0e4604.1484486499.git.lukas@wunner.de> (raw)
In-Reply-To: <cover.1484486499.git.lukas@wunner.de>
We're about to allow runtime PM on Thunderbolt ports in
pci_bridge_d3_possible() and unblock runtime PM for Thunderbolt host
hotplug ports in pci_dev_check_d3cold(). In both cases we need to
uniquely identify if a PCI device belongs to a Thunderbolt controller.
We also have the need to detect presence of a Thunderbolt controller in
drivers/platform/x86/apple-gmux.c because dual GPU MacBook Pros cannot
switch external DP/HDMI ports between GPUs if they have Thunderbolt.
Furthermore, in multiple places in the DRM subsystem we need to detect
whether a GPU is on-board or attached with Thunderbolt. As an example,
Thunderbolt-attached GPUs shall not be registered with vga_switcheroo.
Intel uses a Vendor-Specific Extended Capability (VSEC) with ID 0x1234
on devices belonging to a Thunderbolt controller which allows us to
recognize them.
Detect presence of this VSEC on device probe and cache it in a newly
added is_thunderbolt bit in struct pci_dev which can then be queried by
pci_bridge_d3_possible(), pci_dev_check_d3cold(), apple-gmux and others.
Cc: Andreas Noever <andreas.noever@gmail.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Amir Levy <amir.jer.levy@intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
---
drivers/pci/pci.h | 2 ++
drivers/pci/probe.c | 34 ++++++++++++++++++++++++++++++++++
include/linux/pci.h | 1 +
3 files changed, 37 insertions(+)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index cb17db242f30..45c2b8144911 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -3,6 +3,8 @@
#define PCI_FIND_CAP_TTL 48
+#define PCI_VSEC_ID_INTEL_TBT 0x1234 /* Thunderbolt */
+
extern const unsigned char pcie_link_speed[];
bool pcie_cap_has_lnkctl(const struct pci_dev *dev);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index e164b5c9f0f0..891a8fa1f9f6 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1206,6 +1206,37 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev)
pdev->is_hotplug_bridge = 1;
}
+static void set_pcie_vendor_specific(struct pci_dev *dev)
+{
+ int vsec = 0;
+ u32 header;
+
+ while ((vsec = pci_find_next_ext_capability(dev, vsec,
+ PCI_EXT_CAP_ID_VNDR))) {
+ pci_read_config_dword(dev, vsec + PCI_VNDR_HEADER, &header);
+
+ /* Is the device part of a Thunderbolt controller? */
+ if (dev->vendor == PCI_VENDOR_ID_INTEL &&
+ PCI_VNDR_HEADER_ID(header) == PCI_VSEC_ID_INTEL_TBT)
+ dev->is_thunderbolt = 1;
+ }
+
+ /*
+ * Is the device attached with Thunderbolt? Walk upwards and check for
+ * each encountered bridge if it's part of a Thunderbolt controller.
+ * Reaching the host bridge means dev is soldered to the mainboard.
+ */
+ if (!dev->is_thunderbolt) {
+ struct pci_dev *parent = dev;
+
+ while ((parent = pci_upstream_bridge(parent)))
+ if (parent->is_thunderbolt) {
+ dev->is_thunderbolt = 1;
+ break;
+ }
+ }
+}
+
/**
* pci_ext_cfg_is_aliased - is ext config space just an alias of std config?
* @dev: PCI device
@@ -1358,6 +1389,9 @@ int pci_setup_device(struct pci_dev *dev)
/* need to have dev->class ready */
dev->cfg_size = pci_cfg_space_size(dev);
+ /* need to have dev->cfg_size ready */
+ set_pcie_vendor_specific(dev);
+
/* "Unknown power state" */
dev->current_state = PCI_UNKNOWN;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index e2d1a124216a..3c775e8498f1 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -358,6 +358,7 @@ struct pci_dev {
unsigned int is_virtfn:1;
unsigned int reset_fn:1;
unsigned int is_hotplug_bridge:1;
+ unsigned int is_thunderbolt:1; /* part of Thunderbolt daisy chain */
unsigned int __aer_firmware_first_valid:1;
unsigned int __aer_firmware_first:1;
unsigned int broken_intx_masking:1;
--
2.11.0
next prev parent reply other threads:[~2017-01-15 20:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-15 20:03 [PATCH v5 0/8] Runtime PM for Thunderbolt on Macs Lukas Wunner
2017-01-15 20:03 ` Lukas Wunner [this message]
2017-01-28 21:52 ` [PATCH v5 1/8] PCI: Recognize Thunderbolt devices Bjorn Helgaas
2017-01-29 0:26 ` Lukas Wunner
2017-02-06 6:09 ` Lukas Wunner
2017-02-10 17:42 ` Bjorn Helgaas
2017-02-12 16:50 ` Lukas Wunner
2017-01-15 20:03 ` [PATCH v5 2/8] PCI: Allow runtime PM on Thunderbolt ports Lukas Wunner
2017-01-28 22:09 ` Bjorn Helgaas
2017-01-30 7:15 ` Rafael J. Wysocki
2017-02-10 17:57 ` Bjorn Helgaas
2017-01-15 20:03 ` [PATCH v5 6/8] PM / sleep: Define constant for direct_complete Lukas Wunner
2017-01-15 20:03 ` [PATCH v5 8/8] thunderbolt: Runtime suspend NHI when idle Lukas Wunner
2017-01-15 20:03 ` [PATCH v5 4/8] Revert "PM / Runtime: Remove the exported function pm_children_suspended()" Lukas Wunner
2017-01-15 20:03 ` [PATCH v5 5/8] PM: Make requirements of dev_pm_domain_set() more precise Lukas Wunner
2017-01-28 23:14 ` Bjorn Helgaas
2017-01-15 20:03 ` [PATCH v5 3/8] PCI: Don't block runtime PM for Thunderbolt host hotplug ports Lukas Wunner
2017-01-16 10:29 ` Mika Westerberg
2017-01-28 23:00 ` Bjorn Helgaas
2017-02-10 18:39 ` Bjorn Helgaas
2017-02-12 17:13 ` Lukas Wunner
2017-02-13 12:17 ` Rafael J. Wysocki
2017-01-15 20:03 ` [PATCH v5 7/8] thunderbolt: Power down controller when idle Lukas Wunner
2017-01-28 23:32 ` Bjorn Helgaas
2017-02-12 16:31 ` Lukas Wunner
2017-02-13 22:57 ` Bjorn Helgaas
2017-01-19 10:38 ` [PATCH v5 0/8] Runtime PM for Thunderbolt on Macs Greg Kroah-Hartman
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=bfabf33fc63abbeb84e11e544456098dff0e4604.1484486499.git.lukas@wunner.de \
--to=lukas@wunner.de \
--cc=andreas.noever@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=helgaas@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.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
all inboxes | Powered by JetHome®