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

Commit a3e72219 authored by Jordan Crouse's avatar Jordan Crouse
Browse files

iommu: arm-smmu: Fix compile warnings 



Fix the following compiler warning(s) from gcc 6.1.1 with -Werror enabled:

 drivers/iommu/arm-smmu.c:1417:
   format '%p' expects argument of type 'void *', but argument 3 has
	 type 'u64 {aka long long unsigned int}' [-Werror=format=]
  dev_err(smmu->dev, "PAR    = 0x%pK\n",

 drivers/iommu/arm-smmu.c:1437:
   format '%p' expects argument of type 'void *', but argument 3 has
	type 'u32 {aka unsigned int}' [-Werror=format=]
   dev_err(smmu->dev, "TTBR0  = 0x%pK\n",

 drivers/iommu/arm-smmu.c:1439:
   format '%p' expects argument of type 'void *', but argument 3 has
	type 'u32 {aka unsigned int}' [-Werror=format=]
   dev_err(smmu->dev, "TTBR1  = 0x%pK\n",

 drivers/iommu/arm-smmu.c:1442:
   format '%p' expects argument of type 'void *', but argument 3 has
	type 'u64 {aka long long unsigned int}' [-Werror=format=]
   dev_err(smmu->dev, "TTBR0  = 0x%pK\n",

 drivers/iommu/arm-smmu.c:1445:
   format '%p' expects argument of type 'void *', but argument 3 has
	type 'u64 {aka long long unsigned int}' [-Werror=format=]
    dev_err(smmu->dev, "TTBR1  = 0x%pK\n",

Fixes: 9d4b7d64 ("iommu: arm-smmu: Merge for msm-kona kernel upgrade")
Change-Id: Ic0dedbadc5aab73cca3aac6b27bb40cd218e2e22
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent 153517d2

drivers/iommu/arm-smmu.c

+6 −3
Original line number Diff line number Diff line
@@ -1416,7 +1416,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",

		readq_relaxed(cb_base + ARM_SMMU_CB_PAR));

		(void *) readq_relaxed(cb_base + ARM_SMMU_CB_PAR));



	dev_err(smmu->dev,

		"FSR    = 0x%08x [%s%s%s%s%s%s%s%s%s%s]\n",
@@ -1436,15 +1436,18 @@ static void print_ctx_regs(struct arm_smmu_device *smmu, struct arm_smmu_cfg 


	if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) {

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

			(void *) (unsigned long)

			readl_relaxed(cb_base + ARM_SMMU_CB_TTBR0));

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

			(void *) (unsigned long)

			readl_relaxed(cb_base + ARM_SMMU_CB_TTBR1));

	} else {

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

			readq_relaxed(cb_base + ARM_SMMU_CB_TTBR0));

			(void *) readq_relaxed(cb_base + ARM_SMMU_CB_TTBR0));

		if (stage1)

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

				readq_relaxed(cb_base + ARM_SMMU_CB_TTBR1));

				(void *) readq_relaxed(cb_base +

					ARM_SMMU_CB_TTBR1));

	}