diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-25 16:49:06 -0500 |
---|---|---|
committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-06-26 15:38:28 -0500 |
commit | b03799b0cb35dbc39e89602b1203863e2a6e06bf (patch) | |
tree | f10cea12b88a5092de432a85ee8564fb8efc2f8b /include/linux/pci.h | |
parent | 6f6f42466d902c92f21b46a45e6af22d1d663607 (diff) | |
download | linux-stable-b03799b0cb35dbc39e89602b1203863e2a6e06bf.tar.gz linux-stable-b03799b0cb35dbc39e89602b1203863e2a6e06bf.tar.bz2 linux-stable-b03799b0cb35dbc39e89602b1203863e2a6e06bf.zip |
PCI: shpchp: Separate existence of SHPC and permission to use it
The shpchp driver registers for all PCI bridge devices. Its probe method
should fail if either (1) the bridge doesn't have an SHPC or (2) the OS
isn't allowed to use it (the platform firmware may be operating the SHPC
itself).
Separate these two tests into:
- A new shpc_capable() that looks for the SHPC hardware and is applicable
on all systems (ACPI and non-ACPI), and
- A simplified acpi_get_hp_hw_control_from_firmware() that we call only
when we already know an SHPC exists and there may be ACPI methods to
either request permission to use it (_OSC) or transfer control to the
OS (OSHP).
acpi_get_hp_hw_control_from_firmware() is implemented when CONFIG_ACPI=y,
but does nothing if the current platform doesn't support ACPI.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 340029b2fb38..f776a1cce120 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -388,6 +388,7 @@ struct pci_dev { unsigned int is_virtfn:1; unsigned int reset_fn:1; unsigned int is_hotplug_bridge:1; + unsigned int shpc_managed:1; /* SHPC owned by shpchp */ unsigned int is_thunderbolt:1; /* Thunderbolt controller */ unsigned int __aer_firmware_first_valid:1; unsigned int __aer_firmware_first:1; |