Skip to content

FROMLIST: PCI: qcom: Add D3cold support - #1038

Open
ziyuezhang-123 wants to merge 1 commit into
qualcomm-linux:qcom-6.18.yfrom
ziyuezhang-123:for-6.18/pci-qcom-set-max-opp-before-icc-enable-in-d3cold-resume
Open

FROMLIST: PCI: qcom: Add D3cold support#1038
ziyuezhang-123 wants to merge 1 commit into
qualcomm-linux:qcom-6.18.yfrom
ziyuezhang-123:for-6.18/pci-qcom-set-max-opp-before-icc-enable-in-d3cold-resume

Conversation

@ziyuezhang-123

Copy link
Copy Markdown

During resume from D3cold, set the PCIe controller to the maximum OPP
before enabling the ICC paths and accessing DBI registers. Without this,
qcom_pcie_icc_opp_update() may access DBI before OPP votes are restored,
triggering NoC errors.

The qli2.0 branch merged the D3cold patch (PR #461) before the
'Set max OPP before DBI access during resume' fix was applied, so the
if (pcie->use_pm_opp) block was missing from the if (pcie->pci->suspended)
branch in qcom_pcie_resume_noirq(). This commit brings qli2.0 in sync
with upstream commit 2cc0e74.

Signed-off-by: Krishna Chaitanya Chundru krishna.chundru@oss.qualcomm.com
Signed-off-by: Ziyue Zhang ziyue.zhang@oss.qualcomm.com

CRs-Fixed: 4569097
Link: https://lore.kernel.org/all/20260429-d3cold-v5-5-89e9735b9df6@oss.qualcomm.com/

During resume from D3cold, set the PCIe controller to the maximum OPP
before enabling the ICC paths and accessing DBI registers. Without this,
qcom_pcie_icc_opp_update() may access DBI before OPP votes are restored,
triggering NoC errors.

The qli2.0 branch merged the D3cold patch (PR qualcomm-linux#461) before the
'Set max OPP before DBI access during resume' fix was applied, so the
if (pcie->use_pm_opp) block was missing from the if (pcie->pci->suspended)
branch in qcom_pcie_resume_noirq(). This commit brings qli2.0 in sync
with upstream commit 2cc0e74.

CRs-Fixed: 4569097
Link: https://lore.kernel.org/all/20260429-d3cold-v5-5-89e9735b9df6@oss.qualcomm.com/
Signed-off-by: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>
Signed-off-by: Ziyue Zhang <ziyue.zhang@oss.qualcomm.com>
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No Change Task Found

No associated change tasks found for CR 4569097 on any of the following entities:

Entities:

  • kernel.qli.2.0

CR: 4569097

Please ensure the CR has a change task associated with at least one of the entities for this branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants