From: Vidya Sagar <vidyas@nvidia.com>
To: <bhelgaas@google.com>,
<sathyanarayanan.kuppuswamy@linux.intel.com>,
<rafael.j.wysocki@intel.com>, <kai.heng.feng@canonical.com>,
<enriquezmark36@gmail.com>, <tasev.stefanoska@skynet.be>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<treding@nvidia.com>, <jonathanh@nvidia.com>, <kthota@nvidia.com>,
<mmaddireddy@nvidia.com>, <vidyas@nvidia.com>,
<sagar.tv@gmail.com>
Subject: [PATCH V2] PCI/ASPM: Skip L1SS save/restore if not already enabled
Date: Fri, 20 Jan 2023 14:45:40 +0530 [thread overview]
Message-ID: <20230120091540.3305-1-vidyas@nvidia.com> (raw)
In-Reply-To: <20230119094913.20536-1-vidyas@nvidia.com>
Skip save and restore of ASPM L1 Sub-States specific registers if they
are not already enabled in the system. This is to avoid issues observed
on certain platforms during restoration process, particularly when
restoring the L1SS registers contents.
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=216782
Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
---
v2:
* Address review comments from Kai-Heng Feng and Rafael
drivers/pci/pcie/aspm.c | 17 ++++++++++++++++-
include/linux/pci.h | 1 +
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 53a1fa306e1e..bd2a922081bd 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -761,11 +761,23 @@ void pci_save_aspm_l1ss_state(struct pci_dev *dev)
{
struct pci_cap_saved_state *save_state;
u16 l1ss = dev->l1ss;
- u32 *cap;
+ u32 *cap, val;
if (!l1ss)
return;
+ /*
+ * Skip save and restore of L1 Sub-States registers if they are not
+ * already enabled in the system
+ */
+ pci_read_config_dword(dev, l1ss + PCI_L1SS_CTL1, &val);
+ if (!(val & PCI_L1SS_CTL1_L1SS_MASK)) {
+ dev->skip_l1ss_restore = true;
+ return;
+ }
+
+ dev->skip_l1ss_restore = false;
+
save_state = pci_find_saved_ext_cap(dev, PCI_EXT_CAP_ID_L1SS);
if (!save_state)
return;
@@ -784,6 +796,9 @@ void pci_restore_aspm_l1ss_state(struct pci_dev *dev)
if (!l1ss)
return;
+ if (dev->skip_l1ss_restore)
+ return;
+
save_state = pci_find_saved_ext_cap(dev, PCI_EXT_CAP_ID_L1SS);
if (!save_state)
return;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 22319ea71ab0..39534602b55e 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -395,6 +395,7 @@ struct pci_dev {
unsigned int ltr_path:1; /* Latency Tolerance Reporting
supported from root to here */
u16 l1ss; /* L1SS Capability pointer */
+ bool skip_l1ss_restore; /* Skip L1SS Save/Restore */
#endif
unsigned int pasid_no_tlp:1; /* PASID works without TLP Prefix */
unsigned int eetlp_prefix_path:1; /* End-to-End TLP Prefix */
--
2.17.1
next prev parent reply other threads:[~2023-01-20 9:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 9:49 [PATCH V1] PCI/ASPM: Skip L1SS save/restore if not already enabled Vidya Sagar
2023-01-19 14:21 ` Kai-Heng Feng
2023-01-19 19:01 ` Wysocki, Rafael J
2023-01-20 9:15 ` Vidya Sagar [this message]
2023-01-20 18:41 ` [PATCH V2] " Wysocki, Rafael J
2023-02-08 23:42 ` Bjorn Helgaas
2023-02-10 0:18 ` Bjorn Helgaas
[not found] ` <CAKd_mfQyZ4fePBH4Rtg94g00mRoqUcmukWX1EgzwowNLzdhcSg@mail.gmail.com>
2023-02-10 13:39 ` Mark Enriquez
2023-02-10 13:56 ` Bjorn Helgaas
2023-02-10 17:47 ` Mark Enriquez
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=20230120091540.3305-1-vidyas@nvidia.com \
--to=vidyas@nvidia.com \
--cc=bhelgaas@google.com \
--cc=enriquezmark36@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=kai.heng.feng@canonical.com \
--cc=kthota@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mmaddireddy@nvidia.com \
--cc=rafael.j.wysocki@intel.com \
--cc=sagar.tv@gmail.com \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=tasev.stefanoska@skynet.be \
--cc=treding@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 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.