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

Commit e56b3dab authored by Thierry Reding's avatar Thierry Reding Committed by Joerg Roedel
Browse files

iommu/tegra: Print phys_addr_t using %pa 



When enabling LPAE on ARM, phys_addr_t becomes 64 bits wide and printing
a variable of that type using a simple %x format specifier causes the
compiler to complain. Change the format specifier to %pa, which is used
specifically for variables of type phys_addr_t.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarJoerg Roedel <joro@8bytes.org>
parent 4a10c2ac

drivers/iommu/tegra-gart.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -252,7 +252,7 @@ static int gart_iommu_map(struct iommu_domain *domain, unsigned long iova, 
	spin_lock_irqsave(&gart->pte_lock, flags);

	spin_lock_irqsave(&gart->pte_lock, flags);

	pfn = __phys_to_pfn(pa);

	pfn = __phys_to_pfn(pa);

	if (!pfn_valid(pfn)) {

	if (!pfn_valid(pfn)) {

		dev_err(gart->dev, "Invalid page: %08x\n", pa);

		dev_err(gart->dev, "Invalid page: %pa\n", &pa);

		spin_unlock_irqrestore(&gart->pte_lock, flags);

		spin_unlock_irqrestore(&gart->pte_lock, flags);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -295,8 +295,8 @@ static phys_addr_t gart_iommu_iova_to_phys(struct iommu_domain *domain, 




	pa = (pte & GART_PAGE_MASK);

	pa = (pte & GART_PAGE_MASK);

	if (!pfn_valid(__phys_to_pfn(pa))) {

	if (!pfn_valid(__phys_to_pfn(pa))) {

		dev_err(gart->dev, "No entry for %08llx:%08x\n",

		dev_err(gart->dev, "No entry for %08llx:%pa\n",

			 (unsigned long long)iova, pa);

			 (unsigned long long)iova, &pa);

		gart_dump_table(gart);

		gart_dump_table(gart);

		return -EINVAL;

		return -EINVAL;

	}

	}

drivers/iommu/tegra-smmu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -731,7 +731,7 @@ static int smmu_iommu_map(struct iommu_domain *domain, unsigned long iova, 
	unsigned long pfn = __phys_to_pfn(pa);

	unsigned long pfn = __phys_to_pfn(pa);

	unsigned long flags;

	unsigned long flags;





	dev_dbg(as->smmu->dev, "[%d] %08lx:%08x\n", as->asid, iova, pa);

	dev_dbg(as->smmu->dev, "[%d] %08lx:%pa\n", as->asid, iova, &pa);





	if (!pfn_valid(pfn))

	if (!pfn_valid(pfn))

		return -ENOMEM;

		return -ENOMEM;