Add support for disabling ASPM if !CONFIG_PCIEASPM. Patch is based on code from e1000e. Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Cc: linux-pci@xxxxxxxxxxxxxxx Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx> --- drivers/pci/pcie/Makefile | 3 +-- drivers/pci/pcie/aspm.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/linux/pci-aspm.h | 2 ++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pcie/Makefile b/drivers/pci/pcie/Makefile index 00c62df..6e20c59 100644 --- a/drivers/pci/pcie/Makefile +++ b/drivers/pci/pcie/Makefile @@ -2,8 +2,7 @@ # Makefile for PCI-Express PORT Driver # -# Build PCI Express ASPM if needed -obj-$(CONFIG_PCIEASPM) += aspm.o +obj-y += aspm.o pcieportdrv-y := portdrv_core.o portdrv_pci.o portdrv_bus.o pcieportdrv-$(CONFIG_ACPI) += portdrv_acpi.o diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 6892601..2883fc3 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -21,6 +21,8 @@ #include <linux/pci-aspm.h> #include "../pci.h" +#ifdef CONFIG_PCIEASPM + #ifdef MODULE_PARAM_PREFIX #undef MODULE_PARAM_PREFIX #endif @@ -976,3 +978,42 @@ bool pcie_aspm_support_enabled(void) return aspm_support_enabled; } EXPORT_SYMBOL(pcie_aspm_support_enabled); + +void pcie_disable_aspm(struct pci_dev *pdev, u16 state) +{ + pci_disable_link_state_locked(pdev, state); +} +EXPORT_SYMBOL(pcie_disable_aspm); + +#else /* CONFIG_PCIEASPM */ + +void pcie_disable_aspm(struct pci_dev *pdev, u16 state) +{ + int pos; + u16 reg16; + struct pci_dev *parent; + + pos = pci_pcie_cap(pdev); + if (!pos) + return; + /* + * Both device and parent should have the same ASPM setting. + * Disable ASPM in downstream component first and then upstream. + */ + + pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, ®16); + reg16 &= ~state; + pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16); + + parent = pdev->bus->self; + if (WARN_ON(!parent)) + return; + + pos = pci_pcie_cap(parent); + pci_read_config_word(parent, pos + PCI_EXP_LNKCTL, ®16); + reg16 &= ~state; + pci_write_config_word(parent, pos + PCI_EXP_LNKCTL, reg16); +} +EXPORT_SYMBOL(pcie_disable_aspm); + +#endif diff --git a/include/linux/pci-aspm.h b/include/linux/pci-aspm.h index 7cea7b6..f9722e6 100644 --- a/include/linux/pci-aspm.h +++ b/include/linux/pci-aspm.h @@ -55,6 +55,8 @@ static inline void pcie_no_aspm(void) } #endif +extern void pcie_disable_aspm(struct pci_dev *pdev, u16 state); + #ifdef CONFIG_PCIEASPM_DEBUG /* this depends on CONFIG_PCIEASPM */ extern void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev); extern void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html