From 87884961d72de28073ba96ac7d2dba8562320bb3 Mon Sep 17 00:00:00 2001 From: Charan Teja Reddy Date: Fri, 13 Jan 2017 18:23:21 +0530 Subject: [PATCH] iommu: interchange the vmid order passed to hyp_assign Interchange the VMID order passed to the function hyp_assign_phys as secure CP clients expects it. Change-Id: Ie2c1b8825b5272e82a14401dbc45b77ebb277048 Signed-off-by: Charan Teja Reddy --- drivers/iommu/arm-smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 03a691723349..51159711b1d8 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -2451,7 +2451,7 @@ static void arm_smmu_unassign_table(struct arm_smmu_domain *smmu_domain) int ret; int dest_vmids = VMID_HLOS; int dest_perms = PERM_READ | PERM_WRITE | PERM_EXEC; - int source_vmlist[2] = {VMID_HLOS, smmu_domain->secure_vmid}; + int source_vmlist[2] = {smmu_domain->secure_vmid, VMID_HLOS}; struct arm_smmu_pte_info *pte_info, *temp; if (!arm_smmu_is_master_side_secure(smmu_domain))