diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-11-28 17:54:29 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-11-28 17:54:29 +0300 |
| commit | abd05c97f9711a4baa8cd43832893b8df45d459e (patch) | |
| tree | c2ec4d6561dcc45bd87db28ade6a212dcdc29a19 /drivers/pci/pci.h | |
| parent | c2a3d213d1bc007683f63790b1cf522d5586d1a8 (diff) | |
| parent | 87e90283c94c76ee11d379ab5a0973382bbd0baf (diff) | |
| download | linux-abd05c97f9711a4baa8cd43832893b8df45d459e.tar.xz | |
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 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index b96988f90315..23e06feed6cb 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -542,14 +542,6 @@ static inline void pcie_aspm_pm_state_change(struct pci_dev *pdev) { } static inline void pcie_aspm_powersave_config_link(struct pci_dev *pdev) { } #endif -#ifdef CONFIG_PCIEASPM_DEBUG -void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev); -void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev); -#else -static inline void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev) { } -static inline void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev) { } -#endif - #ifdef CONFIG_PCIE_ECRC void pcie_set_ecrc_checking(struct pci_dev *dev); void pcie_ecrc_get_policy(char *str); @@ -668,4 +660,8 @@ static inline int pci_acpi_program_hp_params(struct pci_dev *dev) } #endif +#ifdef CONFIG_PCIEASPM +extern const struct attribute_group aspm_ctrl_attr_group; +#endif + #endif /* DRIVERS_PCI_H */ |