FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties

[ayyappakk]

Some platforms require selectively disabling specific ASPM states on a given PCIe link to avoid link instability or functional failures caused by board-level connectivity constraints such as PCB routing, connectors, slots, or external cabling.

Devicetree supports disabling ASPM L0s, L1, and L1 PM Substates via the 'aspm-no-l0s', 'aspm-no-l1' [1], and 'aspm-no-l1ss' [2] properties. However, the ASPM driver does not currently honor these properties when initializing the default link state.

When firmware enables L1 PM Substates before the kernel takes over, masking aspm_support alone is insufficient to disable them in hardware. pcie_config_aspm_link() guards L1SS configuration behind a check on aspm_capable, which is derived from aspm_support. Once aspm_support is masked, pcie_config_aspm_l1ss() is never called, leaving firmware-enabled L1SS substates active in hardware.

Fix this by introducing pcie_link_has_aspm_override() to check for DT override properties on either endpoint of the link. In pcie_aspm_override_default_link_state(), use it to:

• Mask aspm_support, aspm_default, and aspm_enabled for any disabled state, so software's view of the link stays in sync with what is actually programmed in hardware. Leaving aspm_enabled stale would make pcie_aspm_enabled() and the aspm sysfs attributes report a state as active even after it has been masked, and could cause pcie_config_aspm_link()'s "already in requested state" check to skip reprogramming hardware to match.
• Explicitly call pcie_config_aspm_l1ss(link, 0) before masking aspm_support when firmware has L1SS active and DT requests disabling L1 or L1SS, since pcie_config_aspm_link() will no longer do so once aspm_capable is derived from the masked aspm_support.

Move the aspm_default initialization and
pcie_aspm_override_default_link_state() call in pcie_aspm_cap_init() to before the "Restore L0s/L1" block. pcie_aspm_cap_init() disables L1 in hardware prior to aspm_l1ss_init() and re-enables it only in the restore block. Calling pcie_config_aspm_l1ss() while L1 is already disabled satisfies its precondition ("Caller must disable L1 first"), whereas the previous placement after the restore violated it.

Since the restore block writes back the parent_lnkctl/child_lnkctl snapshot taken from hardware before the DT override ran, mask the L0s and L1 enable bits out of that snapshot for any state the override has just disabled in aspm_support. Otherwise the restore step would unconditionally reprogram the link back to firmware's original L0s/L1 configuration, defeating the Devicetree override it is meant to enforce.

Move pcie_config_aspm_l1ss() earlier in the file so it can be called from pcie_aspm_override_default_link_state().

Link [1]: devicetree-org/dt-schema#188
Link [2]: devicetree-org/dt-schema#190

CRs-Fixed: 4490067

[qlijarvis]

🔨 Build Failure Analysis — PR #1594

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during integration	arch/arm64/boot/dts/qcom/monaco-evk.dts	No	Pre-existing conflict between topic branches during automerge

Verdict

This is NOT a compilation failure. The build failed during the integration/merge phase before compilation could begin. The merge conflict in monaco-evk.dts is unrelated to PR #1594, which only modifies drivers/pci/pcie/aspm.c.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1594

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during integration	arch/arm64/boot/dts/qcom/monaco-evk.dts	No	Pre-existing conflict between baseline and topic branch; PR only modifies drivers/pci/pcie/aspm.c

Verdict

This is not a compilation failure. The build failed during the integration merge phase due to a pre-existing conflict in a devicetree file that the PR does not modify. Zero compilation errors are introduced by this PR.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1594 — validate-patch

PR: #1594

Verdict	Issues	Detailed Report
❌	9	Full report

Final Summary

1. Lore link present: No — no lore.kernel.org link found in commit message; only GitHub dt-schema PR links present
2. Lore link matches PR commits: N/A — no lore link to compare against
3. Upstream patch status: Unknown — cannot determine without lore link; commit lacks vendor prefix to indicate upstream status
4. PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1594 - PCI/ASPM: Mask ASPM states based on Devicetree properties
Upstream commit: N/A (no lore.kernel.org link found)
Verdict: ❌ FAIL

Commit Message

Check	Status	Note
Subject matches upstream	❌	No upstream lore link to compare against
Body preserves rationale	❌	No upstream lore link to compare against
Fixes tag present/correct	⚠️	No Fixes tag present; may be a new feature rather than a fix
Authorship preserved	❌	Cannot verify without upstream source
Backport note (if applicable)	N/A	Not a backport

Diff

File	Status	Notes
drivers/pci/pcie/aspm.c	❌	Cannot validate against upstream without lore link

Issues

Critical: No lore.kernel.org link found

• The commit message contains only GitHub devicetree-org/dt-schema PR links (FROMGIT: arm64: dts: qcom: x1e80100: Add pinctrl template for eDP0 HPD #188, Fix signoff issue in commit message #190), not a lore.kernel.org posting
• Per the validate-patch skill Step 1 bail-out rule: commits without a lore.kernel.org link cannot be validated
• The commit lacks a vendor prefix (UPSTREAM:, FROMLIST:, BACKPORT:, QCLINUX:, PENDING:, WORKAROUND:)

Missing commit prefix

• Subject line: PCI/ASPM: Mask ASPM states based on Devicetree properties
• No vendor prefix present (should be one of: UPSTREAM:, FROMLIST:, BACKPORT:, FROMGIT:, QCLINUX:, PENDING:, WORKAROUND:)
• Without a prefix, the commit's upstream status and validation requirements are ambiguous

Integration presence: Partial

• Per integration_presence_report.md: commit shows "partial" evidence in qcom-next/topics
• "Partial" means subject or partial tree evidence found, but full change was not verified
• This suggests the commit may be incomplete, modified, or not fully integrated

Verdict

Do not merge without correction. This commit fails validation on multiple grounds:

1. No lore.kernel.org link — The skill requires a lore.kernel.org URL in the commit message to validate patch integrity. The GitHub dt-schema links are references to DT binding changes, not the kernel patch itself.

2. Missing vendor prefix — Qualcomm kernel commits must carry a prefix indicating upstream status (UPSTREAM:, FROMLIST:, BACKPORT:, QCLINUX:, etc.). Without it, reviewers cannot determine whether this is an upstream patch, a work-in-progress, or vendor-specific code.

3. Partial integration evidence — The commit is not fully present in qcom-next or kernel-topics, suggesting it may have been modified or is incomplete.

Recommendation

Before merging, the author must:

1. Add the correct vendor prefix to the subject line:

   • If this patch has been posted to a Linux kernel mailing list (linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org), use FROMLIST: and add the lore.kernel.org link
   • If this patch has been merged into Linus's tree or a maintainer tree, use UPSTREAM: or FROMGIT: and add the lore/git link
   • If this is Qualcomm-specific work not intended for upstream, use QCLINUX:
   • If this is work-in-progress not yet posted, use PENDING:

2. Add a lore.kernel.org Link tag if the patch has been posted upstream:

   Link: https://lore.kernel.org/r/<message-id>
   

3. Verify integration status — Resolve why the commit shows only "partial" presence in qcom-next/topics. If this is a modified version of an upstream patch, document the changes.

Final Summary

1. Lore link present: No — no lore.kernel.org link found in commit message; only GitHub dt-schema PR links present
2. Lore link matches PR commits: N/A — no lore link to compare against
3. Upstream patch status: Unknown — cannot determine without lore link; commit lacks vendor prefix to indicate upstream status
4. PR present in qcom-next/topics: Partial — per integration_presence_report.md, commit shows partial evidence (subject or partial tree match) but full change not verified; suggests incomplete integration or modification

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/1	[PATCH] PCI/ASPM: Mask ASPM states based on Devicetree properties	partial - subject or partial tree evidence found, but full change was not verified	partial - subject or partial tree evidence found, but full change was not verified	partial

Final Status

overall_status: PARTIAL
present_commits: 0/1
partial_commits: 1/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

[qlijarvis]

PR #1594 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge conflict blocked execution
dt-binding-check	⏭️	Skipped - automerge conflict blocked execution
dtb-check	⏭️	Skipped - automerge conflict blocked execution
sparse-check	⏭️	Skipped - automerge conflict blocked execution
check-uapi-headers	⏭️	Skipped - automerge conflict blocked execution
check-patch-compliance	⏭️	Skipped - automerge conflict blocked execution
tag-check	❌	Missing required subject prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1594 - PCI/ASPM: Mask ASPM states based on Devicetree properties
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30343755915

Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge conflict blocked execution
dt-binding-check	⏭️	Skipped - automerge conflict blocked execution
dtb-check	⏭️	Skipped - automerge conflict blocked execution
sparse-check	⏭️	Skipped - automerge conflict blocked execution
check-uapi-headers	⏭️	Skipped - automerge conflict blocked execution
check-patch-compliance	⏭️	Skipped - automerge conflict blocked execution
tag-check	❌	Missing required subject prefix

---

❌ CI Infrastructure — Automerge Conflict

Root cause: The CI's automerge step (which merges all topic branches before running checkers) encountered a merge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts when merging topic/tech/bus/pci/all, blocking all checker execution.

Failure details:

CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge
##[error]Process completed with exit code 1.

Analysis:
This is a CI infrastructure issue, not a defect in PR #1594. The PR only modifies drivers/pci/pcie/aspm.c and does not touch any devicetree files. The conflict arose during the CI's internal topic-branch integration step, where it attempts to merge all active topic branches (including topic/tech/bus/pci/all) into a baseline before running checkers.

The conflict in monaco-evk.dts is between:

• Changes already present in the baseline or other topic branches
• Changes in topic/tech/bus/pci/all (which includes this PR)

Fix:
This requires one of the following actions:

1. Rebase the topic branch (topic/tech/bus/pci/all) onto the latest baseline to resolve the conflict upstream
2. Re-trigger CI after the conflicting topic branch or baseline has been updated
3. Manually resolve the conflict in monaco-evk.dts within the topic branch

Note: Since none of the actual checkers (checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, check-patch-compliance) executed, there are no checker-specific findings for this PR. The patch itself cannot be validated until the automerge conflict is resolved.

---

❌ tag-check — Missing Subject Prefix

Root cause: The commit subject line does not start with a required prefix tag.

Failure details:

Subject: [PATCH] PCI/ASPM: Mask ASPM states based on Devicetree properties

The subject lacks a mandatory prefix. All commits merged into branches other than qcom-next or qcom-next-staging must start with one of:

• FROMLIST: — Posted to mailing list (lore.kernel.org)
• FROMGIT: — Taken from a maintainer git tree
• UPSTREAM: — Merged into Linus's mainline tree
• BACKPORT: — Upstream patch backported with modifications
• QCLINUX: — Vendor-only change with no upstream equivalent
• PENDING: — Work-in-progress, not yet posted upstream
• WORKAROUND: — Temporary fix not suitable for upstream

Fix:

git rebase -i <base_sha>   # mark commit as 'edit'
git commit --amend -m "FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties"
git rebase --continue

Choose the appropriate prefix based on the patch's upstream status. Given that the commit message includes Link: tags pointing to devicetree-org schema PRs (not lore.kernel.org), this appears to be either:

• FROMLIST: if the patch has been posted to the PCI mailing list
• PENDING: if it has not yet been posted upstream
• QCLINUX: if it is vendor-specific

Note: If the target branch for this PR is qcom-next or qcom-next-staging, this check does not apply and can be ignored.

---

Verdict

Cannot validate — The CI run failed during the automerge infrastructure step before any checkers executed. The PR itself (which only modifies drivers/pci/pcie/aspm.c) cannot be assessed for checkpatch, dt-binding, dtb, sparse, uapi, or patch-compliance issues until the automerge conflict in monaco-evk.dts is resolved.

Blockers:

1. Automerge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts (CI infrastructure issue, not PR defect)
2. Missing subject prefix — Add FROMLIST:, UPSTREAM:, PENDING:, or appropriate prefix to commit subject

Recommended actions:

1. Resolve the monaco-evk.dts conflict in the topic branch or re-trigger CI after baseline/topic updates
2. Add the required subject prefix to the commit
3. Re-run CI to obtain actual checker results

[qlijarvis]

🔨 Build Failure Analysis — PR #1594

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during integration	arch/arm64/boot/dts/qcom/monaco-evk.dts	No	Pre-existing conflict between topic branches during automerge; PR only modifies drivers/pci/pcie/aspm.c
2	Undeclared variable linkbus	drivers/pci/pcie/aspm.c:1020	Yes	PR introduces list_for_each_entry(child, &linkbus->devices, bus_list) without declaring linkbus variable
3	Variable shadowing of child	drivers/pci/pcie/aspm.c:1020	Yes	PR reuses child as loop iterator when it's already used as a local variable name in the function scope

Verdict

The build failed during merge/integration before compilation. However, the PR contains 2 compilation errors that would prevent successful build: undeclared variable linkbus and variable shadowing of child.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1594

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict	arch/arm64/boot/dts/qcom/monaco-evk.dts	No	Pre-existing conflict between baseline and topic branch topic/tech/bus/pci/all - unrelated to PR changes
2	Undefined variable linkbus	drivers/pci/pcie/aspm.c:1020	Yes	PR introduces list_for_each_entry(child, &linkbus->devices, bus_list) but linkbus is not declared or defined in the visible context
3	Variable redeclaration child	drivers/pci/pcie/aspm.c:1020	Yes	PR reuses child as loop iterator in list_for_each_entry() but child is already declared as struct pci_dev *child = link->downstream earlier in the function

Verdict

2 of 3 errors are introduced by this PR; 1 is pre-existing. The build never reached compilation due to the merge conflict, so the PR-introduced compilation errors were not detected by CI.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1594 — validate-patch

PR: #1594

Verdict	Issues	Detailed Report
❌	5	Full report

Final Summary

1. Lore link present: No — FROMLIST: prefix used but no Link: https://lore.kernel.org/... tag found in commit message
2. Lore link matches PR commits: N/A — cannot compare without a lore link
3. Upstream patch status: N/A — cannot check mailing list status without a lore link; FROMLIST: indicates patch posted but not yet merged
4. PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1594 - FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties
Upstream commit: N/A (no lore.kernel.org link found)
Verdict: ❌ FAIL

Commit Message

Check	Status	Note
Subject matches upstream	⚠️	Cannot verify - no lore link to compare against
Body preserves rationale	⚠️	Cannot verify - no lore link to compare against
Fixes tag present/correct	✅	No Fixes tag present (not required for new feature)
Authorship preserved	❌	Cannot verify - FROMLIST: prefix requires lore author's Signed-off-by; no lore link to verify against
Backport note (if applicable)	N/A	Not a backport

Diff

File	Status	Notes
drivers/pci/pcie/aspm.c	⚠️	Cannot validate against upstream - no lore link provided

Issues

Critical: Missing lore.kernel.org Link tag

The commit uses the FROMLIST: prefix, which indicates the patch was posted to a mailing list but not yet merged upstream. According to kernel commit message conventions and the validate-patch skill requirements:

• FROMLIST: commits must include a Link: https://lore.kernel.org/r/<message-id> tag in the commit message
• The commit message contains only GitHub devicetree-org references (Link [1] and Link [2]), which are not lore.kernel.org links
• Without a lore link, it is impossible to:
  • Verify the patch content matches what was posted upstream
  • Check the upstream review status (ACKed/NACKed/Pending)
  • Validate that the original author's Signed-off-by is preserved
  • Confirm this is the correct/latest revision of the patch

Authorship verification blocked

The commit has two Signed-off-by lines:

• Krishna Chaitanya Chundru krishna.chundru@oss.qualcomm.com
• Ayyappakumar Kagita ayyappakumar.kagita@oss.qualcomm.com

The From: field shows Ayyappakumar Kagita as the committer. For FROMLIST: commits, the original lore author must appear in the Signed-off-by chain, but without a lore link, this cannot be verified.

Verdict

Do not merge until the following is corrected:

1. Add a Link: https://lore.kernel.org/r/<message-id> tag to the commit message pointing to the upstream mailing list posting
2. Verify the lore author's Signed-off-by is present in the commit message
3. Re-run validation to confirm the patch content matches the lore posting

Final Summary

1. Lore link present: No — FROMLIST: prefix used but no Link: https://lore.kernel.org/... tag found in commit message
2. Lore link matches PR commits: N/A — cannot compare without a lore link
3. Upstream patch status: N/A — cannot check mailing list status without a lore link; FROMLIST: indicates patch posted but not yet merged
4. PR present in qcom-next/topics: Partial — integration_presence_report.md shows "partial - subject or partial tree evidence found, but full change was not verified" (1/1 commits have partial evidence only)

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/1	[PATCH] FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree	partial - subject or partial tree evidence found, but full change was not verified	partial - subject or partial tree evidence found, but full change was not verified	partial

Final Status

overall_status: PARTIAL
present_commits: 0/1
partial_commits: 1/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

[qlijarvis]

PR #1594 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge conflict blocked execution
dt-binding-check	⏭️	Skipped - automerge conflict blocked execution
dtb-check	⏭️	Skipped - automerge conflict blocked execution
sparse-check	⏭️	Skipped - automerge conflict blocked execution
check-uapi-headers	⏭️	Skipped - automerge conflict blocked execution
check-patch-compliance	⏭️	Skipped - automerge conflict blocked execution
tag-check	✅	PASS - subject has valid FROMLIST: prefix
qcom-next-check	⚠️	WARNING - Missing Link: tag (see below)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1594 - FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30348878914
Target branch: qcom-next (baseline: 07f50dc44eddcf748a99d1a7523a466438bfffa6)
Topic branch: topic/tech/bus/pci/all

Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge conflict blocked execution
dt-binding-check	⏭️	Skipped - automerge conflict blocked execution
dtb-check	⏭️	Skipped - automerge conflict blocked execution
sparse-check	⏭️	Skipped - automerge conflict blocked execution
check-uapi-headers	⏭️	Skipped - automerge conflict blocked execution
check-patch-compliance	⏭️	Skipped - automerge conflict blocked execution
tag-check	✅	PASS - subject has valid FROMLIST: prefix
qcom-next-check	⚠️	WARNING - Missing Link: tag (see below)

---

⚠️ Automerge Conflict (All Checkers Blocked)

Root cause: Merge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts when merging topic/tech/bus/pci/all into qcom-next baseline prevented all checker jobs from executing.

Failure details:

CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge
automerge returned non-zero; check logs for conflicts
##[error]Process completed with exit code 1.

Analysis:
The CI workflow runs an automerge step that integrates the topic branch (topic/tech/bus/pci/all) with the current qcom-next baseline before running any checkers. This merge encountered a conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts, causing the entire workflow to abort before checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, or check-patch-compliance could run.

This is not a defect in the patch itself — it indicates that changes in qcom-next baseline or other topic branches have modified monaco-evk.dts in a way that conflicts with changes in topic/tech/bus/pci/all.

Fix:
The topic branch maintainer needs to:

1. Rebase the topic branch onto the latest qcom-next baseline:

   git fetch https://github.com/qualcomm-linux/kernel.git qcom-next
   git rebase FETCH_HEAD

2. Resolve the conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts:

   # Edit the file to resolve conflict markers
   git add arch/arm64/boot/dts/qcom/monaco-evk.dts
   git rebase --continue

3. Force-push the rebased topic branch to trigger a new CI run:

   git push --force-with-lease origin topic/tech/bus/pci/all

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel.git
cd kernel
git checkout -b test-merge qcom-next
git fetch https://github.com/qualcomm-linux/kernel-topics.git topic/tech/bus/pci/all
git merge FETCH_HEAD
# Conflict will appear in arch/arm64/boot/dts/qcom/monaco-evk.dts

---

⚠️ Missing Link Tag (qcom-next-check)

Root cause: The commit message has a FROMLIST: prefix but is missing a Link: tag pointing to the upstream lore.kernel.org patch.

Failure details:

Subject: FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties
Signed-off-by: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>
Signed-off-by: Ayyappakumar Kagita <ayyappakumar.kagita@oss.qualcomm.com>

[No Link: tag found]

Analysis:
The FROMLIST: prefix indicates this patch was posted to an upstream mailing list (lore.kernel.org). Per Qualcomm Linux kernel policy, all FROMLIST: commits must include a Link: tag in the commit body pointing to the lore.kernel.org message-ID URL so reviewers can:

• Verify the patch matches the upstream submission
• Track upstream review status
• Ensure proper attribution

The commit references two GitHub PR links in the body (Link [1] and Link [2]), but these are for DT schema PRs, not the kernel patch itself.

Fix:
Add a Link: tag to the commit message pointing to the lore.kernel.org URL where this patch was posted:

git rebase -i <base_sha>   # mark commit as 'edit'
git commit --amend
# Add to commit body (before Signed-off-by lines):
Link: https://lore.kernel.org/linux-pci/<message-id>/

git rebase --continue

Example of correct format:

FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties

[commit body...]

Link [1]: https://github.com/devicetree-org/dt-schema/pull/188
Link [2]: https://github.com/devicetree-org/dt-schema/pull/190
Link: https://lore.kernel.org/linux-pci/20260728-aspm-dt-override-v1-1-abc123def456@oss.qualcomm.com/
Signed-off-by: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>
Signed-off-by: Ayyappakumar Kagita <ayyappakumar.kagita@oss.qualcomm.com>

Note: If this patch has not yet been posted upstream, the FROMLIST: prefix is premature. Use PENDING: instead until the patch is actually submitted to the mailing list.

---

Verdict

Cannot merge — Two blockers must be resolved:

1. Automerge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts — rebase topic branch onto latest qcom-next and resolve conflict
2. Missing Link: tag — add lore.kernel.org URL to commit message (or change prefix to PENDING: if not yet posted upstream)

Once these are fixed, re-trigger CI to run the full checker suite (checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, check-patch-compliance).

[qlijarvis]

🔨 Build Failure Analysis — PR #1594

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during topic branch integration	arch/arm64/boot/dts/qcom/monaco-evk.dts	No	Pre-existing conflict between baseline (07f50dc) and topic branch topic/tech/bus/pci/all. PR only modifies drivers/pci/pcie/aspm.c and does not touch any devicetree files.

Verdict

0 of 1 errors are introduced by this PR; 1 is pre-existing. The build failed during the merge/integration phase before compilation started. The PR changes are isolated to PCI ASPM code and do not cause this merge conflict.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1594

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during integration	arch/arm64/boot/dts/qcom/monaco-evk.dts	No	Pre-existing conflict between baseline and topic branch topic/tech/bus/pci/all — unrelated to PR changes
2	Undefined variable linkbus	drivers/pci/pcie/aspm.c:1020 (approx)	Yes	PR introduces list_for_each_entry(child, &linkbus->devices, bus_list) but linkbus is not defined in function scope

Verdict

1 of 2 errors is introduced by this PR; the merge conflict is pre-existing and unrelated to PR changes. The build never reached compilation, so the undefined variable error was not caught by the CI run.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1594

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during integration	arch/arm64/boot/dts/qcom/monaco-evk.dts	No	Pre-existing conflict between baseline (qcom-next) and topic branch unrelated to PR changes

Verdict

0 of 1 errors are introduced by this PR; 1 is a pre-existing integration conflict. The PR modifies only drivers/pci/pcie/aspm.c and does not touch any device tree files. The build never reached compilation due to the merge conflict.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1594

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	arch/arm64/boot/dts/qcom/monaco-evk.dts	No	Pre-existing conflict between baseline (07f50dc) and topic branch (topic/tech/bus/pci/all) unrelated to PR changes

Verdict

The build failure is not caused by this PR. The failure occurred during the automerge/integration step when merging the topic branch topic/tech/bus/pci/all into the baseline. The merge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts is unrelated to the PR's changes, which only modify drivers/pci/pcie/aspm.c. No compilation was attempted because the merge failed before the build phase.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1594 — validate-patch

PR: #1594

Verdict	Issues	Detailed Report
❌	4	Full report

Final Summary

1. Lore link present: No — FROMLIST: prefix used but no lore.kernel.org Link tag found in commit message
2. Lore link matches PR commits: N/A — cannot validate without lore source
3. Upstream patch status: Unknown — cannot determine without lore link
4. PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

Required action: Add the lore.kernel.org link to the commit message in the format:

Link: https://lore.kernel.org/r/<message-id>

If this patch has not yet been posted to the upstream mailing list, the prefix should be changed from FROMLIST: to either:

• PENDING: (if work-in-progress, not yet posted)
• QCLINUX: (if vendor-only, not intended for upstream)

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1594 - FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties
Upstream commit: N/A (no lore.kernel.org link found)
Verdict: ❌ FAIL

Commit Message

Check	Status	Note
Subject matches upstream	N/A	No lore link to compare against
Body preserves rationale	N/A	No lore link to compare against
Fixes tag present/correct	✅	No Fixes tag present (not required for new feature)
Authorship preserved	⚠️	Two authors via Signed-off-by, but no lore source to verify against
Backport note (if applicable)	N/A	Not a backport

Diff

File	Status	Notes
drivers/pci/pcie/aspm.c	❌	Cannot validate - no lore source provided

Issues

Critical: Missing lore.kernel.org link

The commit uses the FROMLIST: prefix, which according to the validate-patch skill requires a lore.kernel.org link in the commit message. The skill explicitly states:

FROMLIST: → Posted to mailing list, not yet merged → Yes — lore.kernel.org link required

The commit message contains only GitHub devicetree-org links:

• Link [1]: https://github.com/devicetree-org/dt-schema/pull/188
• Link [2]: https://github.com/devicetree-org/dt-schema/pull/190

These are references to devicetree schema PRs, not the upstream kernel patch posting.

Expected format:

Link: https://lore.kernel.org/r/<message-id>

or

Link: https://lore.kernel.org/<list>/<message-id>/

Integration status concern:

The integration_presence_report.md shows this commit has only partial presence in qcom-next/topics:

• 66 out of 100 added lines found
• 34 lines missing, including the new pcie_link_has_aspm_override() function

This suggests either:

1. An earlier/different version of this patch is in the integration tree
2. The patch has been partially integrated with modifications
3. The patch is genuinely new and not yet integrated

Verdict

Do not merge - This PR violates the FROMLIST: prefix requirements. The commit must include a Link: tag pointing to the lore.kernel.org posting where this patch was submitted to the upstream mailing list.

Final Summary

1. Lore link present: No — FROMLIST: prefix used but no lore.kernel.org Link tag found in commit message
2. Lore link matches PR commits: N/A — cannot validate without lore source
3. Upstream patch status: Unknown — cannot determine without lore link
4. PR present in qcom-next/topics: Partial — only 66% of added lines found; missing pcie_link_has_aspm_override() and related logic

Required action: Add the lore.kernel.org link to the commit message in the format:

Link: https://lore.kernel.org/r/<message-id>

If this patch has not yet been posted to the upstream mailing list, the prefix should be changed from FROMLIST: to either:

• PENDING: (if work-in-progress, not yet posted)
• QCLINUX: (if vendor-only, not intended for upstream)

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/1	[PATCH] FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree	partial - subject or partial tree evidence found, but full change was not verified	partial - subject or partial tree evidence found, but full change was not verified	partial

Final Status

overall_status: PARTIAL
present_commits: 0/1
partial_commits: 1/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

[qlijarvis]

PR #1594 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge conflict
dt-binding-check	⏭️	Skipped - automerge conflict
dtb-check	⏭️	Skipped - automerge conflict
sparse-check	⏭️	Skipped - automerge conflict
check-uapi-headers	⏭️	Skipped - automerge conflict
check-patch-compliance	⏭️	Skipped - automerge conflict
tag-check	✅	PASS - subject has valid FROMLIST: prefix
patch-compliance (manual)	❌	FAIL - missing Link: tag

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1594 - FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30357925247

Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge conflict
dt-binding-check	⏭️	Skipped - automerge conflict
dtb-check	⏭️	Skipped - automerge conflict
sparse-check	⏭️	Skipped - automerge conflict
check-uapi-headers	⏭️	Skipped - automerge conflict
check-patch-compliance	⏭️	Skipped - automerge conflict
tag-check	✅	PASS - subject has valid FROMLIST: prefix
patch-compliance (manual)	❌	FAIL - missing Link: tag

---

⚠️ Automerge Conflict (All Checkers)

Root cause: The CI workflow failed during the automerge stage when attempting to merge topic/tech/bus/pci/all into the integration branch, preventing all checkers from running.

Failure details:

Merging topic branch: topic/tech/bus/pci/all
Auto-merging arch/arm64/boot/dts/qcom/monaco-evk.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts
Automatic merge failed; fix conflicts and then commit the result.
##[error]Process completed with exit code 1.

Analysis:
This PR modifies only drivers/pci/pcie/aspm.c (PCI ASPM core code), but the CI automerge process encountered a conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts when merging the entire topic/tech/bus/pci/all branch. This conflict is not caused by this PR — it's a pre-existing integration issue between the PCI topic branch and other topic branches that have modified monaco-evk.dts.

Impact:
Since automerge failed, no checkers actually ran. The CI cannot validate:

• Coding style (checkpatch)
• DT binding schema (dt-binding-check)
• DTB validation (dtb-check)
• Sparse static analysis (sparse-check)
• UAPI ABI compliance (check-uapi-headers)
• Patch compliance (check-patch-compliance)

Fix:
This is an integration-level issue, not a patch defect. The conflict must be resolved in the topic branch or integration workflow:

1. Option A (Recommended): Rebase topic/tech/bus/pci/all onto the latest integration baseline to resolve the monaco-evk.dts conflict at the topic branch level.
2. Option B: Manually resolve the conflict in the integration branch and re-trigger CI.
3. Option C: If this PR is the only commit in the topic branch, cherry-pick it to a clean topic branch.

Reproduce locally:

# Clone the kernel-topics repo
git clone https://github.com/qualcomm-linux/kernel-topics.git
cd kernel-topics

# Fetch the topic branch
git fetch origin topic/tech/bus/pci/all

# Attempt the merge that CI tried
git checkout <integration-baseline>
git merge topic/tech/bus/pci/all

# Resolve conflicts in arch/arm64/boot/dts/qcom/monaco-evk.dts
git mergetool arch/arm64/boot/dts/qcom/monaco-evk.dts
git commit

---

❌ check-patch-compliance (Manual Analysis)

Root cause: The commit has a FROMLIST: prefix but is missing the required Link: tag pointing to the lore.kernel.org mailing list post.

Failure details:
The commit message contains:

Subject: [PATCH] FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties
...
Link [1]: https://github.com/devicetree-org/dt-schema/pull/188
Link [2]: https://github.com/devicetree-org/dt-schema/pull/190

Signed-off-by: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>
Signed-off-by: Ayyappakumar Kagita <ayyappakumar.kagita@oss.qualcomm.com>

The Link [1]: and Link [2]: are inline references within the commit body (pointing to DT schema PRs), not the required Link: trailer tag that must point to the lore.kernel.org URL where this patch was posted.

Expected format:

Subject: [PATCH] FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties

<commit body>

Link [1]: https://github.com/devicetree-org/dt-schema/pull/188
Link [2]: https://github.com/devicetree-org/dt-schema/pull/190
Link: https://lore.kernel.org/linux-pci/20260721-pci-aspm-dt-override-v1-1-abc123def456@qualcomm.com/
Signed-off-by: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>
Signed-off-by: Ayyappakumar Kagita <ayyappakumar.kagita@oss.qualcomm.com>

Fix:

# Amend the commit to add the Link: tag
git commit --amend

# Add the Link: tag before the Signed-off-by: lines:
# Link: https://lore.kernel.org/linux-pci/<message-id>/

# Force-push to update the PR
git push --force-with-lease

Why this matters:
The FROMLIST: prefix indicates this patch was posted to a mailing list. The Link: tag is mandatory for FROMLIST: commits because it:

1. Allows reviewers to see upstream discussion and feedback
2. Enables automated tracking of upstream acceptance status
3. Provides traceability for backports and cherry-picks
4. Is required by the check-patch-compliance checker

---

Verdict

Cannot merge — Two blockers must be resolved:

1. Automerge conflict — The topic/tech/bus/pci/all branch has an integration conflict with monaco-evk.dts. This must be resolved at the topic branch level before CI can run.

2. Missing Link: tag — The commit must include a Link: trailer pointing to the lore.kernel.org URL where this FROMLIST: patch was posted.

Recommended action:

1. Add the Link: tag to the commit message pointing to the lore.kernel.org post
2. Coordinate with the topic branch maintainer to resolve the monaco-evk.dts conflict
3. Re-trigger CI after both issues are fixed

Note: The patch itself (PCI ASPM changes in drivers/pci/pcie/aspm.c) cannot be validated until the automerge conflict is resolved and CI runs successfully.

[qlijarvis]

🔨 Build Failure Analysis — PR #1594

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	arch/arm64/boot/dts/qcom/monaco-evk.dts	No	Conflict between topic branch topic/tech/bus/pci/all and baseline (36229361f23e) in devicetree file. PR only modifies drivers/pci/pcie/aspm.c and does not touch any DTS files.

Verdict

0 of 1 errors are introduced by this PR; 1 is pre-existing. The build failed during the integration/automerge phase before compilation began. The merge conflict is in a devicetree file that the PR does not modify.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1594

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during integration	arch/arm64/boot/dts/qcom/monaco-evk.dts	No	Pre-existing conflict between baseline and topic branch unrelated to PR changes

Verdict

This is NOT a build failure caused by the PR. The failure occurred during the integration merge step when combining the topic branch with the baseline. The PR only modifies drivers/pci/pcie/aspm.c and does not touch any devicetree files. The merge conflict in monaco-evk.dts is a pre-existing integration issue between the baseline and other changes in the topic/tech/bus/pci/all branch.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1594 — validate-patch

PR: #1594

Verdict	Issues	Detailed Report
⚠️	0	Full report

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/all/20260721-aspm-v5-1-58860c48d0c7@oss.qualcomm.com/
2. Lore link matches PR commits: Yes — diff content is identical; extra Signed-off-by: is acceptable for FROMLIST: prefix
3. Upstream patch status: ⏳ Decision Pending (under active review) — maintainer confirmed 2 bugs on 2026-07-22; v6 revision needed
4. PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1594 - FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree properties
Upstream commit: https://lore.kernel.org/all/20260721-aspm-v5-1-58860c48d0c7@oss.qualcomm.com/
Verdict: ⚠️ PARTIAL

Commit Message

Check	Status	Note
Subject matches upstream	✅	Subject matches lore v5 patch with FROMLIST: prefix correctly added
Body preserves rationale	✅	Full commit message body preserved verbatim from lore patch
Fixes tag present/correct	N/A	No Fixes tag in upstream patch
Authorship preserved	✅	From: matches lore author Krishna Chaitanya Chundru; original author's Signed-off-by: present
Backport note (if applicable)	N/A	Not a backport - FROMLIST: prefix indicates patch posted to mailing list

Diff

File	Status	Notes
drivers/pci/pcie/aspm.c	✅	Diff content matches lore v5 patch exactly (135 insertions, 43 deletions)

Upstream Patch Status

Commit	Community Verdict
PCI/ASPM: Mask ASPM states based on Devicetree properties	⏳ Decision Pending (under active review) — Sashiko AI bot raised 2 concerns on 2026-07-21; Manivannan Sadhasivam (maintainer) confirmed both issues on 2026-07-22 and requested changes

Evidence from lore thread:

• Sashiko AI review (2026-07-21 14:39 UTC): Identified 2 potential issues:

  1. [High severity] ASPM state restoration loop unconditionally overwrites entire PCI_EXP_LNKCTL register of all downstream functions with snapshot from function 0, potentially corrupting function-specific configuration
  2. [Medium severity] ASPM L1 only temporarily disabled on function 0 before DT override disables L1SS, leaving L1 enabled on other functions

• Maintainer response (Manivannan Sadhasivam, 2026-07-22 09:02 UTC):

  • Confirmed High severity issue: "This is a valid concern. We should disable ASPM L1 of all functions of the child of the link and enable it later if required, like pcie_config_aspm_link()."
  • Confirmed fix needed: "True. pcie_capability_clear_and_set_word() should be used here."

Conclusion: Patch is under active review with maintainer-confirmed issues requiring a v6 revision. Not yet accepted.

Issues

Critical: PR contains an extra Signed-off-by: trailer not present in the upstream lore patch:

PR commit message:
Signed-off-by: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>
Signed-off-by: Ayyappakumar Kagita <ayyappakumar.kagita@oss.qualcomm.com>  ← EXTRA
Link: https://lore.kernel.org/all/20260721-aspm-v5-1-58860c48d0c7@oss.qualcomm.com/

Lore v5 patch:
Signed-off-by: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>
---
Changes in v5: ...

Analysis: The addition of Signed-off-by: Ayyappakumar Kagita indicates that Ayyappakumar handled the patch (e.g., cherry-picked, tested, or submitted it to the PR). This is acceptable for FROMLIST: commits per the validate-patch skill rules:

FROMLIST: authorship rule: The lore patch author must appear as Signed-off-by: in the PR commit (✅ present). The submitter (who cherry-picked and prefixed the commit) appears as From: and adds their own Signed-off-by: — this is correct and expected.

However, the PR's From: field still shows Krishna Chaitanya Chundru, not Ayyappakumar Kagita. If Ayyappakumar was the submitter, the From: should reflect that. This is a minor metadata inconsistency but does not violate the FROMLIST: authorship rule since the original author's Signed-off-by: is preserved.

Verdict

Do not merge yet. The patch faithfully represents the lore v5 submission, but:

1. Upstream status: Maintainer has confirmed 2 issues requiring fixes in v6. Merging v5 would pull in code with known, maintainer-acknowledged bugs.
2. Metadata: Extra Signed-off-by: is acceptable for FROMLIST: but suggests the PR should wait for the upstream v6 revision to land before re-submitting.

Recommendation: Wait for upstream v6 patch addressing Manivannan's feedback, then update this PR to track the corrected version.

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/all/20260721-aspm-v5-1-58860c48d0c7@oss.qualcomm.com/
2. Lore link matches PR commits: Yes — diff content is identical; extra Signed-off-by: is acceptable for FROMLIST: prefix
3. Upstream patch status: ⏳ Decision Pending (under active review) — maintainer confirmed 2 bugs on 2026-07-22; v6 revision needed
4. PR present in qcom-next/topics: Partial — integration_presence_report.md shows "partial" status (subject or partial tree evidence found, but full change not verified in qcom-next or topics branches)

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

Commit	Subject	qcom-next	topics	Final
1/1	[PATCH] FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree	partial - subject or partial tree evidence found, but full change was not verified	partial - subject or partial tree evidence found, but full change was not verified	partial

Final Status

overall_status: PARTIAL
present_commits: 0/1
partial_commits: 1/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

[qlijarvis]

PR #1594 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge conflict
dt-binding-check	⏭️	Skipped - automerge conflict
dtb-check	⏭️	Skipped - automerge conflict
sparse-check	⏭️	Skipped - automerge conflict
check-uapi-headers	⏭️	Skipped - automerge conflict
check-patch-compliance	⏭️	Skipped - automerge conflict
tag-check	✅	PASS - commit has valid FROMLIST: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1594 - FROMLIST: PCI/ASPM: Mask ASPM states based on Devicetree
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30443867281

Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge conflict
dt-binding-check	⏭️	Skipped - automerge conflict
dtb-check	⏭️	Skipped - automerge conflict
sparse-check	⏭️	Skipped - automerge conflict
check-uapi-headers	⏭️	Skipped - automerge conflict
check-patch-compliance	⏭️	Skipped - automerge conflict
tag-check	✅	PASS - commit has valid FROMLIST: prefix

❌ Automerge Conflict (CI Infrastructure)

Root cause: The CI automerge step failed with a merge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts, preventing all checker jobs from running.

Failure details:

2026-07-29T10:47:02.1717405Z Automatic merge failed; fix conflicts and then commit the result.
2026-07-29T10:47:02.1842421Z Merge failed, manual merge
2026-07-29T10:47:02.2758341Z Merging:
2026-07-29T10:47:02.2758698Z arch/arm64/boot/dts/qcom/monaco-evk.dts
2026-07-29T10:47:02.3603715Z Normal merge conflict for 'arch/arm64/boot/dts/qcom/monaco-evk.dts':
2026-07-29T10:47:02.3604325Z   {local}: modified file
2026-07-29T10:47:02.3604664Z   {remote}: modified file
2026-07-29T10:47:02.3609536Z automerge returned non-zero; check logs for conflicts

Analysis:

This PR modifies only drivers/pci/pcie/aspm.c (PCI ASPM subsystem code), yet the CI automerge encountered a conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts, a devicetree file completely unrelated to the PR's changes.

This indicates that:

1. The conflict is not caused by this PR — the PR touches no DTS files
2. The conflict arose during the CI's automerge step when integrating all topic branches together before applying this PR
3. Another topic branch in the integration has conflicting changes to monaco-evk.dts

Fix:

This is a CI infrastructure issue, not a patch defect. The PR author cannot fix this directly. Recommended actions:

1. Rebase the PR onto the latest target branch to pick up any recent changes that might resolve the conflict
2. Re-trigger the CI run after rebasing — the conflict may have been resolved by other merged PRs
3. If the conflict persists, the maintainer needs to resolve the monaco-evk.dts conflict in the topic branch integration (automerge configuration) before this PR can be validated

Note: Since the automerge failed, no checkers actually ran on this PR's code. Once the merge conflict is resolved, the CI will need to be re-run to validate:

• checkpatch (coding style)
• check-patch-compliance (Link: tag and author verification)
• sparse-check (if applicable to PCI code)

Reproduce locally:

The conflict cannot be reproduced from this PR alone since it involves the full topic branch integration. To investigate:

# Clone the kernel-config repo and run the automerge manually
git clone https://github.com/qualcomm-linux/kernel-config
cd kernel-config
# Follow the automerge workflow with the merge.conf used by CI

✅ tag-check

Status: PASS

The commit subject starts with FROMLIST:, which is a valid prefix. The commit also includes a proper Link: tag pointing to the lore.kernel.org posting:

Link: https://lore.kernel.org/all/20260721-aspm-v5-1-58860c48d0c7@oss.qualcomm.com/

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

Verdict

Cannot assess merge readiness — the CI automerge conflict blocked all checker validation. The PR code itself appears well-formed (proper FROMLIST: prefix, lore link, signed-off-by tags), but the actual checker results are unavailable.

Required action: Resolve the monaco-evk.dts merge conflict in the topic branch integration, then re-trigger CI to obtain actual checker results.