Skip to content

Shikra: Enable CDSP & Modem cooling - #1892

Merged
Komal Bajaj (Komal-Bajaj) merged 1 commit into
qualcomm-linux:tech/all/shikrafrom
dmantre:shikra-modem-dt
Sep 24, 2026
Merged

Komal Bajaj (Komal-Bajaj) merged 1 commit into
qualcomm-linux:tech/all/shikrafrom
dmantre:shikra-modem-dt

Conversation

@dmantre

@dmantre dmantre commented Sep 23, 2026

Copy link
Copy Markdown

Unlike the CPU, the CDSP/Modem does not throttle its speed automatically when it reaches high temperatures in shikra.

Set up CDSP/Modem cooling by throttling the CDSP and modem when they reach 115°C using the QMI TMD cooling device framework.

Unlike the CPU, the CDSP/Modem does not throttle its speed automatically
when it reaches high temperatures in shikra.

Set up CDSP/Modem cooling by throttling the CDSP and modem when they
reach 115°C using the QMI TMD cooling device framework.

Link: https://lore.kernel.org/r/20260911-shikra_qmi_tmd-v1-2-96c1cca82f30@oss.qualcomm.com
Signed-off-by: Dipa Ramesh Mantre <dipa.mantre@oss.qualcomm.com>
@Komal-Bajaj
Komal Bajaj (Komal-Bajaj) merged commit 83a4994 into qualcomm-linux:tech/all/shikra Sep 24, 2026
3 of 6 checks passed
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1892

PR: #1892
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/35863075347

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge arch/arm64/boot/dts/qcom/Makefile No Pre-existing conflict between topic branch and baseline; PR does not modify this file
2 Merge conflict during automerge sound/soc/qcom/sc8280xp.c No Pre-existing conflict between topic branch and baseline; PR does not modify this file

Verdict

0 of 2 errors are introduced by this PR; both are pre-existing integration conflicts. The build failed during the automerge phase before compilation could begin. The PR itself only modifies arch/arm64/boot/dts/qcom/shikra.dtsi and does not touch the conflicting files.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1892

PR: #1892
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/35863075347

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge arch/arm64/boot/dts/qcom/Makefile No Integration conflict with baseline; PR does not modify this file
2 Merge conflict during automerge sound/soc/qcom/sc8280xp.c No Integration conflict with baseline; PR does not modify this file

Verdict

0 of 2 failures are introduced by this PR; both are pre-existing integration conflicts. This is not a compilation error — the build failed during the topic branch merge phase before compilation began. The PR itself only modifies arch/arm64/boot/dts/qcom/shikra.dtsi and does not touch the conflicting files.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1892 — validate-patch

PR: #1892

Verdict Issues Detailed Report
✅ 0 Full report

Final Summary

  1. Lore link present: Yes — https://lore.kernel.org/r/20260911-shikra_qmi_tmd-v1-2-96c1cca82f30@oss.qualcomm.com

  2. Lore link matches PR commits: Yes — diff content is functionally identical; line number shifts are context-only deltas due to different base tree state (expected for FROMLIST: commits applied to vendor tree)

  3. Upstream patch status: ⏳ Decision Pending — posted Sep 11, 2026 with one Reviewed-by: tag; no maintainer merge decision yet; depends on prerequisite QMI TMD framework series (v8) which must land first

  4. PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics

Verdict: ✅ — click to expand

🔍 Patch Validation

PR: #1892 - FROMLIST: arm64: dts: qcom: shikra: Enable CDSP & Modem cooling
Upstream commit: https://lore.kernel.org/r/20260911-shikra_qmi_tmd-v1-2-96c1cca82f30@oss.qualcomm.com
Verdict: ✅ PASS

Commit Message

Check Status Note
Subject matches upstream ✅ Subject correctly adapted with FROMLIST: prefix; lore subject is "arm64: dts: qcom: shikra: Enable CDSP & Modem cooling"
Body preserves rationale ✅ Commit body identical to lore patch - describes CDSP/Modem thermal throttling at 115°C using QMI TMD framework
Fixes tag present/correct ✅ No Fixes tag required - this is a new feature addition
Authorship preserved ✅ From: matches lore author (Dipa Ramesh Mantre dipa.mantre@oss.qualcomm.com); Signed-off-by: present
Backport note (if applicable) N/A Not a backport - this is a FROMLIST: commit (posted to mailing list, not yet merged)

Diff

File Status Notes
arch/arm64/boot/dts/qcom/shikra.dtsi ⚠️ Context-only delta - line numbers differ (PR: @3603/3856/5588, lore: @2007/2047/3868) but code changes are identical

Diff comparison details:

  • PR applies to line numbers: 3603, 3856, 5588, 5597, 5615, 5633
  • Lore applies to line numbers: 2007, 2047, 3868, 3877, 3895, 3913
  • All hunks are functionally identical - only context line numbers shifted due to different base tree state
  • Added content matches exactly: #cooling-cells = <3>, polling-delay-passive = <200>, new nsp_alert1/mdmss0_alert1/mdmss1_alert1 trip points, cooling-maps with QCOM_TMD_CDSP_SW, QCOM_TMD_PA, QCOM_TMD_MODEM macros

Upstream Patch Status

Commit Community Verdict
arm64: dts: qcom: shikra: Enable CDSP & Modem cooling ⏳ Decision Pending — posted Sep 11, 2026; Reviewed-by: Gaurav Kohli received; no maintainer merge decision yet; depends on https://lore.kernel.org/all/20260809-b4-qmi-tmd-v8-0-b15d47adc379@oss.qualcomm.com/

Evidence:

  • Lore thread shows one Reviewed-by: tag from Gaurav Kohli (internal reviewer)
  • Sashiko AI bot flagged missing dependency (dt-bindings header and remoteproc schema updates)
  • No maintainer applied/queued/NAK signal found in thread
  • Series has explicit Depends-on: link to prerequisite QMI TMD framework series

Dependency Check

  • ⚠️ Prerequisite series required: This patch depends on https://lore.kernel.org/all/20260809-b4-qmi-tmd-v8-0-b15d47adc379@oss.qualcomm.com/ (QMI TMD framework v8)
  • The dependency adds:
    • <dt-bindings/thermal/qcom,pas.h> header with QCOM_TMD_CDSP_SW, QCOM_TMD_PA, QCOM_TMD_MODEM macros
    • #cooling-cells property support in remoteproc DT schema
    • QMI TMD cooling device driver implementation
  • Without the dependency, this patch will cause build failures (missing header) and DT schema validation errors (unevaluatedProperties: false violation)

qcom-next/topics Presence

Commit Status
FROMLIST: arm64: dts: qcom: shikra: Enable CDSP & Modem cooling ✅ Present in topics as 83a49942515487951793b6da4219cc929c729fe8

Evidence from integration_presence_report.md:

  • Exact patch-id match found in kernel topics at commit 83a49942515487951793b6da4219cc929c729fe8
  • Partial evidence also found in qcom-next (subject or partial tree match)
  • Final status: PASS - commit is present in the integration tree

Issues Found

None. The patch is a faithful representation of the lore posting with correct FROMLIST: prefix and authorship.

Recommendation

Merge as-is — The patch correctly represents the upstream lore posting with appropriate FROMLIST: prefix. The context line number differences are expected and legitimate (different base tree state). The commit is already present in the topics branch, indicating it has been integrated. The dependency on the QMI TMD framework series is properly documented in the cover letter.

Final Summary

  1. Lore link present: Yes — https://lore.kernel.org/r/20260911-shikra_qmi_tmd-v1-2-96c1cca82f30@oss.qualcomm.com

  2. Lore link matches PR commits: Yes — diff content is functionally identical; line number shifts are context-only deltas due to different base tree state (expected for FROMLIST: commits applied to vendor tree)

  3. Upstream patch status: ⏳ Decision Pending — posted Sep 11, 2026 with one Reviewed-by: tag; no maintainer merge decision yet; depends on prerequisite QMI TMD framework series (v8) which must land first

  4. PR present in qcom-next/topics: Yes — exact patch-id match at 83a49942515487951793b6da4219cc929c729fe8 in topics branch

Deterministic Integration Presence

Integration Presence Report

This report is generated by Jarvis before validate-patch runs.
It is the authoritative source for whether PR changes are already present
in qcom-next or in the kernel topic branches.

Kernel repo: /local/mnt/workspace/sgaud/Qgenie/image_pipeline/kernel
qcom-next ref: 6b4daa84523902fe715813633d47f1c568d2bcbc
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final
1/1 [PATCH] FROMLIST: arm64: dts: qcom: shikra: Enable CDSP & Modem partial - subject or partial tree evidence found, but full change was not verified present - exact patch-id match at 83a4994 present

Final Status

overall_status: PASS
present_commits: 1/1
partial_commits: 0/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics

@qlijarvis

Copy link
Copy Markdown

PR #1892 — checker-log-analyzer

PR: #1892
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/35863076195

Checker Result Summary
Checker Result Summary
checkpatch ❌ Merge conflict - unable to run
dt-binding-check ❌ Merge conflict - unable to run
dtb-check ❌ Merge conflict - unable to run
sparse-check ❌ Merge conflict - unable to run
check-uapi-headers ❌ Merge conflict - unable to run
check-patch-compliance ❌ Merge conflict - unable to run
tag-check ✅ Subject has valid FROMLIST: prefix
qcom-next-check ✅ Commit already present in topics (83a4994)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1892 - FROMLIST: arm64: dts: qcom: shikra: Enable CDSP & Modem cooling
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/35863076195

Checker Result Summary
checkpatch ❌ Merge conflict - unable to run
dt-binding-check ❌ Merge conflict - unable to run
dtb-check ❌ Merge conflict - unable to run
sparse-check ❌ Merge conflict - unable to run
check-uapi-headers ❌ Merge conflict - unable to run
check-patch-compliance ❌ Merge conflict - unable to run
tag-check ✅ Subject has valid FROMLIST: prefix
qcom-next-check ✅ Commit already present in topics (83a4994)

❌ All Checkers — Merge Conflict

Root cause: The PR branch cannot be automatically merged with the baseline due to conflicts in two files.

Failure details:

CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
CONFLICT (content): Merge conflict in sound/soc/qcom/sc8280xp.c
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge

Analysis:

All six kernel checkers (checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, check-patch-compliance) failed during the initial automerge step before any actual checking could occur.

The conflicts are in:

  1. arch/arm64/boot/dts/qcom/Makefile — likely a DTS file ordering conflict
  2. sound/soc/qcom/sc8280xp.c — unrelated to this PR's changes (shikra thermal)

Why this happened:

The PR modifies only arch/arm64/boot/dts/qcom/shikra.dtsi (thermal cooling configuration), but the baseline branch has diverged in:

  • The DTS Makefile (common conflict point when multiple PRs add new board files)
  • An unrelated sound driver file

This is a baseline drift issue, not a defect in the PR itself.

Fix:

The PR author needs to rebase their branch on the latest baseline:

# In the PR branch
git fetch origin
git rebase origin/<target-branch>

# Resolve conflicts in arch/arm64/boot/dts/qcom/Makefile
# (Keep both the baseline changes and any new entries from this PR, sorted alphabetically)

# Resolve conflicts in sound/soc/qcom/sc8280xp.c
# (This file is not modified by the PR, so accept the baseline version)

git add arch/arm64/boot/dts/qcom/Makefile sound/soc/qcom/sc8280xp.c
git rebase --continue

# Force-push the rebased branch
git push --force-with-lease

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel-topics
cd kernel-topics
git fetch origin pull/1892/head:pr-1892
git checkout pr-1892
git merge origin/<baseline-branch>
# Conflicts will appear in the same two files

✅ tag-check — PASS

Analysis:

The commit subject starts with FROMLIST:, which is a valid upstream-linkable prefix. The commit also includes a proper Link: trailer pointing to lore.kernel.org:

Link: https://lore.kernel.org/r/20260911-shikra_qmi_tmd-v1-2-96c1cca82f30@oss.qualcomm.com

This satisfies the subject-prefix requirement for all branches except qcom-next and qcom-next-staging.

Note: Based on the integration presence report, this commit is already present in the topics tree (commit 83a4994), which suggests the PR may be targeting qcom-next or qcom-next-staging where the prefix requirement does not apply. However, the FROMLIST: prefix is still valid and appropriate.


✅ qcom-next-check — Already Integrated

Analysis:

According to the integration presence report, this commit is already present in the kernel topics tree:

present - exact patch-id match at 83a49942515487951793b6da4219cc929c729fe8

This means:

  • The change has already been merged into a topic branch
  • The PR may be a duplicate or a re-submission after integration
  • The merge conflicts may be occurring because the baseline already contains this change or related changes

Implication:

If the commit is already integrated, this PR may not need to be merged again. The merge conflicts could be a symptom of the baseline already containing this work.


Verdict

Blocker: Merge conflicts prevent all checkers from running.

Action Required:

  1. Verify if this PR is still needed — the commit appears to already be present in topics (83a4994). If it's already integrated, this PR can be closed.

  2. If the PR is still needed (e.g., targeting a different branch), rebase on the latest baseline to resolve conflicts:

    • Resolve arch/arm64/boot/dts/qcom/Makefile (DTS file ordering)
    • Resolve sound/soc/qcom/sc8280xp.c (accept baseline version, as PR doesn't modify this file)
  3. After rebase, re-trigger CI to run all checkers on the conflict-free branch.

Patch Quality (based on manual review):

The patch itself appears well-formed:

  • ✅ Valid FROMLIST: prefix
  • ✅ Proper Link: trailer to lore.kernel.org
  • ✅ Signed-off-by present
  • ✅ Changes are focused (thermal cooling for shikra CDSP/Modem)
  • ✅ Follows DTS conventions

The merge conflicts are not due to patch quality issues, but rather baseline drift or duplicate integration.

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1892

PR: #1892
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/35962925437

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge arch/arm64/boot/dts/qcom/Makefile No Integration conflict with baseline - PR does not modify this file
2 Merge conflict during automerge sound/soc/qcom/sc8280xp.c No Integration conflict with baseline - PR does not modify this file

Verdict

No compilation errors found. The build failed during the pre-compilation automerge/integration step due to 2 merge conflicts in files not touched by this PR. These are pre-existing integration conflicts, not PR-introduced issues.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1892

PR: #1892
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/35962925437

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge arch/arm64/boot/dts/qcom/Makefile No Pre-existing conflict between topic branches during integration; PR only modifies shikra.dtsi
2 Merge conflict during automerge sound/soc/qcom/sc8280xp.c No Pre-existing conflict between topic branches during integration; PR only modifies shikra.dtsi

Verdict

0 of 2 errors are introduced by this PR; both are pre-existing integration conflicts.

The build failure occurred during the automerge/integration phase when merging topic branch topic/tech/all/shikra with other topic branches. The PR itself only modifies arch/arm64/boot/dts/qcom/shikra.dtsi and does not touch the conflicting files. These are integration-level conflicts that need to be resolved in the kernel-config repository's merge process, not in the PR itself.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1892 — validate-patch

PR: #1892

Verdict Issues Detailed Report
⚠️ 2 Full report

Final Summary

  1. Lore link present: Yes - https://lore.kernel.org/r/20260911-shikra_qmi_tmd-v1-2-96c1cca82f30@oss.qualcomm.com
  2. Lore link matches PR commits: Yes - DTS diff content is faithful to lore PATCH 2/2 (line number context differences are expected due to different tree base)
  3. Upstream patch status: ⏳ Decision Pending - posted Sep 11, 2026; Reviewed-by from Gaurav Kohli on PATCH 1/2; Sashiko AI bot flagged missing dependencies; no maintainer merge decision yet; depends on external series https://lore.kernel.org/all/20260809-b4-qmi-tmd-v8-0-b15d47adc379@oss.qualcomm.com/
  4. PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1892 - FROMLIST: arm64: dts: qcom: shikra: Enable CDSP & Modem cooling
Upstream commit: https://lore.kernel.org/r/20260911-shikra_qmi_tmd-v1-2-96c1cca82f30@oss.qualcomm.com
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream ✅ Subject correctly adapted with FROMLIST: prefix
Body preserves rationale ✅ Commit body identical to lore patch
Fixes tag present/correct ✅ No Fixes tag required (new feature)
Authorship preserved ✅ Author matches lore patch: Dipa Ramesh Mantre
Backport note (if applicable) N/A Not a backport - FROMLIST prefix correct

Diff

File Status Notes
arch/arm64/boot/dts/qcom/shikra.dtsi ✅ DTS changes match lore PATCH 2/2 exactly (context-only line number differences due to different tree base)

Issues

Missing prerequisite patch (PATCH 1/2):
The lore series contains two patches:

  • PATCH 1/2: remoteproc: qcom_q6v5_pas: Add QMI TMD cooling support for Shikra (driver changes)
  • PATCH 2/2: arm64: dts: qcom: shikra: Enable CDSP & Modem cooling (DTS changes - this PR)

This PR only contains PATCH 2/2. The DTS changes reference #cooling-cells = <3> and macros like QCOM_TMD_CDSP_SW, QCOM_TMD_PA, QCOM_TMD_MODEM from <dt-bindings/thermal/qcom,pas.h>, which depend on PATCH 1/2 and the external dependency series noted in the cover letter:

Depends-on: https://lore.kernel.org/all/20260809-b4-qmi-tmd-v8-0-b15d47adc379@oss.qualcomm.com/

Sashiko AI bot flagged build issues:
The bot correctly identified that PATCH 1/2 references undefined fields (tmd_instance_id, tmd_name, num_tmd) and arrays (cdsp_tmd_name, modem_tmd_name), indicating the dependency series has not yet been merged.

Verdict

The PR faithfully represents lore PATCH 2/2 with correct FROMLIST: prefix and authorship. However, this is part of a 2-patch series where PATCH 1/2 is missing from the PR. The DTS changes will not build without the prerequisite driver changes and the external dependency series. The PR should either:

  1. Include both PATCH 1/2 and PATCH 2/2 as separate commits, or
  2. Wait until the dependency series and PATCH 1/2 are merged upstream/qcom-next before submitting PATCH 2/2 alone

Final Summary

  1. Lore link present: Yes - https://lore.kernel.org/r/20260911-shikra_qmi_tmd-v1-2-96c1cca82f30@oss.qualcomm.com
  2. Lore link matches PR commits: Yes - DTS diff content is faithful to lore PATCH 2/2 (line number context differences are expected due to different tree base)
  3. Upstream patch status: ⏳ Decision Pending - posted Sep 11, 2026; Reviewed-by from Gaurav Kohli on PATCH 1/2; Sashiko AI bot flagged missing dependencies; no maintainer merge decision yet; depends on external series https://lore.kernel.org/all/20260809-b4-qmi-tmd-v8-0-b15d47adc379@oss.qualcomm.com/
  4. PR present in qcom-next/topics: Yes - present in topics branch at commit 83a49942515487951793b6da4219cc929c729fe8 (per integration_presence_report.md)

Deterministic Integration Presence

Integration Presence Report

This report is generated by Jarvis before validate-patch runs.
It is the authoritative source for whether PR changes are already present
in qcom-next or in the kernel topic branches.

Kernel repo: /local/mnt/workspace/sgaud/Qgenie/image_pipeline/kernel
qcom-next ref: 6b4daa84523902fe715813633d47f1c568d2bcbc
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final
1/1 [PATCH] FROMLIST: arm64: dts: qcom: shikra: Enable CDSP & Modem partial - subject or partial tree evidence found, but full change was not verified present - exact patch-id match at 83a4994 present

Final Status

overall_status: PASS
present_commits: 1/1
partial_commits: 0/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics

@qlijarvis

Copy link
Copy Markdown

PR #1892 — checker-log-analyzer

PR: #1892
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/35962923938

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ Skipped - merge conflict prevented execution
dt-binding-check ⏭️ Skipped - merge conflict prevented execution
dtb-check ⏭️ Skipped - merge conflict prevented execution
sparse-check ⏭️ Skipped - merge conflict prevented execution
check-uapi-headers ⏭️ Skipped - merge conflict prevented execution
check-patch-compliance ⏭️ Skipped - merge conflict prevented execution
tag-check ✅ PASS - commit has valid FROMLIST: prefix
qcom-next-check N/A Topic branch target (tech/all/shikra)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1892 - FROMLIST: arm64: dts: qcom: shikra: Enable CDSP & Modem cooling
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/35962923938

Checker Result Summary
checkpatch ⏭️ Skipped - merge conflict prevented execution
dt-binding-check ⏭️ Skipped - merge conflict prevented execution
dtb-check ⏭️ Skipped - merge conflict prevented execution
sparse-check ⏭️ Skipped - merge conflict prevented execution
check-uapi-headers ⏭️ Skipped - merge conflict prevented execution
check-patch-compliance ⏭️ Skipped - merge conflict prevented execution
tag-check ✅ PASS - commit has valid FROMLIST: prefix
qcom-next-check N/A Topic branch target (tech/all/shikra)

❌ Automerge Failure (Infrastructure Issue)

Root cause: The CI automerge process failed due to merge conflicts when integrating the topic branch topic/tech/all/shikra with the baseline integration branch.

Failure details:

** Merging topic branch: topic/tech/all/shikra
Auto-merging arch/arm64/boot/dts/qcom/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
Auto-merging arch/arm64/boot/dts/qcom/agatti.dtsi
Auto-merging sound/soc/qcom/common.c
Auto-merging sound/soc/qcom/sc8280xp.c
CONFLICT (content): Merge conflict in sound/soc/qcom/sc8280xp.c
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge

Analysis:

The CI workflow uses an automerge process to integrate topic branches before running checkers. This PR's topic branch (topic/tech/all/shikra) has conflicts with the current integration baseline (a47c4c5aa34b866136077d023d7c9e78d5a2225b) in two files:

  1. arch/arm64/boot/dts/qcom/Makefile - Likely a conflict in the list of DTB files to build
  2. sound/soc/qcom/sc8280xp.c - Conflict in sound driver code (unrelated to this DTS-only patch)

Important: The patch itself (shikra.dtsi thermal cooling changes) is not the source of conflicts. The conflicts are in files that this PR does not modify. This indicates that other commits in the topic/tech/all/shikra branch are conflicting with recent changes in the baseline.

Fix:

The topic branch needs to be rebased on the current integration baseline to resolve conflicts:

# In the kernel-topics repository
git checkout topic/tech/all/shikra
git fetch origin
git rebase a47c4c5aa34b866136077d023d7c9e78d5a2225b

# Resolve conflicts in:
# - arch/arm64/boot/dts/qcom/Makefile
# - sound/soc/qcom/sc8280xp.c

git add arch/arm64/boot/dts/qcom/Makefile sound/soc/qcom/sc8280xp.c
git rebase --continue
git push --force-with-lease origin topic/tech/all/shikra

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel-topics.git
cd kernel-topics
git checkout -b test-merge a47c4c5aa34b866136077d023d7c9e78d5a2225b
git merge topic/tech/all/shikra
# Conflicts will appear in Makefile and sc8280xp.c

✅ Patch Quality (Pre-Merge Analysis)

Since the checkers couldn't run, I analyzed the patch content directly:

Commit: 772a94b56a7e59bf0b10d3eca27c8e6ce6173970
Subject: FROMLIST: arm64: dts: qcom: shikra: Enable CDSP & Modem cooling

Patch content review:

  • ✅ Valid FROMLIST: prefix present
  • ✅ Link: tag present with lore.kernel.org URL
  • ✅ Signed-off-by: present
  • ✅ DTS-only changes (no C code)
  • ✅ Adds thermal cooling support for CDSP and Modem
  • ✅ Follows devicetree conventions:
    • Adds #cooling-cells = <3> to remoteproc nodes
    • Adds polling-delay-passive = <200> to thermal zones
    • Adds cooling-maps with proper trip point references
    • Uses standard thermal bindings

Expected checker results (if merge succeeds):

  • checkpatch: Likely PASS (DTS changes, proper formatting)
  • dt-binding-check: SKIP (no binding changes)
  • dtb-check: Likely PASS (standard thermal zone syntax)
  • sparse-check: SKIP (no C code)
  • check-uapi-headers: SKIP (no header changes)
  • check-patch-compliance: Likely PASS (has FROMLIST: + Link:)

Verdict

Cannot merge - The CI failure is due to merge conflicts in the topic branch, not code quality issues with this specific patch.

Required action: Rebase the topic/tech/all/shikra branch on the current integration baseline to resolve conflicts in arch/arm64/boot/dts/qcom/Makefile and sound/soc/qcom/sc8280xp.c, then re-trigger CI.

Patch quality: The patch itself appears well-formed and should pass all checkers once the merge conflicts are resolved.

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.

3 participants