Skip to content

Prepare qcom-next based on tag 'Linux 7.2-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git - #877

Closed
Salendarsingh Gaud (sgaud-quic) wants to merge 1446 commits into
qualcomm-linux:qcom-next-stagingfrom
sgaud-quic:qcom-next-staging-7.2-rc5-20260729
Closed

Prepare qcom-next based on tag 'Linux 7.2-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#877
Salendarsingh Gaud (sgaud-quic) wants to merge 1446 commits into
qualcomm-linux:qcom-next-stagingfrom
sgaud-quic:qcom-next-staging-7.2-rc5-20260729

Conversation

@sgaud-quic

Copy link
Copy Markdown
Contributor

Name SHA Commits

tech/bsp/clk d8a14b9 30
tech/bsp/devfreq 4809534 7
tech/security/firmware-smc de7413c 6
tech/bsp/soc-infra ff6ff7b 22
tech/bsp/pinctrl 79149ef 1
tech/bsp/remoteproc 39a86aa 13
tech/bus/peripherals fedd8c6 6
tech/bus/pci/all 9f6650a 43
tech/bus/pci/phy 66e44c2 14
tech/bus/usb/dwc 9dd47ad 3
tech/bus/usb/phy c3aa7d5 35
tech/debug/hwtracing 27d6059 23
tech/pmic/misc 5d2c2d7 12
tech/mem/iommu cdc9e80 9
tech/mm/audio/all 88b8f29 8
tech/mm/camss 3bcce10 47
tech/mm/drm 9e407ef 68
tech/mm/fastrpc 7afcba9 12
tech/mm/video d5379b4 122
tech/mm/gpu 0b8d9f4 7
tech/mproc/rpmsg 55dc464 1
tech/net/ath a364d47 26
tech/net/bluetooth 33aa6a3 1
tech/pm/power bb88701 13
tech/pm/thermal 9fdfd80 12
tech/security/crypto 1f60c0a 23
tech/security/ice beabac0 9
tech/storage/all cef1b3c 5
tech/all/dt/qcs6490 740676b 27
tech/all/dt/qcs9100 0a48d61 92
tech/all/dt/qcs8300 5cb63a5 25
tech/all/dt/qcs615 9a58c35 9
tech/all/dt/agatti c828f10 1
tech/all/dt/eliza ddb736b 23
tech/all/dt/hamoa 2e751da 42
tech/all/dt/glymur d288220 52
tech/all/dt/kaanapali 625c171 21
tech/all/dt/pakala 960924d 13
tech/all/config 90a294d 72
tech/overlay/dt b895d0e 78
tech/all/workaround a2ced88 20
tech/mproc/all 104969c 2
tech/noup/debug/all 80bf7fe 26
tech/hwe/unoq a2d85fe 4
early/hwe/shikra/drivers b19d2ec 184
early/hwe/shikra/dt dd90d88 130

Pratyush Meduri and others added 30 commits July 27, 2026 12:16
…d SMMU mappings

The audio ML (machine-learning) offload use case requires a contiguous,
physically addressable buffer shared with the audio DSP/SPF, and issues
DMA transactions through additional SMMU stream IDs that are not
covered by the existing ADSP mapping.

Add a dedicated reusable shared-dma-pool CMA region (16 MiB, 4 MiB
aligned) and wire it to the q6apm DAIs node via memory-region. A
dedicated pool guarantees the alignment and contiguity the DSP expects
and isolates these allocations from the default CMA region.

Under the EL2 (Gunyah/hypervisor) configuration the SMMU is fully
enforcing, so the ML transactions are otherwise blocked and faulted:

 arm-smmu 15000000.iommu: Blocked unknown Stream ID 0x2060
 arm-smmu 15000000.iommu: Blocked unknown Stream ID 0x2062

Add the ML-related stream IDs (0x3060 mask 0x9, 0x3062 mask 0x1) to the
remoteproc_adsp iommus property in the EL2 overlay so these buffers are
translated by the SMMU instead of being rejected.

Link: https://lore.kernel.org/all/20260717095825.3962666-4-pratyush.meduri@oss.qualcomm.com/
Signed-off-by: Pratyush Meduri <pratyush.meduri@oss.qualcomm.com>
…r encoder"

This reverts commit bad0a97.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…1 encoder"

This reverts commit c0cfb67.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…devs"

This reverts commit 1f09f93.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…for VBR"

This reverts commit 590953d.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
… formats"

This reverts commit baed214.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…50lt encoder"

This reverts commit a2bd45f.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…t for ar50lt encoder"

This reverts commit ae8c4d1.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
This reverts commit dc89f72.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…anaged by Linux"

This reverts commit c4982a4.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
This reverts commit cd24d3c.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
This reverts commit bf3e42b.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…_devs"

This reverts commit 29dd374.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…nk function IDs"

This reverts commit 5558052.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…MMU handling"

This reverts commit b81da93.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
This reverts commit b240294.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…deo codec"

This reverts commit 98928e8.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
This reverts commit d0df64f.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…re platforms"

This reverts commit 59a6e61.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
This reverts commit 8546813.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…vs index"

This reverts commit 972ab0a.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…o use vcodec prefix"

This reverts commit e2a12ef.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
This reverts commit cc0d08c.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
This reverts commit a05911a.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
This reverts commit 432464b.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…i platform"

This reverts commit 207c29a.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
… AR50LT"

This reverts commit 936dbb1.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…orm"

This reverts commit 74b9e15.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
…ceived info"

This reverts commit 4ec08f9.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
This reverts commit f9c9295.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
# Conflicts:
#	drivers/remoteproc/qcom_q6v5_pas.c
# Conflicts:
#	arch/arm64/boot/dts/qcom/monaco-evk.dts
#	arch/arm64/boot/dts/qcom/monaco.dtsi
# Conflicts:
#	arch/arm64/boot/dts/qcom/Makefile
#	arch/arm64/boot/dts/qcom/talos.dtsi
# Conflicts:
#	arch/arm64/boot/dts/qcom/qcs8300-ride.dts
#	drivers/bluetooth/hci_qca.c
#	drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
# Conflicts:
#	drivers/firmware/qcom/Kconfig
#	drivers/firmware/qcom/Makefile
# Conflicts:
#	drivers/dma/qcom/bam_dma.c
#	drivers/misc/fastrpc.c
#	sound/soc/qcom/qdsp6/q6prm.h
#	sound/soc/qcom/sc8280xp.c
# Conflicts:
#	Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml
Adding merge log file and topic_SHA1 file

Signed-off-by: Salendarsingh Gaud <sgaud@qti.qualcomm.com>
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #877

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

# Error File:Line PR-introduced? Root Cause
1 label 'err' used but not defined drivers/dma/qcom/bam_dma.c:807 Yes Extra closing brace at line ~813 prematurely closes function
2 expected identifier or '(' before 'if' drivers/dma/qcom/bam_dma.c:814 Yes Code after premature function closure misinterpreted as global scope
3 expected '=', ',', ';', 'asm' or 'attribute' before '->' token drivers/dma/qcom/bam_dma.c:817 Yes Code after premature function closure misinterpreted as global scope
4 expected '=', ',', ';', 'asm' or 'attribute' before '->' token drivers/dma/qcom/bam_dma.c:818 Yes Code after premature function closure misinterpreted as global scope
5 type defaults to 'int' in declaration of 'val' drivers/dma/qcom/bam_dma.c:821 Yes Variable declaration outside function scope
6 'bdev' undeclared here (not in a function) drivers/dma/qcom/bam_dma.c:821 Yes Function parameter not accessible outside function
7 expected '=', ',', ';', 'asm' or 'attribute' before '&=' token drivers/dma/qcom/bam_dma.c:822 Yes Statement outside function scope
8 expected ')' before '(' token drivers/dma/qcom/bam_dma.c:823 Yes Function call outside function scope
9 expected declaration specifiers before numeric constant drivers/dma/qcom/bam_dma.c:826 Yes Function call arguments outside function scope
10 expected declaration specifiers before 'bam_addr' drivers/dma/qcom/bam_dma.c:826 Yes Function call arguments outside function scope
11 expected identifier or '(' before 'if' drivers/dma/qcom/bam_dma.c:828 Yes Statement outside function scope
12 expected '=', ',', ';', 'asm' or 'attribute' before ':' token drivers/dma/qcom/bam_dma.c:835 Yes Label outside function scope
13 expected ')' before '->' token drivers/dma/qcom/bam_dma.c:837 Yes Statement outside function scope
14 expected identifier or '(' before '}' token drivers/dma/qcom/bam_dma.c:838 Yes Closing brace without matching opening brace

Verdict

All 14 compilation errors are introduced by this PR due to a single syntax error: an extra closing brace after a scoped_guard statement.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #877

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

# Error File:Line PR-introduced? Root Cause
1 label 'err' used but not defined drivers/dma/qcom/bam_dma.c:807 Yes Stray closing brace } after scoped_guard macro breaks function scope, making the err: label unreachable
2 expected identifier or '(' before 'if' drivers/dma/qcom/bam_dma.c:814 Yes Stray closing brace causes parser to treat subsequent code as top-level declarations instead of function body
3 expected '=', ',', ';', 'asm' or 'attribute' before '->' token drivers/dma/qcom/bam_dma.c:817 Yes Parser confusion from stray brace; code outside function scope
4 expected '=', ',', ';', 'asm' or 'attribute' before '->' token drivers/dma/qcom/bam_dma.c:818 Yes Parser confusion from stray brace; code outside function scope
5 type defaults to 'int' in declaration of 'val' drivers/dma/qcom/bam_dma.c:821 Yes Parser treats function-local variable as global due to stray brace
6 'bdev' undeclared here (not in a function) drivers/dma/qcom/bam_dma.c:821 Yes Parser confusion from stray brace; function parameters not in scope
7 expected '=', ',', ';', 'asm' or 'attribute' before '&=' token drivers/dma/qcom/bam_dma.c:822 Yes Parser confusion from stray brace; code outside function scope
8 expected ')' before '(' token drivers/dma/qcom/bam_dma.c:823 Yes Parser confusion from stray brace; code outside function scope
9 expected declaration specifiers or '...' before numeric constant drivers/dma/qcom/bam_dma.c:826 Yes Parser confusion from stray brace; code outside function scope
10 expected declaration specifiers or '...' before 'bam_addr' drivers/dma/qcom/bam_dma.c:826 Yes Parser confusion from stray brace; code outside function scope
11 expected identifier or '(' before 'if' drivers/dma/qcom/bam_dma.c:828 Yes Parser confusion from stray brace; code outside function scope
12 expected '=', ',', ';', 'asm' or 'attribute' before ':' token drivers/dma/qcom/bam_dma.c:835 Yes Parser confusion from stray brace; err: label appears outside function
13 expected ')' before '->' token drivers/dma/qcom/bam_dma.c:837 Yes Parser confusion from stray brace; code outside function scope
14 expected identifier or '(' before '}' token drivers/dma/qcom/bam_dma.c:838 Yes Parser confusion from stray brace; function closing brace misinterpreted

Verdict

All 14 compilation errors are introduced by this PR due to a single syntax error: an erroneous closing brace } added after a scoped_guard macro invocation.

📎 Detailed analysis: Full report

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.