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

Commit ddd84602 authored by Mitchel Humpherys's avatar Mitchel Humpherys Committed by David Keitel
Browse files

iommu/arm-smmu: Use the flag value when triggering faults 



iommu_trigger_fault now passes a flag value when triggering faults.  Use
that value instead of hard-coding a translation fault.

Change-Id: Iac9b97cebef99e260641bde70c1ddfaedd0be502
Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
parent 00e29d6f

drivers/iommu/arm-smmu.c

+3 −4
Original line number Diff line number Diff line
@@ -1220,10 +1220,9 @@ static void arm_smmu_trigger_fault(struct iommu_domain *domain, 


	cb_base = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx);

	arm_smmu_enable_clocks(smmu);

	/* trigger a translation fault */

	dev_err(smmu->dev, "Triggering translation fault on cb %d\n",

		cfg->cbndx);

	writel_relaxed(FSR_TF, cb_base + ARM_SMMU_CB_FSRRESTORE);

	dev_err(smmu->dev, "Writing 0x%lx to FSRRESTORE on cb %d\n",

		flags, cfg->cbndx);

	writel_relaxed(flags, cb_base + ARM_SMMU_CB_FSRRESTORE);

	arm_smmu_disable_clocks(smmu);

}