Commit 6505a329 authored by Kunkun Jiang's avatar Kunkun Jiang Committed by Zheng Zengkai
Browse files

Revert "iommu/arm-smmu-v3: Change the TLBI CMD in arm_smmu_cache_invalidate()" 

virt inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I61SPO


CVE: NA

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

This reverts commit 9ed8587a.

Signed-off-by: default avatarKunkun Jiang <jiangkunkun@huawei.com>
Reviewed-by: default avatarKeqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 78a7553a

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+1 −2
Original line number Diff line number Diff line
@@ -338,7 +338,6 @@ static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) 
	case CMDQ_OP_TLBI_NH_ASID:

		cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_ASID, ent->tlbi.asid);

		fallthrough;

	case CMDQ_OP_TLBI_NH_ALL:

	case CMDQ_OP_TLBI_S12_VMALL:

		cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid);

		break;
@@ -3759,7 +3758,7 @@ static int 
arm_smmu_cache_invalidate(struct iommu_domain *domain, struct device *dev,

			  struct iommu_cache_invalidate_info *inv_info)

{

	struct arm_smmu_cmdq_ent cmd = {.opcode = CMDQ_OP_TLBI_NH_ALL};

	struct arm_smmu_cmdq_ent cmd = {.opcode = CMDQ_OP_TLBI_NSNH_ALL};

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct arm_smmu_device *smmu = smmu_domain->smmu;

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h

+0 −1
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ struct arm_smmu_cmdq_ent { 
			};

		} cfgi;



		#define CMDQ_OP_TLBI_NH_ALL	0x10

		#define CMDQ_OP_TLBI_NH_ASID	0x11

		#define CMDQ_OP_TLBI_NH_VA	0x12

		#define CMDQ_OP_TLBI_EL2_ALL	0x20