Commit 5cb0a4bd authored Mar 08, 2019 by Charan Teja Reddy Committed by Gerrit - the friendly Code Review server May 09, 2019

iommu: arm-smmu: place print_ctx_regs properly



print_ctx_regs() is getting called after doing the ecats operations and
thus some debug info registers like fsr, fsynr will get override and
thus represents the ecats transaction rather than the real client
transaction. As an example, say faulty transaction from real client is
write but the ecats operation is always going to be read and accordingly
fsr updates.

Change-Id: I634691e68b7c800c5a6d32ffdadf9ab2b1bbffd9
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>

parent d0c6096b

drivers/iommu/arm-smmu.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1550,15 +1550,14 @@ static irqreturn_t arm_smmu_context_fault(int irq, void *dev)
		resume = RESUME_TERMINATE;
		} else {
		if (__ratelimit(&_rs)) {
		phys_addr_t phys_atos = arm_smmu_verify_fault(domain,
		iova,
		fsr);
		phys_addr_t phys_atos;

		print_ctx_regs(smmu, cfg, fsr);
		phys_atos = arm_smmu_verify_fault(domain, iova, fsr);
		dev_err(smmu->dev,
		"Unhandled context fault: iova=0x%08lx, cb=%d, fsr=0x%x, fsynr0=0x%x, fsynr1=0x%x\n",
		iova, cfg->cbndx, fsr, fsynr0, fsynr1);

		print_ctx_regs(smmu, cfg, fsr);

		dev_err(smmu->dev,
		"soft iova-to-phys=%pa\n", &phys_soft);