Revert "PCI/ASPM: Save/restore L1SS Capability for suspend/resume"
PATCH 1/1 Revert "PCI/ASPM: Save/restore L1SS Capability for suspend/resume"
From: Bjorn Helgaas <[email protected]>
This reverts commit 4257f7e008ea394fcecc050f1569c3503b8bcc15.
Kenneth reported that after 4257f7e008ea, he sees a torrent of disk I/O errors on his NVMe device, and possibly other devices, until a reboot.
Reported-by Kenneth R. Crudup <[email protected]>
Signed-off-by Bjorn Helgaas <[email protected]>
---
This is tentative, pending a better fix for the issue.
drivers/pci/pci.c | 7 ------- drivers/pci/pci.h | 4 ---- drivers/pci/pcie/aspm.c | 44 ----------------------------------------- 3 files changed, 55 deletions(-)
drivers/pci/pci.c +0 -7
@@ -1558,7 +1558,6 @@ int pci_save_state(struct pci_dev *dev)return i;pci_save_ltr_state (dev); -pci_save_aspm_l1ss_state (dev);pci_save_dpc_state (dev);pci_save_aer_state (dev);pci_save_ptm_state (dev);
@@ -1665,7 +1664,6 @@ void pci_restore_state(struct pci_dev *dev)* LTR itself (in the PCIe capability). */ pci_restore_ltr_state (dev); -pci_restore_aspm_l1ss_state (dev);pci_restore_pcie_state (dev);pci_restore_pasid_state (dev);
@@ -3353,11 +3351,6 @@ void pci_allocate_cap_save_buffers(struct pci_dev *dev)if (error)pci_err (dev,"unable to allocate suspend buffer for LTR\n" ); - error =pci_add_ext_cap_save_buffer (dev,PCI_EXT_CAP_ID_L1SS , -2 *sizeof (u32)); -if (error) -pci_err (dev,"unable to allocate suspend buffer for ASPM-L1SS\n" ); -pci_allocate_vc_save_buffers (dev); }
drivers/pci/pci.h +0 -4
@@ -582,15 +582,11 @@ 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); -void pci_save_aspm_l1ss_state (struct pci_dev *dev); -void pci_restore_aspm_l1ss_state (struct pci_dev *dev);#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) { } -static inline void pci_save_aspm_l1ss_state (struct pci_dev *dev) { } -static inline void pci_restore_aspm_l1ss_state (struct pci_dev *dev) { }#endif #ifdef CONFIG_PCIE_ECRC
drivers/pci/pcie/aspm.c +0 -44
50 lines not on this page · raw message
Signature · 1 line
2.25.1