From 6408533e2a05f8d34e07a3d49d72394b76a20387 Mon Sep 17 00:00:00 2001 From: Shrenuj Bansal Date: Fri, 18 Sep 2015 14:59:09 -0700 Subject: [PATCH] iommu/arm-smmu: Always set resume to terminate the transaction When using the client fault handler, set resume to terminate the faulting transaction similar to the way of the default fault handler. Its possible that if the client fault handler doesn't "fully" handle the fault, there would be a stream of page faults on the same address since we would keep on retrying the same transaction. Change-Id: Id7aa439fd90aa5b63364c8ac270593330c55d672 Signed-off-by: Shrenuj Bansal --- 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 267886a9cc62..f4fc6f951648 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1147,7 +1147,7 @@ static irqreturn_t arm_smmu_context_fault(int irq, void *dev) dev_dbg(smmu->dev, "soft iova-to-phys=%pa\n", &phys_soft); ret = IRQ_HANDLED; - resume = ctx_hang_errata ? RESUME_TERMINATE : RESUME_RETRY; + resume = RESUME_TERMINATE; } else { phys_addr_t phys_atos = arm_smmu_verify_fault(domain, iova, fsr); -- 2.11.0