Commit 50f7a544 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/aspm' 

- Remove pcie_aspm_pm_state_change(), which overwrites ASPM config on power
  state changes (Kai-Heng Feng)

* pci/aspm:
  PCI/ASPM: Unexport pcie_aspm_support_enabled()
  PCI/ASPM: Remove pcie_aspm_pm_state_change()
parents f2906aa8 ba13d457

drivers/pci/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -1293,9 +1293,6 @@ static int pci_set_full_power_state(struct pci_dev *dev) 
		pci_restore_bars(dev);

	}



	if (dev->bus->self)

		pcie_aspm_pm_state_change(dev->bus->self);



	return 0;

}
@@ -1390,9 +1387,6 @@ static int pci_set_low_power_state(struct pci_dev *dev, pci_power_t state) 
				     pci_power_name(dev->current_state),

				     pci_power_name(state));



	if (dev->bus->self)

		pcie_aspm_pm_state_change(dev->bus->self);



	return 0;

}

drivers/pci/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -560,12 +560,10 @@ bool pcie_wait_for_link(struct pci_dev *pdev, bool active); 
#ifdef CONFIG_PCIEASPM

void pcie_aspm_init_link_state(struct pci_dev *pdev);

void pcie_aspm_exit_link_state(struct pci_dev *pdev);

void pcie_aspm_pm_state_change(struct pci_dev *pdev);

void pcie_aspm_powersave_config_link(struct pci_dev *pdev);

#else

static inline void pcie_aspm_init_link_state(struct pci_dev *pdev) { }

static inline void pcie_aspm_exit_link_state(struct pci_dev *pdev) { }

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

drivers/pci/pcie/aspm.c

+0 −20
Original line number Diff line number Diff line
@@ -1012,25 +1012,6 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev) 
	up_read(&pci_bus_sem);

}



/* @pdev: the root port or switch downstream port */

void pcie_aspm_pm_state_change(struct pci_dev *pdev)

{

	struct pcie_link_state *link = pdev->link_state;



	if (aspm_disabled || !link)

		return;

	/*

	 * Devices changed PM state, we should recheck if latency

	 * meets all functions' requirement

	 */

	down_read(&pci_bus_sem);

	mutex_lock(&aspm_lock);

	pcie_update_aspm_capable(link->root);

	pcie_config_aspm_path(link);

	mutex_unlock(&aspm_lock);

	up_read(&pci_bus_sem);

}



void pcie_aspm_powersave_config_link(struct pci_dev *pdev)

{

	struct pcie_link_state *link = pdev->link_state;
@@ -1366,4 +1347,3 @@ bool pcie_aspm_support_enabled(void) 
{

	return aspm_support_enabled;

}
 
EXPORT_SYMBOL(pcie_aspm_support_enabled);