Skip to contentSkip to conversation

PCI/ASPM: Clarify that pcie_aspm=off means leave ASPM untouched

PATCH In review Bjorn Helgaas 2 participants 3 messages Apr 29, 2024 – May 3, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI/ASPM: Clarify that pcie_aspm=off means leave ASPM untouched

From: Bjorn Helgaas <[email protected]>

Previously we claimed "pcie_aspm=off" meant that ASPM would be disabled, which is wrong.

Correct this to say that with "pcie_aspm=off", Linux doesn't touch any ASPM configuration at all. ASPM may have been enabled by firmware, and that will be left unchanged. See "aspm_support_enabled".

---
 Documentation/admin-guide/kernel-parameters.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +3 -2
index bb884c14b2f6..4bc281d6e8d3 100644
@@ -4590,9 +4590,10 @@
 		norid		[S390] ignore the RID field and force use of
 				one PCI domain per PCI function
 
-	pcie_aspm=	[PCIE] Forcibly enable or disable PCIe Active State Power
+	pcie_aspm=	[PCIE] Forcibly enable or ignore PCIe Active State Power
 			Management.
-		off	Disable ASPM.
+		off	Don't touch ASPM configuration at all.  Leave any
+			configuration done by firmware unchanged.
 		force	Enable ASPM even on devices that claim not to support it.
 			WARNING: Forcing ASPM on may cause system lockups.
 
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

Previously we claimed "pcie_aspm=off" meant that ASPM would be disabled, which is wrong.

Correct this to say that with "pcie_aspm=off", Linux doesn't touch any ASPM configuration at all.  ASPM may have been enabled by firmware, and that will be left unchanged.  See "aspm_support_enabled".

LGTM.

Quoted 25 lines

---
 Documentation/admin-guide/kernel-parameters.txt | 5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +0 -0
index bb884c14b2f6..4bc281d6e8d3 100644
@@ -4590,9 +4590,10 @@

                norid           [S390] ignore the RID field and force use of one PCI domain per PCI function

-       pcie_aspm=      [PCIE] Forcibly enable or disable PCIe Active State Power
+       pcie_aspm=      [PCIE] Forcibly enable or ignore PCIe Active State Power
                        Management.
-               off     Disable ASPM.
+               off     Don't touch ASPM configuration at all.  Leave any +                       configuration done by firmware unchanged. force   Enable ASPM even on devices that claim not to support it.
                        WARNING: Forcing ASPM on may cause system lockups.

#2 lore raw
In reply to Bjorn Helgaas
Quoted 10 lines · Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

Previously we claimed "pcie_aspm=off" meant that ASPM would be disabled, which is wrong.

Correct this to say that with "pcie_aspm=off", Linux doesn't touch any ASPM configuration at all. ASPM may have been enabled by firmware, and that will be left unchanged. See "aspm_support_enabled".

Applied with David's Reviewed-by to for-linus for v6.9, thanks, David!

Quoted 24 lines
---
 Documentation/admin-guide/kernel-parameters.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +3 -2
index bb884c14b2f6..4bc281d6e8d3 100644
@@ -4590,9 +4590,10 @@
 		norid		[S390] ignore the RID field and force use of
 				one PCI domain per PCI function
 
-	pcie_aspm=	[PCIE] Forcibly enable or disable PCIe Active State Power
+	pcie_aspm=	[PCIE] Forcibly enable or ignore PCIe Active State Power
 			Management.
-		off	Disable ASPM.
+		off	Don't touch ASPM configuration at all.  Leave any
+			configuration done by firmware unchanged.
 		force	Enable ASPM even on devices that claim not to support it.
 			WARNING: Forcing ASPM on may cause system lockups.
 
Signature · 1 line
2.34.1