Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfd6f43c authored by Vijayanand Jitta's avatar Vijayanand Jitta Committed by Prakash Gupta
Browse files

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: default avatarVijayanand Jitta <vjitta@codeaurora.org>
[guptap@codeaurora.org: Resolved trivial merge conflict]
Signed-off-by: default avatarPrakash Gupta <guptap@codeaurora.org>
parent 37d0a368

drivers/iommu/arm-smmu-qcom.c

+3 −3
Original line number Diff line number Diff line
@@ -592,15 +592,15 @@ static phys_addr_t qsmmuv500_iova_to_phys( 
	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;