diff options
| author | Hiroshi Doyu <hdoyu@nvidia.com> | 2014-05-30 14:20:23 +0300 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-06-03 17:19:54 +0200 |
| commit | 5812abba5c8e65cf2c1b0f3581349b7a7b48cee6 (patch) | |
| tree | 1e8f1c54f6177f880ad3619ba76ab65d365a4a59 | |
| parent | 85f778cf5518864ed25f4c6bba7ea3d7240b2c9c (diff) | |
iommu/tegra: smmu: allow duplicate ASID wirte
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 <hdoyu@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | drivers/iommu/tegra-smmu.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 1d3f695d3c6..caa531cb1c5 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -417,9 +417,13 @@ static int __smmu_client_set_hwgrp(struct smmu_client *c, offs = HWGRP_ASID_REG(i); val = smmu_read(smmu, offs); if (on) { - if (WARN_ON(val & mask)) - goto err_hw_busy; - val |= mask; + if (val) { + if (WARN_ON(val != mask)) + return -EINVAL; + goto skip; + } + + val = mask; memcpy(c->hwgrp, map, sizeof(u64)); } else { WARN_ON((val & mask) == mask); @@ -429,16 +433,8 @@ static int __smmu_client_set_hwgrp(struct smmu_client *c, } FLUSH_SMMU_REGS(smmu); +skip: return 0; - -err_hw_busy: - for_each_set_bit(i, map, TEGRA_SWGROUP_MAX) { - offs = HWGRP_ASID_REG(i); - val = smmu_read(smmu, offs); - val &= ~mask; - smmu_write(smmu, val, offs); - } - return -EBUSY; } static int smmu_client_set_hwgrp(struct smmu_client *c, |