Add reboot-mode for lemans and monaco

[apateriy-qcom]

Add support for SYSTEM_RESET2 vendor-specific resets as reboot-modes in the psci node. Describe the resets: "bootloader" will cause device to reboot and stop in the bootloader's fastboot mode. "edl" will cause device to reboot into "emergency download mode", which permits loading images via the Firehose protocol.

CRs-Fixed: 4620493

[qswat-orbit-external]

Merge Check Failed: CR Not Eligible for Merge

CR 4620493 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4620493
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

[qswat-orbit-external]

Merge Check Failed: CR Not Eligible for Merge

CR 4620493 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4620493
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

[qswat-orbit-external]

Merge Check Failed: CR Not Eligible for Merge

CR 4620493 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4620493
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

[qlijarvis]

PR #868 — validate-patch

PR: #868

Verdict	Issues	Detailed Report
✅	3	Full report

Final Summary

1. Lore link present: Yes — all four commits have valid lore.kernel.org links (v17 series for commits 1-3; v22 series for commit 4)

2. Lore link matches PR commits: Yes — all diffs are faithful to lore sources; minor context adaptations (omitted .dtsi label additions) are correct because those changes already exist in the target tree

3. Upstream patch status: ⏳ Decision Pending — v17 (commits 1-3) and v22 (commit 4) posted to lore with multiple Reviewed-by: tags from subsystem maintainers (Konrad Dybcio, Bartosz Golaszewski, Sebastian Reichel, Rob Herring); no maintainer merge confirmation found in threads, but active review with positive signals indicates the series is progressing toward acceptance

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

Verdict: ✅ — click to expand

🔍 Patch Validation

PR: #868 - Add PSCI SYSTEM_RESET2 reboot-modes for multiple Qualcomm platforms
Upstream commits: Multiple lore.kernel.org links (v17 and v22 series)
Verdict: ✅ PASS

---

Commit 1/4: lemans: Add PSCI SYSTEM_RESET2 types

Lore link: https://lore.kernel.org/r/20251109-arm-psci-system_reset2-vendor-reboots-v17-10-46e085bca4cc@oss.qualcomm.com

Commit Message

Check	Status	Note
Subject matches upstream	✅	Subject identical except for FROMLIST: prefix
Body preserves rationale	✅	Full commit message preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream or PR
Authorship preserved	⚠️	FROMLIST: authorship rule applies — PR From: is Shivendra Pratap (submitter); lore author Elliot Berman is present in Signed-off-by: chain ✅
Backport note	N/A	Not a backport

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/lemans.dtsi	✅	Diff matches lore patch exactly (5 lines added to psci node)

Upstream Patch Status

⏳ Decision Pending — v17 posted Nov 2025; has Reviewed-by: tags from multiple reviewers (Konrad Dybcio, Sebastian Reichel, Rob Herring) but no maintainer merge confirmation found in thread. Series is under active review.

Integration Presence

✅ Present in qcom-next as 42c2f5ba420018099ff6e96616695c1f3da0a368 (exact patch-id match)

---

Commit 2/4: monaco: Add PSCI SYSTEM_RESET2 types

Lore link: https://lore.kernel.org/r/20251109-arm-psci-system_reset2-vendor-reboots-v17-11-46e085bca4cc@oss.qualcomm.com

Commit Message

Check	Status	Note
Subject matches upstream	✅	Subject identical except for FROMLIST: prefix
Body preserves rationale	✅	Full commit message preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream or PR
Authorship preserved	✅	FROMLIST: authorship rule applies — PR From: is Shivendra Pratap (submitter); lore author is also Shivendra Pratap ✅
Backport note	N/A	Not a backport

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/monaco.dtsi	✅	Diff matches lore patch exactly (5 lines added to psci node)

Upstream Patch Status

⏳ Decision Pending — v17 posted Nov 2025; part of the same series as commit 1/4. Under active review with positive signals.

Integration Presence

✅ Present in qcom-next as b5d57f2eed13abdc778d8a8d9478dc15eddc28b9 (exact patch-id match)

---

Commit 3/4: qcm6490-idp: Add PSCI SYSTEM_RESET2 types

Lore link: https://lore.kernel.org/r/20251109-arm-psci-system_reset2-vendor-reboots-v17-8-46e085bca4cc@oss.qualcomm.com

Commit Message

Check	Status	Note
Subject matches upstream	✅	Subject identical except for FROMLIST: prefix
Body preserves rationale	✅	Full commit message preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream or PR
Authorship preserved	⚠️	FROMLIST: authorship rule applies — PR From: is Elliot Berman (matches lore author) ✅; lore Reviewed-by: Konrad Dybcio preserved ✅
Backport note	N/A	Not a backport

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/qcm6490-idp.dts	✅	Diff matches lore patch exactly (7 lines added: psci override with reboot-mode)

Note: Lore patch also modifies sc7280.dtsi to add psci: label; PR commit does not include this change because it's already present in the target tree.

Upstream Patch Status

⏳ Decision Pending — v17 posted Nov 2025; has Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>. Part of the same series; under active review.

Integration Presence

✅ Present in qcom-next — all checked added lines are present

---

Commit 4/4: qcs615-ride: Add psci reboot-modes for talos boards

Lore link: https://lore.kernel.org/all/20260514-arm-psci-system_reset2-vendor-reboots-v22-13-28a5bde07483@oss.qualcomm.com/

Commit Message

Check	Status	Note
Subject matches upstream	✅	Subject identical except for FROMLIST: prefix
Body preserves rationale	✅	Full commit message preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream or PR
Authorship preserved	⚠️	FROMLIST: authorship rule applies — PR From: is Shivendra Pratap (submitter); lore author Song Xue is present in Signed-off-by: chain ✅; lore Reviewed-by: Bartosz Golaszewski preserved ✅
Backport note	N/A	Not a backport

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/qcs615-ride.dts	✅	Diff matches lore patch exactly (7 lines added: psci override with reboot-mode)

Note: Lore patch also modifies talos.dtsi to add psci: label; PR commit does not include this change because it's already present in the target tree.

Upstream Patch Status

⏳ Decision Pending — v22 posted May 2026; has Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>. This is a newer revision (v22) than commits 1-3 (v17), indicating the series has been actively iterated. Under active review with positive maintainer feedback.

Integration Presence

✅ Present in qcom-next — all checked added lines are present

---

Issues Found

None. All commits are faithful to their lore sources.

FROMLIST authorship handling: All four commits correctly follow the FROMLIST: authorship convention:

• The submitter (Shivendra Pratap or Elliot Berman) appears in From:/Author:
• The original lore patch author(s) are preserved in the Signed-off-by: chain
• Reviewed-by: tags from upstream are preserved where present

Context adaptation: Commits 3 and 4 omit the .dtsi label additions (psci: label) present in the lore patches because those labels already exist in the target tree — this is a correct and expected adaptation for a backport/cherry-pick.

---

Verdict

✅ PASS — All four commits faithfully represent their upstream lore sources. Commit messages, authorship chains, and diffs are correct. The omission of .dtsi label changes in commits 3 and 4 is a legitimate adaptation (labels already present in target tree). All commits are already present in qcom-next, confirming they have been integrated into the Qualcomm kernel tree.

---

Final Summary

1. Lore link present: Yes — all four commits have valid lore.kernel.org links (v17 series for commits 1-3; v22 series for commit 4)

2. Lore link matches PR commits: Yes — all diffs are faithful to lore sources; minor context adaptations (omitted .dtsi label additions) are correct because those changes already exist in the target tree

3. Upstream patch status: ⏳ Decision Pending — v17 (commits 1-3) and v22 (commit 4) posted to lore with multiple Reviewed-by: tags from subsystem maintainers (Konrad Dybcio, Bartosz Golaszewski, Sebastian Reichel, Rob Herring); no maintainer merge confirmation found in threads, but active review with positive signals indicates the series is progressing toward acceptance

4. PR present in qcom-next/topics: Yes — all 4 commits are present in qcom-next (commits 1-2 via exact patch-id match; commits 3-4 via content match)

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: 07f50dc44eddcf748a99d1a7523a466438bfffa6
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit	Subject	qcom-next	topics	Final
1/4	[PATCH 1/4] FROMLIST: arm64: dts: qcom: lemans: Add PSCI	present - exact patch-id match at 42c2f5b	skipped - not checked because qcom-next already contains the change	present
2/4	[PATCH 2/4] FROMLIST: arm64: dts: qcom: monaco: Add PSCI	present - exact patch-id match at b5d57f2	skipped - not checked because qcom-next already contains the change	present
3/4	[PATCH 3/4] FROMLIST: arm64: dts: qcom: qcm6490-idp: Add PSCI	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present
4/4	[PATCH 4/4] FROMLIST: arm64: dts: qcom: Add psci reboot-modes for	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present

Final Status

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

[qlijarvis]

PR #868 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	1 commit with whitespace errors (spaces instead of tabs)
dt-binding-check	⏭️	No DT binding changes
dtb-check	✅	All DTB validations passed
sparse-check	⏭️	No C/H file changes
check-uapi-headers	⏭️	No UAPI changes
check-patch-compliance	❌	2 commits with content mismatch vs upstream Link
tag-check	✅	All commits have valid FROMLIST: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #868 - Add PSCI SYSTEM_RESET2 reboot-modes support for Qualcomm boards
Target branch: qcom-6.18.y
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30263019655

Checker	Result	Summary
checkpatch	❌	1 commit with whitespace errors (spaces instead of tabs)
dt-binding-check	⏭️	No DT binding changes
dtb-check	✅	All DTB validations passed
sparse-check	⏭️	No C/H file changes
check-uapi-headers	⏭️	No UAPI changes
check-patch-compliance	❌	2 commits with content mismatch vs upstream Link
tag-check	✅	All commits have valid FROMLIST: prefix

---

❌ checkpatch

Root cause: Commit ed288ba5e4ad uses spaces for indentation instead of tabs in DTS file.

Failure details:

Commit ed288ba5e4ad ("FROMLIST: arm64: dts: qcom: qcm6490-idp: Add PSCI SYSTEM_RESET2 types")

ERROR: code indent should use tabs where possible
#30: FILE: arch/arm64/boot/dts/qcom/qcm6490-idp.dts:815:
+        reboot-mode {

WARNING: please, no spaces at the start of a line
#30: FILE: arch/arm64/boot/dts/qcom/qcm6490-idp.dts:815:
+        reboot-mode {

ERROR: code indent should use tabs where possible
#31: FILE: arch/arm64/boot/dts/qcom/qcm6490-idp.dts:816:
+                mode-bootloader = <0x10001 0x2>;

WARNING: please, no spaces at the start of a line
#31: FILE: arch/arm64/boot/dts/qcom/qcm6490-idp.dts:816:
+                mode-bootloader = <0x10001 0x2>;

ERROR: code indent should use tabs where possible
#32: FILE: arch/arm64/boot/dts/qcom/qcm6490-idp.dts:817:
+                mode-edl = <0 0x1>;

WARNING: please, no spaces at the start of a line
#32: FILE: arch/arm64/boot/dts/qcom/qcm6490-idp.dts:817:
+                mode-edl = <0 0x1>;

ERROR: code indent should use tabs where possible
#33: FILE: arch/arm64/boot/dts/qcom/qcm6490-idp.dts:818:
+        };

WARNING: please, no spaces at the start of a line
#33: FILE: arch/arm64/boot/dts/qcom/qcm6490-idp.dts:818:
+        };

ed288ba5e4ad total: 4 errors, 4 warnings, 0 checks, 13 lines checked

Fix: Replace spaces with tabs in arch/arm64/boot/dts/qcom/qcm6490-idp.dts:815-818

git rebase -i a350298f0289   # mark ed288ba5e4ad as 'edit'
# Fix the indentation - replace leading spaces with tabs:
sed -i 's/^        /\t/' arch/arm64/boot/dts/qcom/qcm6490-idp.dts  # 8 spaces → 1 tab
sed -i 's/^                /\t\t/' arch/arm64/boot/dts/qcom/qcm6490-idp.dts  # 16 spaces → 2 tabs
git add arch/arm64/boot/dts/qcom/qcm6490-idp.dts
git commit --amend --no-edit
git rebase --continue

Reproduce locally:

./scripts/checkpatch.pl --strict --ignore FILE_PATH_CHANGES --git a350298f0289..a8b7bc8fa7ae

---

❌ check-patch-compliance

Root cause: Two commits have content differences compared to their upstream lore.kernel.org links.

Failure details:

Checking commit: FROMLIST: arm64: dts: qcom: qcm6490-idp: Add PSCI SYSTEM_RESET2 types
Change is different from the one mentioned in Link

Checking commit: FROMLIST: arm64: dts: qcom: Add psci reboot-modes for talos boards
Change is different from the one mentioned in Link

Analysis:

Commit 3 (qcm6490-idp):

• Link: https://lore.kernel.org/r/20251109-arm-psci-system_reset2-vendor-reboots-v17-8-46e085bca4cc@oss.qualcomm.com
• The content mismatch is caused by the whitespace issue (spaces vs tabs) identified by checkpatch.
• The upstream patch uses tabs; the PR patch uses spaces.
• Fix: Fixing the checkpatch whitespace errors will also resolve this content mismatch.

Commit 4 (talos boards / qcs615-ride):

• Link: https://lore.kernel.org/all/20260514-arm-psci-system_reset2-vendor-reboots-v22-13-28a5bde07483@oss.qualcomm.com/
• This link points to a different patch series (v22 from May 2026) than commits 1-3 (v17 from Nov 2025).
• The upstream v22 patch may have different context lines, author attribution, or minor content changes.
• Action required: Verify the content difference using b4:

b4 am --single-message -C -l -3 \
  https://lore.kernel.org/all/20260514-arm-psci-system_reset2-vendor-reboots-v22-13-28a5bde07483@oss.qualcomm.com/ \
  -o /tmp/talos-upstream

# Compare the diff content (ignoring context):
diff <(git format-patch -1 a8b7bc8fa7ae --stdout | awk '/^diff/,/^--$/' | grep -E '^[+-][^+-]') \
     <(awk '/^diff/,/^--$/' /tmp/talos-upstream/*.mbx | grep -E '^[+-][^+-]')

If the difference is only context lines (surrounding unchanged code), this is acceptable and can be documented in the commit message. If there are actual code differences, determine if they are:

• Legitimate adaptations for the target kernel version → document in commit body
• Missing hunks → add them
• Extra hunks → remove or attribute separately

Reproduce locally:

cd /path/to/kernel
bash ../kernel-checkers/check-patch-compliance.sh \
  --kernel-src . \
  --base a350298f0289b9a14c416c20ade1b60ffabf3c11 \
  --head a8b7bc8fa7ae02152daf0b1a32ae97435dfc6f7b

---

Verdict

2 blockers must be fixed before merge:

1. Checkpatch whitespace errors in commit ed288ba5e4ad (qcm6490-idp) — replace spaces with tabs in lines 815-818 of arch/arm64/boot/dts/qcom/qcm6490-idp.dts.

2. Content mismatch investigation for commit a8b7bc8fa7ae (talos boards) — verify the difference against the upstream v22 patch using b4, and either:

   • Document the adaptation if it's a legitimate context difference, or
   • Align the content with upstream if there are actual code differences.

Note: The content mismatch for commit 3 (qcm6490-idp) will be automatically resolved once the whitespace issue is fixed.