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

Commit 9d878838 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/arm-smmu: Always set resume to terminate the transaction"

parents e72979c3 7bf7bf8d

drivers/iommu/arm-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1140,7 +1140,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);