From: Bjorn Helgaas <helgaas@kernel.org>
To: Kai-Heng Feng <kai.heng.feng@canonical.com>
Cc: bhelgaas@google.com, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org,
"David E . Box" <david.e.box@linux.intel.com>
Subject: Re: [PATCH] PCI/ASPM: Fix a typo in ASPM restoring logic
Date: Mon, 6 May 2024 14:24:01 -0500 [thread overview]
Message-ID: <20240506192401.GA1704739@bhelgaas> (raw)
In-Reply-To: <20240506051602.1990743-1-kai.heng.feng@canonical.com>
[+cc David]
On Mon, May 06, 2024 at 01:16:02PM +0800, Kai-Heng Feng wrote:
> There's a typo that makes parent device uses child LNKCTL value and vice
> versa. This causes Micron NVMe to trigger a reboot upon system resume.
>
> Correct the typo to fix the issue.
>
> Fixes: 64dbb2d70744 ("PCI/ASPM: Disable L1 before configuring L1 Substates")
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
This is something David did correctly in his original posting
(https://lore.kernel.org/all/20240128233212.1139663-4-david.e.box@linux.intel.com/)
and I broke it while reorganizing things
(https://lore.kernel.org/all/20240223213733.GA115410@bhelgaas/).
Thanks for finding this!
Since 64dbb2d70744 was merged for v6.9-rc1, I queued this to for-linus
for v6.9 with this subject:
PCI/ASPM: Restore parent state to parent, child state to child
since it's more than just an innocuous typo.
> ---
> drivers/pci/pcie/aspm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
> index 2428d278e015..47761c7ef267 100644
> --- a/drivers/pci/pcie/aspm.c
> +++ b/drivers/pci/pcie/aspm.c
> @@ -177,8 +177,8 @@ void pci_restore_aspm_l1ss_state(struct pci_dev *pdev)
> /* Restore L0s/L1 if they were enabled */
> if (FIELD_GET(PCI_EXP_LNKCTL_ASPMC, clnkctl) ||
> FIELD_GET(PCI_EXP_LNKCTL_ASPMC, plnkctl)) {
> - pcie_capability_write_word(parent, PCI_EXP_LNKCTL, clnkctl);
> - pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, plnkctl);
> + pcie_capability_write_word(parent, PCI_EXP_LNKCTL, plnkctl);
> + pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, clnkctl);
> }
> }
>
> --
> 2.34.1
>
prev parent reply other threads:[~2024-05-06 19:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 5:16 [PATCH] PCI/ASPM: Fix a typo in ASPM restoring logic Kai-Heng Feng
2024-05-06 14:44 ` Ilpo Järvinen
2024-05-06 19:24 ` 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=20240506192401.GA1704739@bhelgaas \
--to=helgaas@kernel.org \
--cc=bhelgaas@google.com \
--cc=david.e.box@linux.intel.com \
--cc=kai.heng.feng@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/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).