| From 935d43ba272e0001f8ef446a3eff15d8175cb11b Mon Sep 17 00:00:00 2001 |
| From: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> |
| Date: Wed, 13 Nov 2019 16:11:38 +0000 |
| Subject: iommu/arm-smmu-v3: Populate VMID field for CMDQ_OP_TLBI_NH_VA |
| |
| From: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> |
| |
| commit 935d43ba272e0001f8ef446a3eff15d8175cb11b upstream. |
| |
| CMDQ_OP_TLBI_NH_VA requires VMID and this was missing since |
| commit 1c27df1c0a82 ("iommu/arm-smmu: Use correct address mask |
| for CMD_TLBI_S2_IPA"). Add it back. |
| |
| Fixes: 1c27df1c0a82 ("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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/iommu/arm-smmu-v3.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/iommu/arm-smmu-v3.c |
| +++ b/drivers/iommu/arm-smmu-v3.c |
| @@ -856,6 +856,7 @@ static int arm_smmu_cmdq_build_cmd(u64 * |
| 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; |