Skip to content

Commit 9af48bb

Browse files
committed
Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Arm SMMU updates for 6.13 - SMMUv2: * Return -EPROBE_DEFER for client devices probing before their SMMU. * Devicetree binding updates for Qualcomm MMU-500 implementations. - SMMUv3: * Minor fixes and cleanup for NVIDIA's virtual command queue driver. - IO-PGTable: * Fix indexing of concatenated PGDs and extend selftest coverage. * Remove unused block-splitting support.
2 parents 6ac7dff + a379971 commit 9af48bb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,8 @@ static int tegra241_vcmdq_alloc_smmu_cmdq(struct tegra241_vcmdq *vcmdq)
509509

510510
snprintf(name, 16, "vcmdq%u", vcmdq->idx);
511511

512-
q->llq.max_n_shift = VCMDQ_LOG2SIZE_MAX;
512+
/* Queue size, capped to ensure natural alignment */
513+
q->llq.max_n_shift = min_t(u32, CMDQ_MAX_SZ_SHIFT, VCMDQ_LOG2SIZE_MAX);
513514

514515
/* Use the common helper to init the VCMDQ, and then... */
515516
ret = arm_smmu_init_one_queue(smmu, q, vcmdq->page0,

0 commit comments

Comments
 (0)