All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] PCI:ASPM: Remove pcie_aspm_pm_state_change()
@ 2022-05-09  7:36 Kai-Heng Feng
  2022-06-21  2:27 ` Kai-Heng Feng
  2022-07-11 23:11 ` Bjorn Helgaas
  0 siblings, 2 replies; 9+ messages in thread
From: Kai-Heng Feng @ 2022-05-09  7:36 UTC (permalink / raw)
  To: bhelgaas
  Cc: Kai-Heng Feng, Saheed O. Bolarinwa, Krzysztof Wilczyński,
	Logan Gunthorpe, Rajat Jain, linux-pci, linux-kernel

pcie_aspm_pm_state_change() was introduced at the inception of PCIe
ASPM code.

However, it can cause some issues. For instance, when ASPM config is
changed via sysfs, those changes won't persist across power state change
because pcie_aspm_pm_state_change() overwrites them.

In addition to that, if the driver is to restore L1ss [1] after system
resume, the restored states will also be overwritten by
pcie_aspm_pm_state_change().

So remove pcie_aspm_pm_state_change() for now, if there's any hardware
really needs it to function, a quirk can be used instead.

[1] https://lore.kernel.org/linux-pci/20220201123536.12962-1-vidyas@nvidia.com/

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/pci/pci.c       |  3 ---
 drivers/pci/pci.h       |  2 --
 drivers/pci/pcie/aspm.c | 19 -------------------
 3 files changed, 24 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 9ecce435fb3f1..d09f7b60ee4dc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1181,9 +1181,6 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state)
 	if (need_restore)
 		pci_restore_bars(dev);
 
-	if (dev->bus->self)
-		pcie_aspm_pm_state_change(dev->bus->self);
-
 	return 0;
 }
 
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 3d60cabde1a15..86a19f293d4ad 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -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
 
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index a96b7424c9bc8..7f76a5875feb4 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -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;
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH] PCI:ASPM: Remove pcie_aspm_pm_state_change()
@ 2023-04-21 18:33 Mark Hasemeyer
  0 siblings, 0 replies; 9+ messages in thread
From: Mark Hasemeyer @ 2023-04-21 18:33 UTC (permalink / raw)
  To: markhas; +Cc: stable

commit 08d0cc5f34265d1a1e3031f319f594bd1970976c upstream.

This change is desired because without it, it has been observed that
re-applying aspm settings can cause the system to crash with certain pci
devices (ie. Genesys GL9755).

Tested by issuing 100 suspend/resume cycles on a symptomatic system running
5.15.107.

L1 settings looked identical before and after:
```
localhost ~ # lspci -vvv -d 0x17a0: | grep L1Sub
                L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM_L1.2+ ASPM_L1.1+ L1_PM_Substates+
                L1SubCtl1: PCI-PM_L1.2- PCI-PM_L1.1+ ASPM_L1.2- ASPM_L1.1+
                L1SubCtl2: T_PwrOn=3100us
```

Cc: <stable@vger.kernel.org> # 5.15.y

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] PCI:ASPM: Remove pcie_aspm_pm_state_change()
@ 2023-04-21 18:42 Mark Hasemeyer
  2023-04-23 10:30 ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Mark Hasemeyer @ 2023-04-21 18:42 UTC (permalink / raw)
  To: stable; +Cc: bhelgaas, kai.heng.feng

commit 08d0cc5f34265d1a1e3031f319f594bd1970976c upstream.

This change is desired because without it, it has been observed that
re-applying aspm settings can cause the system to crash with certain pci
devices (ie. Genesys GL9755).

Tested by issuing 100 suspend/resume cycles on a symptomatic system running
5.15.107.

L1 settings looked identical before and after:
```
localhost ~ # lspci -vvv -d 0x17a0: | grep L1Sub
                L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM_L1.2+ ASPM_L1.1+ L1_PM_Substates+
                L1SubCtl1: PCI-PM_L1.2- PCI-PM_L1.1+ ASPM_L1.2- ASPM_L1.1+
                L1SubCtl2: T_PwrOn=3100us
```

Cc: <stable@vger.kernel.org> # 5.15.y

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2023-04-25 17:35 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-09  7:36 [PATCH] PCI:ASPM: Remove pcie_aspm_pm_state_change() Kai-Heng Feng
2022-06-21  2:27 ` Kai-Heng Feng
2022-07-11 23:11 ` Bjorn Helgaas
2023-04-21 18:33 Mark Hasemeyer
2023-04-21 18:42 Mark Hasemeyer
2023-04-23 10:30 ` Greg KH
2023-04-24 18:35   ` Mark Hasemeyer
2023-04-25  5:08     ` Greg KH
2023-04-25 17:34       ` Mark Hasemeyer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.