From: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>
To: "Bjorn Helgaas" <bhelgaas@google.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Jingoo Han" <jingoohan1@gmail.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Jeff Johnson" <jjohnson@kernel.org>,
"Bartosz Golaszewski" <brgl@bgdev.pl>,
"Manivannan Sadhasivam" <mani@kernel.org>,
"Krzysztof Wilczyński" <kwilczynski@kernel.org>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org, mhi@lists.linux.dev,
linux-wireless@vger.kernel.org, ath11k@lists.infradead.org,
qiang.yu@oss.qualcomm.com,
Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>,
Val Packett <val@packett.cool>
Subject: [PATCH v6 1/7] PCI/bwctrl: Set host bridge OPP and optionally disable ASPM around link retraining
Date: Thu, 19 Nov 2026 18:26:33 +0530 [thread overview]
Message-ID: <20261119-bwscale-v6-1-9a9a715fcb46@oss.qualcomm.com> (raw)
In-Reply-To: <20261119-bwscale-v6-0-9a9a715fcb46@oss.qualcomm.com>
PCIe host bridge devices may need their operating point raised before
retraining to a higher link speed so that hardware resources (e.g., RPMh
votes on Qualcomm platforms) are available at the requested data rate.
After retraining, the operating point must be updated to reflect the
actual negotiated speed.
Add pcie_set_opp() to look up an OPP on the host bridge parent device
using a key of (total link rate in kHz, LNKCTL2 Target Link Speed
level). The total link rate is the per-lane rate multiplied by the
link width, so that OPP tables can carry separate entries per generation
and width, e.g. Gen 3 x1 and Gen 3 x2.
In pcie_set_target_speed(), call pcie_set_opp() before retraining only
when upscaling (speed_req > cur_bus_speed), since only raising the
operating point requires pre-staging hardware. After retraining, call
pcie_set_opp() unconditionally with the actual cur_bus_speed to settle
the votes. Both calls are skipped for downstream ports of PCIe switches,
as those are outside the host controller's scope.
Some controllers also require ASPM to be disabled around link retraining.
Add a disable_aspm_for_retrain flag to pci_host_bridge; when set,
pcie_set_target_speed() saves the child device's ASPM state, disables
all ASPM link states before retraining, and restores them afterward. The
child device is used because the ASPM core ignores requests made on the
Root Port itself and configures the link through its downstream device.
The states are restored with pci_force_enable_link_state(), as a
plain enable does not undo pci_disable_link_state().
Signed-off-by: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>
Tested-by: Val Packett <val@packett.cool> # x1e80100-dell-latitude-7455
---
drivers/pci/pcie/bwctrl.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++-
include/linux/pci.h | 1 +
2 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/pcie/bwctrl.c b/drivers/pci/pcie/bwctrl.c
index 3b1122461ffd..c1e749df5bbe 100644
--- a/drivers/pci/pcie/bwctrl.c
+++ b/drivers/pci/pcie/bwctrl.c
@@ -28,9 +28,11 @@
#include <linux/mutex.h>
#include <linux/pci.h>
#include <linux/pci-bwctrl.h>
+#include <linux/pm_opp.h>
#include <linux/rwsem.h>
#include <linux/slab.h>
#include <linux/types.h>
+#include <linux/units.h>
#include "../pci.h"
#include "portdrv.h"
@@ -98,6 +100,37 @@ static int pcie_bwctrl_change_speed(struct pci_dev *port, u16 target_speed, bool
return pcie_retrain_link(port, use_lt);
}
+static int pcie_set_opp(struct pci_dev *pdev, struct pci_host_bridge *host,
+ enum pci_bus_speed speed)
+{
+ struct device *dev = host->dev.parent;
+ struct dev_pm_opp_key key = {};
+ int ret, freq_mbps, width;
+ unsigned long freq_kbps;
+ struct dev_pm_opp *opp;
+ u16 lnksta;
+
+ pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnksta);
+ width = FIELD_GET(PCI_EXP_LNKSTA_NLW, lnksta);
+
+ freq_mbps = pcie_dev_speed_mbps(speed);
+ if (freq_mbps < 0)
+ return -EINVAL;
+
+ freq_kbps = freq_mbps * KILO * width;
+ key.freq = freq_kbps;
+ key.level = pci_bus_speed2lnkctl2(speed);
+ opp = dev_pm_opp_find_key_exact(dev, &key, true);
+ if (!IS_ERR(opp)) {
+ ret = dev_pm_opp_set_opp(dev, opp);
+ if (ret)
+ dev_err(dev, "Failed to set OPP for freq (%lu): %d\n",
+ freq_kbps, ret);
+ dev_pm_opp_put(opp);
+ }
+ return 0;
+}
+
/**
* pcie_set_target_speed - Set downstream Link Speed for PCIe Port
* @port: PCIe Port
@@ -118,9 +151,12 @@ static int pcie_bwctrl_change_speed(struct pci_dev *port, u16 target_speed, bool
int pcie_set_target_speed(struct pci_dev *port, enum pci_bus_speed speed_req,
bool use_lt)
{
+ struct pci_host_bridge *host = pci_find_host_bridge(port->bus);
+ bool is_rootbus = pci_is_root_bus(port->bus);
struct pci_bus *bus = port->subordinate;
+ struct pci_dev *child = NULL, *dev;
+ int aspm_state = 0, ret;
u16 target_speed;
- int ret;
if (WARN_ON_ONCE(!pcie_valid_speed(speed_req)))
return -EINVAL;
@@ -130,6 +166,27 @@ int pcie_set_target_speed(struct pci_dev *port, enum pci_bus_speed speed_req,
target_speed = pcie_bwctrl_select_speed(port, speed_req);
+ /*
+ * Host Bridge resources may need to be scaled for targeted speed
+ * otherwise link might not come up at requested speed.
+ */
+ if (bus && is_rootbus && host) {
+ /* Get function 0 of downstream device */
+ list_for_each_entry(dev, &bus->devices, bus_list) {
+ if (PCI_FUNC(dev->devfn) == 0) {
+ child = dev;
+ break;
+ }
+ }
+
+ if (child && host->disable_aspm_for_retrain) {
+ aspm_state = pcie_aspm_enabled(child);
+ pci_disable_link_state(child, PCIE_LINK_STATE_ALL);
+ }
+ if (speed_req > bus->cur_bus_speed)
+ pcie_set_opp(port, host, speed_req);
+ }
+
scoped_guard(rwsem_read, &pcie_bwctrl_setspeed_rwsem) {
struct pcie_bwctrl_data *data = port->link_bwctrl;
@@ -154,6 +211,12 @@ int pcie_set_target_speed(struct pci_dev *port, enum pci_bus_speed speed_req,
!list_empty(&bus->devices))
ret = -EAGAIN;
+ if (bus && is_rootbus && host) {
+ if (child && host->disable_aspm_for_retrain)
+ pci_force_enable_link_state(child, aspm_state);
+ pcie_set_opp(port, host, bus->cur_bus_speed);
+ }
+
return ret;
}
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 9cbcadd08f3d..352079393edb 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -673,6 +673,7 @@ struct pci_host_bridge {
unsigned int msi_domain:1; /* Bridge wants MSI domain */
unsigned int broken_l1ss_resume:1; /* Resuming from L1SS during
system suspend is broken */
+ unsigned int disable_aspm_for_retrain:1; /* Disable ASPM before link retain */
/* Resource alignment requirements */
resource_size_t (*align_resource)(struct pci_dev *dev,
--
2.34.1
next prev parent reply other threads:[~2026-11-19 12:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 12:56 [PATCH v6 0/7] bus: mhi: host: Add support for mhi bus bw Krishna Chaitanya Chundru
2026-11-19 12:56 ` Krishna Chaitanya Chundru [this message]
2026-11-19 12:56 ` [PATCH v6 2/7] PCI: Export pci_set_target_speed() Krishna Chaitanya Chundru
2026-11-19 12:56 ` [PATCH v6 3/7] PCI: Add pci_lnkctl2_bus_speed() to convert lnkctl2speed to pci_bus_speed Krishna Chaitanya Chundru
2026-11-19 12:56 ` [PATCH v6 4/7] bus: mhi: host: Add support for Bandwidth scale Krishna Chaitanya Chundru
2026-11-19 12:56 ` [PATCH v6 5/7] wifi: ath11k: Add support for MHI bandwidth scaling Krishna Chaitanya Chundru
2026-11-19 12:56 ` [PATCH v6 6/7] wifi: ath12k: " Krishna Chaitanya Chundru
2026-11-19 12:56 ` [PATCH v6 7/7] PCI: qcom: Enable ASPM disabling during link retraining Krishna Chaitanya Chundru
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=20261119-bwscale-v6-1-9a9a715fcb46@oss.qualcomm.com \
--to=krishna.chundru@oss.qualcomm.com \
--cc=ath11k@lists.infradead.org \
--cc=bhelgaas@google.com \
--cc=brgl@bgdev.pl \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jingoohan1@gmail.com \
--cc=jjohnson@kernel.org \
--cc=kwilczynski@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=mhi@lists.linux.dev \
--cc=qiang.yu@oss.qualcomm.com \
--cc=robh@kernel.org \
--cc=val@packett.cool \
/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
all inboxes | Powered by JetHome®