Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 317cf06e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: arm-smmu: Fix dev_err formatting errors"

parents f965c226 cff8e8e1

drivers/iommu/arm-smmu.c

+5 −5
Original line number Diff line number Diff line
@@ -1596,7 +1596,7 @@ static void print_ctx_regs(struct arm_smmu_device *smmu, struct arm_smmu_cfg 


	dev_err(smmu->dev, "FAR    = 0x%016llx\n",

		readq_relaxed(cb_base + ARM_SMMU_CB_FAR));

	dev_err(smmu->dev, "PAR    = 0x%pK\n",

	dev_err(smmu->dev, "PAR    = 0x%016llx\n",

		readq_relaxed(cb_base + ARM_SMMU_CB_PAR));



	dev_err(smmu->dev,
@@ -1616,15 +1616,15 @@ static void print_ctx_regs(struct arm_smmu_device *smmu, struct arm_smmu_cfg 
		(fsr & 0x80000000) ? "MULTI " : "");



	if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) {

		dev_err(smmu->dev, "TTBR0  = 0x%pK\n",

		dev_err(smmu->dev, "TTBR0  = 0x%08x\n",

			readl_relaxed(cb_base + ARM_SMMU_CB_TTBR0));

		dev_err(smmu->dev, "TTBR1  = 0x%pK\n",

		dev_err(smmu->dev, "TTBR1  = 0x%08x\n",

			readl_relaxed(cb_base + ARM_SMMU_CB_TTBR1));

	} else {

		dev_err(smmu->dev, "TTBR0  = 0x%pK\n",

		dev_err(smmu->dev, "TTBR0  = 0x%016llx\n",

			readq_relaxed(cb_base + ARM_SMMU_CB_TTBR0));

		if (stage1)

			dev_err(smmu->dev, "TTBR1  = 0x%pK\n",

			dev_err(smmu->dev, "TTBR1  = 0x%016llx\n",

				readq_relaxed(cb_base + ARM_SMMU_CB_TTBR1));

	}