There are 3 SMMU MMIO register blocks. They may get bigger as new
Tegra SoC comes. This patch enables to support variable size of those
register blocks.
Signed-off-by: Hiroshi Doyu <hdoyu@xxxxxxxxxx>
---
drivers/iommu/tegra-smmu.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index e80312c..4f3a2a5 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -222,6 +222,7 @@ struct smmu_debugfs_info {
*/
struct smmu_device {
void __iomem *regs[NUM_SMMU_REG_BANKS];
+ resource_size_t regsz[NUM_SMMU_REG_BANKS];
unsigned long iovmm_base; /* remappable base address */
unsigned long page_count; /* total remappable size */
spinlock_t lock;
@@ -257,13 +258,13 @@ static struct smmu_device *smmu_handle; /* unique for a system */
static inline u32 smmu_read(struct smmu_device *smmu, size_t offs)
{
BUG_ON(offs < 0x10);
- if (offs < 0x3c)
+ if (offs < 0x10 + smmu->regsz[0])
return readl(smmu->regs[0] + offs - 0x10);
BUG_ON(offs < 0x1f0);
- if (offs < 0x200)
+ if (offs < 0x1f0 + smmu->regsz[1])
return readl(smmu->regs[1] + offs - 0x1f0);
BUG_ON(offs < 0x228);
- if (offs < 0x284)
+ if (offs < 0x228 + smmu->regsz[2])
return readl(smmu->regs[2] + offs - 0x228);
BUG();
}
@@ -271,17 +272,17 @@ static inline u32 smmu_read(struct smmu_device *smmu, size_t offs)
static inline void smmu_write(struct smmu_device *smmu, u32 val, size_t offs)
{
BUG_ON(offs < 0x10);
- if (offs < 0x3c) {
+ if (offs < 0x10 + smmu->regsz[0]) {
writel(val, smmu->regs[0] + offs - 0x10);
return;
}
BUG_ON(offs < 0x1f0);
- if (offs < 0x200) {
+ if (offs < 0x1f0 + smmu->regsz[1]) {
writel(val, smmu->regs[1] + offs - 0x1f0);
return;
}
BUG_ON(offs < 0x228);
- if (offs < 0x284) {
+ if (offs < 0x228 + smmu->regsz[2]) {
writel(val, smmu->regs[2] + offs - 0x228);
return;
}
@@ -1117,6 +1118,7 @@ static int tegra_smmu_probe(struct platform_device *pdev)
smmu->regs[i] = devm_request_and_ioremap(&pdev->dev, res);
if (!smmu->regs[i])
return -EBUSY;
+ smmu->regsz[i] = resource_size(res);
}
err = of_get_dma_window(dev->of_node, NULL, 0, NULL, &base, &size);
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
