[PATCHv4 7/7] iommu/tegra: smmu: Allow duplicate ASID wirte
From: Hiroshi Doyu <hidden>
Date: 2013-11-11 08:31:58
Also in:
linux-devicetree, linux-iommu, linux-tegra
Subsystem:
iommu subsystem, tegra iommu drivers, the rest · Maintainers:
Joerg Roedel, Will Deacon, Thierry Reding, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2013-11-13 · Re: [PATCHv4 7/7] iommu/tegra: smmu: Allow duplicate ASID wirte · Stephen Warren <hidden>
The device, which belongs to the same ASID, can try to enable the same ASID as the other swgroup devices. This should be allowed but just skip the actual register write. If the write value is different, it will return -EINVAL. Signed-off-by: Hiroshi Doyu <redacted> --- Update: This was the part of v3, which isn't used any more. [PATCHv3 10/19] iommu/tegra: smmu: Get "nvidia,swgroups" from DT --- drivers/iommu/tegra-smmu.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 904c36a..70f974c 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c@@ -346,8 +346,11 @@ static int __smmu_client_set_swgroups(struct smmu_client *c, offs = SWGROUP_ASID_REG(i); val = smmu_read(smmu, offs); if (on) { - if (WARN_ON(val & mask)) - goto err_hw_busy; + if (val) { + if (WARN_ON(val != mask)) + return -EINVAL; + goto skip; + } val |= mask; } else { WARN_ON((val & mask) == mask);
@@ -357,16 +360,8 @@ static int __smmu_client_set_swgroups(struct smmu_client *c, } FLUSH_SMMU_REGS(smmu); c->swgroups = map; +skip: return 0; - -err_hw_busy: - for_each_set_bit(i, bitmap, TEGRA_SWGROUP_MAX) { - offs = SWGROUP_ASID_REG(i); - val = smmu_read(smmu, offs); - val &= ~mask; - smmu_write(smmu, val, offs); - } - return -EBUSY; } static int smmu_client_set_swgroups(struct smmu_client *c, u32 map, int on)
--
1.8.1.5