Skip to content

Commit

Permalink
iommu/tegra: smmu: Compute PFN mask at runtime
Browse files Browse the repository at this point in the history
The SMMU on Tegra30 and Tegra114 supports addressing up to 4 GiB of
physical memory. On Tegra124 the addressable physical memory was
extended to 16 GiB. The page frame number stored in PTEs therefore
requires 20 or 22 bits, depending on SoC generation.

In order to cope with this, compute the proper value at runtime.

Reported-by: Joseph Lo <josephl@nvidia.com>
Cc: Hiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Thierry Reding authored and Joerg Roedel committed Mar 31, 2015
1 parent 836a8ac commit 804cb54
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/iommu/tegra-smmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* published by the Free Software Foundation.
*/

#include <linux/bitops.h>
#include <linux/err.h>
#include <linux/iommu.h>
#include <linux/kernel.h>
Expand All @@ -24,6 +25,8 @@ struct tegra_smmu {
struct tegra_mc *mc;
const struct tegra_smmu_soc *soc;

unsigned long pfn_mask;

unsigned long *asids;
struct mutex lock;

Expand Down Expand Up @@ -105,8 +108,6 @@ static inline u32 smmu_readl(struct tegra_smmu *smmu, unsigned long offset)
#define SMMU_PDE_SHIFT 22
#define SMMU_PTE_SHIFT 12

#define SMMU_PFN_MASK 0x000fffff

#define SMMU_PD_READABLE (1 << 31)
#define SMMU_PD_WRITABLE (1 << 30)
#define SMMU_PD_NONSECURE (1 << 29)
Expand Down Expand Up @@ -486,7 +487,7 @@ static u32 *as_get_pte(struct tegra_smmu_as *as, dma_addr_t iova,
smmu_flush_tlb_section(smmu, as->id, iova);
smmu_flush(smmu);
} else {
page = pfn_to_page(pd[pde] & SMMU_PFN_MASK);
page = pfn_to_page(pd[pde] & smmu->pfn_mask);
pt = page_address(page);
}

Expand All @@ -508,7 +509,7 @@ static void as_put_pte(struct tegra_smmu_as *as, dma_addr_t iova)
u32 *pd = page_address(as->pd), *pt;
struct page *page;

page = pfn_to_page(pd[pde] & SMMU_PFN_MASK);
page = pfn_to_page(pd[pde] & as->smmu->pfn_mask);
pt = page_address(page);

/*
Expand Down Expand Up @@ -583,7 +584,7 @@ static phys_addr_t tegra_smmu_iova_to_phys(struct iommu_domain *domain,
u32 *pte;

pte = as_get_pte(as, iova, &page);
pfn = *pte & SMMU_PFN_MASK;
pfn = *pte & as->smmu->pfn_mask;

return PFN_PHYS(pfn);
}
Expand Down Expand Up @@ -707,6 +708,10 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev,
smmu->dev = dev;
smmu->mc = mc;

smmu->pfn_mask = BIT_MASK(mc->soc->num_address_bits - PAGE_SHIFT) - 1;
dev_dbg(dev, "address bits: %u, PFN mask: %#lx\n",
mc->soc->num_address_bits, smmu->pfn_mask);

value = SMMU_PTC_CONFIG_ENABLE | SMMU_PTC_CONFIG_INDEX_MAP(0x3f);

if (soc->supports_request_limit)
Expand Down

0 comments on commit 804cb54

Please sign in to comment.