Revert "iommu/tegra: smmu: of: remove dead code"

This reverts commit 515c25cab79939ce3a9884e6a58d3b58d25758cb.

Bug 1190050

Change-Id: I8f9653099ea821439b8a97f8a4ed0c8181e93ad4
Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
Reviewed-on: http://git-master/r/606244
(cherry picked from commit 05dc77dd49d8510750f36354860c1dbb81646537)
Reviewed-on: http://git-master/r/934483
GVS: Gerrit_Virtual_Submit
Reviewed-by: Hayden Du <haydend@nvidia.com>

diff --git a/drivers/iommu/of_tegra-smmu.c b/drivers/iommu/of_tegra-smmu.c
index e6490ca2ec39fcdb50810bea3a105529cd5fe376..d71e89cd61350ca59babd3630398aa60bdf494a5 100644 (file)
--- a/drivers/iommu/of_tegra-smmu.c
+++ b/drivers/iommu/of_tegra-smmu.c
@@ -165,8 +165,11 @@ u64 tegra_smmu_of_get_swgids(struct device *dev,
        struct of_phandle_iter iter;
        u64 fixup, swgids = 0;
 
-       if (dev_is_pci(dev))
+       if (dev_is_pci(dev)) {
                return SWGIDS_ERROR_CODE;
+               swgids = TEGRA_SWGROUP_BIT(AFI);
+               goto try_fixup;
+       }
 
        of_property_for_each_phandle_with_args(iter, dev->of_node, "iommus",
                                               "#iommu-cells", 0) {
@@ -186,6 +189,7 @@ u64 tegra_smmu_of_get_swgids(struct device *dev,
 
        swgids = swgids ? swgids : SWGIDS_ERROR_CODE;
 
+try_fixup:
        fixup = tegra_smmu_fixup_swgids(dev, area);
 
        if (swgids_is_error(fixup))