diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2019-11-28 08:54:29 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-11-28 08:54:29 -0600 |
| commit | abd05c97f9711a4baa8cd43832893b8df45d459e (patch) | |
| tree | c2ec4d6561dcc45bd87db28ade6a212dcdc29a19 /include | |
| parent | Merge branch 'pci/aer' (diff) | |
| parent | PCI/ASPM: Remove PCIEASPM_DEBUG Kconfig option and related code (diff) | |
| download | linux-dev-abd05c97f9711a4baa8cd43832893b8df45d459e.tar.xz linux-dev-abd05c97f9711a4baa8cd43832893b8df45d459e.zip | |
Merge branch 'pci/aspm'
- Remove unnecessary ASPM locking (Bjorn Helgaas)
- Add support for disabling L1 PM Substates (Heiner Kallweit)
- Allow re-enabling Clock PM after it has been disabled (Heiner Kallweit)
- Add sysfs attributes for controlling ASPM link states (Heiner Kallweit)
- Remove CONFIG_PCIEASPM_DEBUG, including "link_state" and "clk_ctl"
sysfs files (Heiner Kallweit)
* pci/aspm:
PCI/ASPM: Remove PCIEASPM_DEBUG Kconfig option and related code
PCI/ASPM: Add sysfs attributes for controlling ASPM link states
PCI/ASPM: Add pcie_aspm_get_link()
PCI/ASPM: Allow re-enabling Clock PM
PCI/ASPM: Add L1 PM substate support to pci_disable_link_state()
PCI/ASPM: Remove pcie_aspm_enabled() unnecessary locking
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index f9088c89a534..9dc5bee14ae9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1544,9 +1544,13 @@ extern bool pcie_ports_native; #define pcie_ports_native false #endif -#define PCIE_LINK_STATE_L0S 1 -#define PCIE_LINK_STATE_L1 2 -#define PCIE_LINK_STATE_CLKPM 4 +#define PCIE_LINK_STATE_L0S BIT(0) +#define PCIE_LINK_STATE_L1 BIT(1) +#define PCIE_LINK_STATE_CLKPM BIT(2) +#define PCIE_LINK_STATE_L1_1 BIT(3) +#define PCIE_LINK_STATE_L1_2 BIT(4) +#define PCIE_LINK_STATE_L1_1_PCIPM BIT(5) +#define PCIE_LINK_STATE_L1_2_PCIPM BIT(6) #ifdef CONFIG_PCIEASPM int pci_disable_link_state(struct pci_dev *pdev, int state); |