Linux-PCI Archive mirror
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: linux-pci@vger.kernel.org
Cc: "Vidya Sagar" <vidyas@nvidia.com>,
	"Ilpo Järvinen" <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
Date: Fri, 3 May 2024 11:46:53 -0500	[thread overview]
Message-ID: <20240503164653.GA1584406@bhelgaas> (raw)
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
> 

      parent reply	other threads:[~2024-05-03 16:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-29 19:18 [PATCH] PCI/ASPM: Clarify that pcie_aspm=off means leave ASPM untouched Bjorn Helgaas
2024-05-01 20:07 ` David E. Box
2024-05-03 16:46 ` Bjorn Helgaas [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240503164653.GA1584406@bhelgaas \
    --to=helgaas@kernel.org \
    --cc=ajayagarwal@google.com \
    --cc=bhelgaas@google.com \
    --cc=david.e.box@linux.intel.com \
    --cc=hkallweit1@gmail.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=johan+linaro@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=macro@orcam.me.uk \
    --cc=vidyas@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).