From cfd6f43cdbf8e0c05c454ae755771a0d98b2c817 Mon Sep 17 00:00:00 2001 From: Vijayanand Jitta Date: Fri, 13 Mar 2020 13:27:30 +0530 Subject: [PATCH] iommu/arm-smmu: Fix transaction flags in qsmmuv500_iova_to_phys While performing ecats in qsmmuv500_iova_to_phys, transaction flags are incorrectly set using flag variable instead of trans_flags variable. Fix this. Fixes: efa31e1dd437 ("iommu/arm-smmu: replicate faulty transaction") Change-Id: Ia8f46708e717a91c0d10a66cd53ed7298068f664 Signed-off-by: Vijayanand Jitta [guptap@codeaurora.org: Resolved trivial merge conflict] Signed-off-by: Prakash Gupta --- drivers/iommu/arm-smmu-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/arm-smmu-qcom.c b/drivers/iommu/arm-smmu-qcom.c index 4abd434f9dee..4a275cd15b10 100644 --- a/drivers/iommu/arm-smmu-qcom.c +++ b/drivers/iommu/arm-smmu-qcom.c @@ -592,15 +592,15 @@ redo: val |= FIELD_PREP(DEBUG_TXN_AXPROT, DEBUG_TXN_AXPROT_NSEC); /* Write or Read Access */ - if (flags & IOMMU_TRANS_WRITE) + if (trans_flags & IOMMU_TRANS_WRITE) val |= DEBUG_TXN_WRITE; /* Priviledged or Unpriviledged Access */ - if (flags & IOMMU_TRANS_PRIV) + if (trans_flags & IOMMU_TRANS_PRIV) val |= FIELD_PREP(DEBUG_TXN_AXPROT, DEBUG_TXN_AXPROT_PRIV); /* Data or Instruction Access */ - if (flags & IOMMU_TRANS_INST) + if (trans_flags & IOMMU_TRANS_INST) val |= FIELD_PREP(DEBUG_TXN_AXPROT, DEBUG_TXN_AXPROT_INST); val |= DEBUG_TXN_TRIGGER;