Skip to content

Qcom 6.18.y SCMI repair - #1122

Open
LXQUALCOMM wants to merge 2 commits into
qualcomm-linux:qcom-6.18.yfrom
LXQUALCOMM:qcom-6.18.y
Open

LXQUALCOMM wants to merge 2 commits into
qualcomm-linux:qcom-6.18.yfrom
LXQUALCOMM:qcom-6.18.y

Conversation

@LXQUALCOMM

@LXQUALCOMM LXQUALCOMM commented Sep 16, 2026

Copy link
Copy Markdown

This PR restores the SCMI memlat devfreq support for qcom-6.18.y that was previously reverted in #1081, and fixes the resulting kgsl out-of-tree module build failure.

Commit 1: Revert "Revert SCMI for qcom-6.18.y (#1081)"
Restores the full SCMI series, including the QCOM SCMI Generic Vendor Protocol, the remote devfreq governor, and the QCOM SCMI Memlat devfreq driver. As part of this, drivers/devfreq/governor.h is moved to the public header location include/linux/devfreq-governor.h.

Commit 2: QCLINUX: drivers/devfreq: Add compatibility shim for out-of-tree modules
The governor.h move breaks out-of-tree modules (e.g. kgsl) that still #include "governor.h" from the old path. A compatibility shim is added at drivers/devfreq/governor.h that simply redirects to <linux/devfreq-governor.h>. No changes to in-tree drivers or kgsl are required

CRs-Fixed: 4559569

@qswat-orbit-external

Copy link
Copy Markdown

Dev Completion validation failed

CR: 4559569
Change Task: kernel.qli.2.0
Error: GenAI Assisted field must be set before moving change tasks to Development Complete. Please provide GenAI information.

The change task for this CR could not be moved to Dev Complete because of the error above. Please resolve the issue in Orbit and re-run the failed Orbit check.

This reverts commit 926f4ae, reversing
changes made to be1f40d.

Signed-off-by: Xin Liu <xin.liu@oss.qualcomm.com>
governor.h was moved to include/linux/devfreq-governor.h as part of the
SCMI series. Add a compatibility shim at the old location to support
out-of-tree modules (e.g. kgsl) that still reference drivers/devfreq/governor.h
on 6.18.y kernels.

Signed-off-by: Xin Liu <xin.liu@oss.qualcomm.com>
@qswat-orbit-external

Copy link
Copy Markdown

Dev Completion validation failed

CR: 4559569
Change Task: kernel.qli.2.0
Error: GenAI Assisted field must be set before moving change tasks to Development Complete. Please provide GenAI information.

The change task for this CR could not be moved to Dev Complete because of the error above. Please resolve the issue in Orbit and re-run the failed Orbit check.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

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.

1 participant