hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICAYQT ----------------------------------------- The IIDR and ARCH_HISI is not enough to identify the problematic platform. Fixes: 46f0c5798ba5 ("iommu/arm-smmu-v3: Enable iotlb_sync_map according to SMMU_IIDR") Signed-off-by: Zhang Zekun <zhangzekun11@huawei.com> --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 46ab1c6b8785..367e126adbcf 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -5024,13 +5024,6 @@ static void arm_smmu_device_iidr_probe(struct arm_smmu_device *smmu) } break; } - -#ifdef CONFIG_HISILICON_ERRATUM_162100602 - reg = readl_relaxed(smmu->base + ARM_SMMU_IIDR); - if (FIELD_GET(IIDR_VARIANT, reg) == 0x3 && - FIELD_GET(IIDR_REVISION, reg) == 0x2) - smmu->options |= ARM_SMMU_OPT_SYNC_MAP; -#endif } #ifdef CONFIG_HISILICON_ERRATUM_162100602 @@ -5041,8 +5034,6 @@ static void hisi_smmu_check_errata(struct arm_smmu_device *smmu) if (!(smmu->options & ARM_SMMU_OPT_SYNC_MAP)) return; - smmu->options |= ARM_SMMU_OPT_SYNC_MAP; - reg = readl_relaxed(smmu->base + ARM_SMMU_USER_CFG1); reg = reg & GENMASK(15, 0); for (i = 0; i < 8; i++) { -- 2.22.0