Skip to content

QCLINUX: arm64: configs: qcom: reduce SWIOTLB size to 2 MiB - #1644

Merged
Komal Bajaj (Komal-Bajaj) merged 1 commit into
qualcomm-linux:tech/all/configfrom
jpagadal:tech/all/config
Aug 6, 2026
Merged

QCLINUX: arm64: configs: qcom: reduce SWIOTLB size to 2 MiB#1644
Komal Bajaj (Komal-Bajaj) merged 1 commit into
qualcomm-linux:tech/all/configfrom
jpagadal:tech/all/config

Conversation

@jpagadal

Copy link
Copy Markdown

Set CONFIG_SWIOTLB_DEFAULT_SIZE_MB=2 to reduce the default SWIOTLB pool size from 64 MiB to 2 MiB.
This lowers kernel reserved memory and increases available RAM for user space.

Dependency:
The Kconfig option used by this change
(CONFIG_SWIOTLB_DEFAULT_SIZE_MB) was introduced and merged in: #1422

CRs-Fixed: 4490764

@qcomlnxci
qcomlnxci requested review from a team, Dmitry Baryshkov (lumag), Mukesh Ojha (mukeshojha-linux) and Trilok Soni (trsoni) and removed request for a team August 6, 2026 03:51
Set CONFIG_SWIOTLB_DEFAULT_SIZE_MB=2 to reduce the default
SWIOTLB pool size from 64 MiB to 2 MiB.

This lowers kernel reserved memory and increases available
RAM for user space.

Signed-off-by: Jagadeesh Pagadala <jpagadal@qti.qualcomm.com>
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1644

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge kernel/configs/debug.config No Pre-existing integration conflict between baseline and topic branch topic/tech/all/config

Verdict

The build failure is NOT introduced by this PR. The failure occurs during the automerge/integration phase due to a pre-existing merge conflict in kernel/configs/debug.config, which is not modified by this PR.

📎 Detailed analysis: Full report

@qcomlnxci
qcomlnxci requested a review from a team August 6, 2026 04:05
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1644

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge kernel/configs/debug.config No Conflict between baseline (8d5dbc1b17ad) and topic/tech/all/config branch in a file not touched by this PR

Verdict

0 of 1 errors are introduced by this PR; 1 is a pre-existing integration issue. The PR only modifies arch/arm64/configs/qcom.config, but the failure occurs during automerge in an unrelated file (kernel/configs/debug.config). This is an infrastructure/integration problem, not a PR code issue.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1644

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge kernel/configs/debug.config No Pre-existing conflict between baseline (8d5dbc1b17ad) and topic branch (topic/tech/all/config) unrelated to PR changes

Verdict

The build failure is NOT caused by this PR. The failure is a pre-existing merge conflict in kernel/configs/debug.config that occurs during the automerge integration step, before compilation begins. The PR only modifies arch/arm64/configs/qcom.config and does not touch the conflicting file.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1644

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge kernel/configs/debug.config No Pre-existing conflict between topic/tech/all/config branch and baseline (8d5dbc1b17adf8fe86a41adcda686785e73f5414). The PR only modifies arch/arm64/configs/qcom.config and does not touch kernel/configs/debug.config.

Verdict

The build failure is NOT caused by this PR. The merge conflict in kernel/configs/debug.config is a pre-existing integration issue between the topic/tech/all/config branch and the baseline kernel.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1644 — validate-patch

PR: #1644

Verdict Issues Detailed Report
0 Full report

Final Summary

  1. Lore link present: No — QCLINUX: prefix; no lore link expected or required
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — vendor-only change, not posted upstream
  4. PR present in qcom-next/topics: Fail - 1/1 commit(s) are missing from both qcom-next and topics
Verdict: ✅ — click to expand

🔍 Patch Validation

PR: #1644 — QCLINUX: arm64: configs: qcom: reduce SWIOTLB size to 2 MiB
Upstream commit: N/A (vendor-only commit)
Verdict: ✅ PASS (vendor-only; validation not applicable)

Commit Message

Check Status Note
Subject matches upstream N/A QCLINUX: prefix — vendor-only commit
Body preserves rationale Clear explanation of config change and rationale
Fixes tag present/correct N/A Not a bug fix
Authorship preserved Signed-off-by present
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
arch/arm64/configs/qcom.config Single-line config addition; alphabetically sorted

Issues

None. This is a vendor-specific kernel config tuning commit with the correct QCLINUX: prefix.

Verdict

Merge as-is. This is a legitimate vendor-only configuration change that reduces SWIOTLB reserved memory from 64 MiB to 2 MiB to increase available RAM. The commit message clearly explains the rationale, and the change is appropriately marked with the QCLINUX: prefix indicating it is not intended for upstream submission.

Final Summary

  1. Lore link present: No — QCLINUX: prefix; no lore link expected or required
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — vendor-only change, not posted upstream
  4. PR present in qcom-next/topics: Not checked — QCLINUX: vendor-only commit (integration_presence_report.md shows missing, which is expected for new vendor-only changes before merge)

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

Commit Subject qcom-next topics Final
1/1 [PATCH] QCLINUX: arm64: configs: qcom: reduce SWIOTLB size to 2 MiB missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing

Final Status

overall_status: FAIL
present_commits: 0/1
partial_commits: 0/1
missing_commits: 1/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Fail - 1/1 commit(s) are missing from both qcom-next and topics

@qlijarvis

Copy link
Copy Markdown

PR #1644 — checker-log-analyzer

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

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 ⚠️ Subject uses QCLINUX: prefix (vendor-only)
qcom-next-check N/A Not applicable for topic branches

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1644 - QCLINUX: arm64: configs: qcom: reduce SWIOTLB size to 2 MiB
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/31070242964

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 ⚠️ Subject uses QCLINUX: prefix (vendor-only)
qcom-next-check N/A Not applicable for topic branches

❌ Automerge Conflict (Pre-Checker Failure)

Root cause: Merge conflict in kernel/configs/debug.config when integrating topic/tech/all/config with baseline 8d5dbc1b17adf8fe86a41adcda686785e73f5414.

Failure details:

2026-08-06T04:22:08.5675080Z Auto-merging arch/arm64/configs/defconfig
2026-08-06T04:22:08.5675566Z Auto-merging kernel/configs/debug.config
2026-08-06T04:22:08.5676101Z CONFLICT (content): Merge conflict in kernel/configs/debug.config
2026-08-06T04:22:08.6380750Z Automatic merge failed; fix conflicts and then commit the result.
2026-08-06T04:22:08.6487926Z Merge failed, manual merge

Analysis:

The CI workflow uses an automerge process to integrate topic branches before running checkers. This PR targets topic/tech/all/config and adds a single line to arch/arm64/configs/qcom.config:

+CONFIG_SWIOTLB_DEFAULT_SIZE_MB=2

However, when the CI attempted to merge this topic branch with the baseline integration branch, it encountered a conflict in a different file (kernel/configs/debug.config), which is not modified by this PR.

This indicates that:

  1. The baseline has diverged since this topic branch was created
  2. Another topic branch (already in the integration) has conflicting changes to kernel/configs/debug.config
  3. The conflict is not caused by this PR's changes but by the integration environment

Fix:

This is an integration conflict, not a patch defect. The PR author should:

  1. Rebase the topic branch on the latest baseline:

    git fetch origin
    git rebase origin/qcom-next  # or the appropriate baseline branch
  2. Resolve any conflicts that arise during rebase (likely in kernel/configs/debug.config)

  3. Force-push the rebased branch to update the PR:

    git push --force-with-lease origin tech/all/config
  4. Re-trigger CI - the automerge should succeed after rebasing

Alternative: If this is a recurring integration issue, coordinate with the maintainer of the conflicting topic branch to resolve the debug.config conflict at the integration level.


⚠️ tag-check — Subject Prefix

Observation: The commit subject uses the QCLINUX: prefix:

QCLINUX: arm64: configs: qcom: reduce SWIOTLB size to 2 MiB

Analysis:

The QCLINUX: prefix indicates this is a vendor-only change with no upstream equivalent. This is appropriate for Qualcomm-specific configuration tuning that won't be submitted to mainline.

Note: If this PR were targeting a branch other than qcom-next or qcom-next-staging, the QCLINUX: prefix would cause check-patch-compliance to fail (it only accepts FROMLIST:, FROMGIT:, UPSTREAM:, BACKPORT:). However, since this targets a topic branch that will be integrated into qcom-next, this is acceptable.

No action required - the prefix is correct for vendor-only config changes.


Verdict

Cannot merge - automerge conflict must be resolved first.

Blockers:

  1. Automerge conflict in kernel/configs/debug.config (not caused by this PR)

Recommended actions:

  1. Rebase topic/tech/all/config on the latest baseline
  2. Resolve the debug.config conflict during rebase
  3. Force-push and re-trigger CI
  4. All checkers should pass after successful automerge (the PR itself only adds a single config line with no style/compliance issues)

Patch quality: The PR itself is clean - it adds a single, well-documented config option with proper commit message and sign-off. The CI failure is purely an integration/rebase issue.

@Komal-Bajaj
Komal Bajaj (Komal-Bajaj) merged commit a81bb13 into qualcomm-linux:tech/all/config Aug 6, 2026
4 of 7 checks passed
@qswat-orbit-external

Copy link
Copy Markdown

Change task cannot be moved to Dev Complete

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

The change task for this CR cannot be automatically moved to Dev Complete due to the error above. Please resolve the issue mentioned in the error and manually change the change task status to Dev Complete in Orbit.

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