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

Commit d384058f authored by Sudarshan Rajagopalan's avatar Sudarshan Rajagopalan
Browse files

iommu: arm-smmu: Implement eCATS translation fault errata workaround 



Currently due to hardware issue, eCATS reports a false positive
translation fault error. Instead of relying on eCATS fault status,
check the context bank specific Fault Status Register (FSR) for
translation faults.

Change-Id: I1920b69404b8bc2d10f84c6a4f4e30977fff45ab
Signed-off-by: default avatarSudarshan Rajagopalan <sudaraja@codeaurora.org>
parent 1ab48c37

drivers/iommu/arm-smmu.c

+10 −12
Original line number Diff line number Diff line
@@ -4654,7 +4654,7 @@ static phys_addr_t qsmmuv500_iova_to_phys( 
	struct arm_smmu_cfg *cfg = &smmu_domain->cfg;

	struct qsmmuv500_tbu_device *tbu;

	int ret;

	phys_addr_t phys = 0;

	phys_addr_t phys;

	u64 val, fsr;

	unsigned long flags;

	void __iomem *cb_base;
@@ -4713,7 +4713,6 @@ static phys_addr_t qsmmuv500_iova_to_phys( 
	writeq_relaxed(val, tbu->base + DEBUG_TXN_TRIGG_REG);



	ret = 0;

	//based on readx_poll_timeout_atomic

	timeout = ktime_add_us(ktime_get(), TBU_DBG_TIMEOUT_US);

	for (;;) {

		val = readl_relaxed(tbu->base + DEBUG_SR_HALT_ACK_REG);
@@ -4729,24 +4728,23 @@ static phys_addr_t qsmmuv500_iova_to_phys( 
		}

	}



	val = readq_relaxed(tbu->base + DEBUG_PAR_REG);

	fsr = readl_relaxed(cb_base + ARM_SMMU_CB_FSR);

	if (fsr & FSR_FAULT) {

		dev_err(tbu->dev, "ECATS generated a fault interrupt! FSR = %llx\n",

				fsr);

		ret = -EINVAL;



		writel_relaxed(val, cb_base + ARM_SMMU_CB_FSR);

		/* Clear pending interrupts */

		writel_relaxed(fsr, cb_base + ARM_SMMU_CB_FSR);

		/*

		 * Clear pending interrupts

		 * Barrier required to ensure that the FSR is cleared

		 * before resuming SMMU operation

		 * before resuming SMMU operation.

		 */

		wmb();

		writel_relaxed(RESUME_TERMINATE, cb_base + ARM_SMMU_CB_RESUME);

	}



	val = readq_relaxed(tbu->base + DEBUG_PAR_REG);

	if (val & DEBUG_PAR_FAULT_VAL) {

		/* Check if ECATS translation failed */

		if (val & DEBUG_PAR_FAULT_VAL)

			dev_err(tbu->dev, "ECATS translation failed! PAR = %llx\n",

					val);

		ret = -EINVAL;