Received-SPF: pass (google.com: domain of linux-kernel+bounces-167927-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Fri, 3 May 2024 11:46:53 -0500
From: Bjorn Helgaas <helgaas@kernel.org>
To: linux-pci@vger.kernel.org
Cc: Vidya Sagar <vidyas@nvidia.com>,
	Ilpo =?utf-8?B?SsOkcnZpbmVu?= <ilpo.jarvinen@linux.intel.com>,
	"Maciej W . Rozycki" <macro@orcam.me.uk>,
	"David E . Box" <david.e.box@linux.intel.com>,
	Johan Hovold <johan+linaro@kernel.org>,
	Heiner Kallweit <hkallweit1@gmail.com>,
	Ajay Agarwal <ajayagarwal@google.com>, linux-kernel@vger.kernel.org,
	Bjorn Helgaas <bhelgaas@google.com>
Subject: Re: [PATCH] PCI/ASPM: Clarify that pcie_aspm=off means leave ASPM
 untouched
Message-ID: <20240503164653.GA1584406@bhelgaas>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240429191821.691726-1-helgaas@kernel.org>

On Mon, Apr 29, 2024 at 02:18:21PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
> 
> 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".
> 
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

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

> ---
>  Documentation/admin-guide/kernel-parameters.txt | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index bb884c14b2f6..4bc281d6e8d3 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -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.34.1
>