Merge "iommu: arm-smmu: place print_ctx_regs properly" (b8619c9f) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/iommu/arm-smmu.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1552,15 +1552,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);