Commit ac865f00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v6.7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci 

Pull PCI fixes from Bjorn Helgaas:

 - Revert an ASPM patch that caused an unintended reboot when resuming
   after suspend (Bjorn Helgaas)

 - Orphan Cadence PCIe IP (Bjorn Helgaas)

* tag 'pci-v6.7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  MAINTAINERS: Orphan Cadence PCIe IP
  Revert "PCI/ASPM: Remove pcie_aspm_pm_state_change()"
parents d7807d85 0ee2030a

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1855,6 +1855,10 @@ D: Fedora kernel maintenance (2003-2014). 
D: 'Trinity' and similar fuzz testing work.

D: Misc/Other.



N: Tom Joseph

E: tjoseph@cadence.com

D: Cadence PCIe driver



N: Martin Josfsson

E: gandalf@wlug.westbo.se

P: 1024D/F6B6D3B1 7610 7CED 5C34 4AA6 DBA2  8BE1 5A6D AF95 F6B6 D3B1

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -16458,11 +16458,10 @@ F: Documentation/devicetree/bindings/pci/pci-armada8k.txt 
F:	drivers/pci/controller/dwc/pcie-armada8k.c









PCI DRIVER FOR CADENCE PCIE IP









M:	Tom Joseph <tjoseph@cadence.com>









L:	linux-pci@vger.kernel.org









S:	Maintained









S:	Orphan









F:	Documentation/devicetree/bindings/pci/cdns,*









F:	drivers/pci/controller/cadence/









F:	drivers/pci/controller/cadence/*cadence*

















PCI DRIVER FOR FREESCALE LAYERSCAPE









M:	Minghuan Lian <minghuan.Lian@nxp.com>
































drivers/pci/pci.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -1335,6 +1335,9 @@ 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;









}


















@@ -1429,6 +1432,9 @@ 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



+2
−0






























Original line number
Diff line number
Diff line







@@ -569,10 +569,12 @@ int pcie_retrain_link(struct pci_dev *pdev, bool use_lt);







#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



+19
−0






























Original line number
Diff line number
Diff line







@@ -1008,6 +1008,25 @@ 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;