Merge "iommu/arm-smmu: take ECATS lock before halting TBU" (6fb6012c) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/iommu/arm-smmu.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -5568,10 +5568,15 @@ static phys_addr_t qsmmuv500_iova_to_phys(
		if (ret)
		return 0;

		ret = qsmmuv500_tbu_halt(tbu, smmu_domain);
		/* Only one concurrent atos operation */
		ret = qsmmuv500_ecats_lock(smmu_domain, tbu, &flags);
		if (ret)
		goto out_power_off;

		ret = qsmmuv500_tbu_halt(tbu, smmu_domain);
		if (ret)
		goto out_ecats_unlock;

		/*
		* ECATS can trigger the fault interrupt, so disable it temporarily
		* and check for an interrupt manually.
		@@ -5599,11 +5604,6 @@ static phys_addr_t qsmmuv500_iova_to_phys(
		ARM_SMMU_CB_RESUME);
		}

		/* Only one concurrent atos operation */
		ret = qsmmuv500_ecats_lock(smmu_domain, tbu, &flags);
		if (ret)
		goto out_resume;

		redo:
		/* Set address and stream-id */
		val = readq_relaxed(tbu->base + DEBUG_SID_HALT_REG);
		@@ -5683,11 +5683,11 @@ static phys_addr_t qsmmuv500_iova_to_phys(
		goto redo;

		writel_relaxed(sctlr_orig, cb_base + ARM_SMMU_CB_SCTLR);
		qsmmuv500_ecats_unlock(smmu_domain, tbu, &flags);

		out_resume:
		qsmmuv500_tbu_resume(tbu);

		out_ecats_unlock:
		qsmmuv500_ecats_unlock(smmu_domain, tbu, &flags);

		out_power_off:
		/* Read to complete prior write transcations */
		val = readl_relaxed(tbu->base + DEBUG_SR_HALT_ACK_REG);