]> xenbits.xensource.com Git - people/royger/xen.git/commitdiff
xen/arm: smmuv3: Fix l1 stream table size in the error message
authorZenghui Yu <yuzenghui@huawei.com>
Mon, 22 Aug 2022 15:19:01 +0000 (16:19 +0100)
committerJulien Grall <jgrall@amazon.com>
Tue, 6 Sep 2022 16:42:59 +0000 (17:42 +0100)
Backport Linux commit dc898eb84b25. This is the clean backport without
any changes.

The actual size of level-1 stream table is l1size. This looks like an
oversight on commit d2e88e7c081ef ("iommu/arm-smmu: Fix LOG2SIZE setting
for 2-level stream tables") which forgot to update the @size in error
message as well.

As memory allocation failure is already bad enough, nothing worse would
happen. But let's be careful.

Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Link: https://lore.kernel.org/r/20200826141758.341-1-yuzenghui@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git dc898eb84b25
Signed-off-by: Rahul Singh <rahul.singh@arm.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
xen/drivers/passthrough/arm/smmu-v3.c

index f2562acc38bf8bbc997fabb14b40c7e804a5f92c..340609264d0a07d1b7fcfe12ea612b8848cac951 100644 (file)
@@ -2348,7 +2348,7 @@ static int arm_smmu_init_strtab_2lvl(struct arm_smmu_device *smmu)
        if (!strtab) {
                dev_err(smmu->dev,
                        "failed to allocate l1 stream table (%u bytes)\n",
-                       size);
+                       l1size);
                return -ENOMEM;
        }
        cfg->strtab = strtab;