diff options
| author | Joerg Roedel <[email protected]> | 2024-11-15 09:25:00 +0100 |
|---|---|---|
| committer | Joerg Roedel <[email protected]> | 2024-11-15 09:25:00 +0100 |
| commit | 9af48bbbae2a105697817dea4c1bc4992d4ef692 (patch) | |
| tree | f7bb864c34ce501129f7c749331c6ee7b49a1f8a | |
| parent | 6ac7dffe7cca9b259f17b2f255b0d95ee15a76fd (diff) | |
| parent | a3799717b881aa0f4e722afb70e7b8ba84ae4f36 (diff) | |
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.
| -rw-r--r-- | drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c index 6c7770e79af6..c8ec74f089f3 100644 --- a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c +++ b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c @@ -509,7 +509,8 @@ static int tegra241_vcmdq_alloc_smmu_cmdq(struct tegra241_vcmdq *vcmdq) snprintf(name, 16, "vcmdq%u", vcmdq->idx); - q->llq.max_n_shift = VCMDQ_LOG2SIZE_MAX; + /* Queue size, capped to ensure natural alignment */ + q->llq.max_n_shift = min_t(u32, CMDQ_MAX_SZ_SHIFT, VCMDQ_LOG2SIZE_MAX); /* Use the common helper to init the VCMDQ, and then... */ ret = arm_smmu_init_one_queue(smmu, q, vcmdq->page0, |