summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHiroshi Doyu <hdoyu@nvidia.com>2013-02-04 09:02:54 +0200
committerHarshada Kale <hkale@nvidia.com>2013-06-10 03:44:56 -0700
commitb76c1c2be45810290f45f57cb974eaabc8883e43 (patch)
tree100cedce896a3aecda6543c41c50c843047b1608 /drivers
parentc53a8812b95ed4623662a07076ee06307b0f7ffb (diff)
iommu/tegra: smmu: Disable smmu_client_disable_hwgrp()
Disable this until swgroup is implemented correctly. bug 1286500 Change-Id: Ic6bdd10bf165e713326a4bcde8d0746d41e5cb23 (cherry picked from commit 542b4ccbc6ca87cd1f4c13eb62c0516ccca433dc) Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com> Reviewed-on: http://git-master/r/234109 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iommu/tegra-smmu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 1f0ebf136524..f0053e4de00f 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -426,11 +426,11 @@ static int __smmu_client_set_hwgrp(struct smmu_client *c,
}
#endif
val |= mask;
- } else {
#if !defined(SKIP_SWGRP_CHECK)
+ } else {
WARN_ON((val & mask) == mask);
-#endif
val &= ~mask;
+#endif
}
smmu_write(smmu, val, offs);
}