Commit 935d43ba authored Nov 13, 2019 by Shameer Kolothum Committed by Will Deacon Jan 10, 2020

iommu/arm-smmu-v3: Populate VMID field for CMDQ_OP_TLBI_NH_VA



CMDQ_OP_TLBI_NH_VA requires VMID and this was missing since
commit 1c27df1c ("iommu/arm-smmu: Use correct address mask
for CMD_TLBI_S2_IPA"). Add it back.

Fixes: 1c27df1c ("iommu/arm-smmu: Use correct address mask for CMD_TLBI_S2_IPA")
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Signed-off-by: Will Deacon <will@kernel.org>

parent fc10cca6

drivers/iommu/arm-smmu-v3.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -851,6 +851,7 @@ static int arm_smmu_cmdq_build_cmd(u64 cmd, struct arm_smmu_cmdq_ent ent)
		cmd[1] \|= FIELD_PREP(CMDQ_CFGI_1_RANGE, 31);
		break;
		case CMDQ_OP_TLBI_NH_VA:
		cmd[0] \|= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid);
		cmd[0] \|= FIELD_PREP(CMDQ_TLBI_0_ASID, ent->tlbi.asid);
		cmd[1] \|= FIELD_PREP(CMDQ_TLBI_1_LEAF, ent->tlbi.leaf);
		cmd[1] \|= ent->tlbi.addr & CMDQ_TLBI_1_VA_MASK;

Original line number	Diff line number	Diff line
		@@ -851,6 +851,7 @@ static int arm_smmu_cmdq_build_cmd(u64 cmd, struct arm_smmu_cmdq_ent ent)
		cmd[1] \|= FIELD_PREP(CMDQ_CFGI_1_RANGE, 31);
		break;
		case CMDQ_OP_TLBI_NH_VA:
		cmd[0] \|= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid);
		cmd[0] \|= FIELD_PREP(CMDQ_TLBI_0_ASID, ent->tlbi.asid);
		cmd[1] \|= FIELD_PREP(CMDQ_TLBI_1_LEAF, ent->tlbi.leaf);
		cmd[1] \|= ent->tlbi.addr & CMDQ_TLBI_1_VA_MASK;

Admin message