Revert "iommu/arm-smmu-v3: make sure the stale caching of L1STD are invalid"

euler inclusion
category: bugfix
bugzilla: 5452
CVE: NA

-------------------------------------------------------------------------

This reverts commit 2886b40f9e7d2b15848647b41d7d04ccf0ad682f.
Signed-off-by: NZhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: NHanjun Guo <guohanjun@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

drivers/iommu/arm-smmu-v3.c

@@ -1190,14 +1190,13 @@ arm_smmu_write_strtab_l1_desc(__le64 *dst, struct arm_smmu_strtab_l1_desc *desc)
 	*dst = cpu_to_le64(val);
 }
 
-static void
-__arm_smmu_sync_ste_for_sid(struct arm_smmu_device *smmu, u32 sid, bool leaf)
+static void arm_smmu_sync_ste_for_sid(struct arm_smmu_device *smmu, u32 sid)
 {
 	struct arm_smmu_cmdq_ent cmd = {
 		.opcode	= CMDQ_OP_CFGI_STE,
 		.cfgi	= {
 			.sid	= sid,
-			.leaf	= leaf,
+			.leaf	= true,
 		},
 	};
 
@@ -1205,16 +1204,6 @@ __arm_smmu_sync_ste_for_sid(struct arm_smmu_device *smmu, u32 sid, bool leaf)
 	arm_smmu_cmdq_issue_sync(smmu);
 }
 
-static void arm_smmu_sync_ste_for_sid(struct arm_smmu_device *smmu, u32 sid)
-{
-	__arm_smmu_sync_ste_for_sid(smmu, sid, true);
-}
-
-static void arm_smmu_sync_std_for_sid(struct arm_smmu_device *smmu, u32 sid)
-{
-        __arm_smmu_sync_ste_for_sid(smmu, sid, false);
-}
-
 static void arm_smmu_write_strtab_ent(struct arm_smmu_device *smmu, u32 sid,
 				      __le64 *dst, struct arm_smmu_strtab_ent *ste)
 {
@@ -1374,7 +1363,6 @@ static int arm_smmu_init_l2_strtab(struct arm_smmu_device *smmu, u32 sid)
 
 	arm_smmu_init_bypass_stes(desc->l2ptr, 1 << STRTAB_SPLIT);
 	arm_smmu_write_strtab_l1_desc(strtab, desc);
-	arm_smmu_sync_std_for_sid(smmu, sid);
 	return 0;
 }