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

Commit 60c00665 authored by Prakash Gupta's avatar Prakash Gupta Committed by Isaac J. Manjarres
Browse files

iommu/arm-smmu: fix stale fault reporting in ecats operation 



If FSR is not cleared before starting ECATS operation, non-zero FSR cause
successful ECATS operation to be reported as failed. Also, resume any
faulting transcation before halting TBU.

Change-Id: I46955d0a75660fbbee09468140301ab9b10a699e
Signed-off-by: default avatarPrakash Gupta <guptap@codeaurora.org>
[isaacm@codeaurora.org: resolve merge conflicts]
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parent 915d2b2e

drivers/iommu/arm-smmu.c

+55 −39
Original line number Diff line number Diff line
@@ -4958,10 +4958,10 @@ static int qsmmuv500_tbu_halt(struct qsmmuv500_tbu_device *tbu, 
				struct arm_smmu_domain *smmu_domain)

{

	unsigned long flags;

	u32 halt, fsr, sctlr_orig, sctlr, status;

	void __iomem *base;

	struct arm_smmu_device *smmu = smmu_domain->smmu;

	int idx = smmu_domain->cfg.cbndx;

	u32 halt, fsr, status;

	void __iomem *tbu_base;



	if (of_property_read_bool(tbu->dev->of_node,

						"qcom,opt-out-tbu-halting")) {
@@ -4976,47 +4976,44 @@ static int qsmmuv500_tbu_halt(struct qsmmuv500_tbu_device *tbu, 
		return 0;

	}



	base = tbu->base;

	halt = readl_relaxed(base + DEBUG_SID_HALT_REG);

	tbu_base = tbu->base;

	halt = readl_relaxed(tbu_base + DEBUG_SID_HALT_REG);

	halt |= DEBUG_SID_HALT_REQ;

	writel_relaxed(halt, base + DEBUG_SID_HALT_REG);



	if (!readl_poll_timeout_atomic(base + DEBUG_SR_HALT_ACK_REG, status,

					(status & DEBUG_SR_HALT_ACK_VAL),

					0, TBU_DBG_TIMEOUT_US))

		goto out;

	writel_relaxed(halt, tbu_base + DEBUG_SID_HALT_REG);



	fsr = arm_smmu_cb_read(smmu, idx, ARM_SMMU_CB_FSR);

	if (!(fsr & FSR_FAULT)) {

		dev_err(tbu->dev, "Couldn't halt TBU!\n");

		spin_unlock_irqrestore(&tbu->halt_lock, flags);

		return -ETIMEDOUT;

	}



	if ((fsr & FSR_FAULT) && (fsr & FSR_SS)) {

		u32 sctlr_orig, sctlr;

		/*

	 * We are in a fault; Our request to halt the bus will not complete

	 * until transactions in front of us (such as the fault itself) have

	 * completed. Disable iommu faults and terminate any existing

	 * transactions.

		 * We are in a fault; Our request to halt the bus will not

		 * complete until transactions in front of us (such as the fault

		 * itself) have completed. Disable iommu faults and terminate

		 * any existing transactions.

		 */

		sctlr_orig = arm_smmu_cb_read(smmu, idx, ARM_SMMU_CB_SCTLR);

		sctlr = sctlr_orig & ~(SCTLR_CFCFG | SCTLR_CFIE);

		arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_SCTLR, sctlr);



		arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_FSR, fsr);

	arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_RESUME, RESUME_TERMINATE);

		/*

		 * Barrier required to ensure that the FSR is cleared

		 * before resuming SMMU operation

		 */

		wmb();

		arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_RESUME,

				  RESUME_TERMINATE);



	if (readl_poll_timeout_atomic(base + DEBUG_SR_HALT_ACK_REG, status,

		arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_SCTLR, sctlr_orig);

	}



	if (readl_poll_timeout_atomic(tbu_base + DEBUG_SR_HALT_ACK_REG, status,

					(status & DEBUG_SR_HALT_ACK_VAL),

					0, TBU_DBG_TIMEOUT_US)) {

		dev_err(tbu->dev, "Couldn't halt TBU from fault context!\n");

		arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_SCTLR, sctlr_orig);

		dev_err(tbu->dev, "Couldn't halt TBU!\n");

		spin_unlock_irqrestore(&tbu->halt_lock, flags);

		return -ETIMEDOUT;

	}



	arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_SCTLR, sctlr_orig);

out:

	tbu->halt_count = 1;

	spin_unlock_irqrestore(&tbu->halt_lock, flags);

	return 0;
@@ -5146,6 +5143,25 @@ static phys_addr_t qsmmuv500_iova_to_phys( 
	sctlr = sctlr_orig & ~(SCTLR_CFCFG | SCTLR_CFIE);

	arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_SCTLR, sctlr);



	fsr = arm_smmu_cb_read(smmu, idx, ARM_SMMU_CB_FSR);

	if (fsr & FSR_FAULT) {

		/* Clear pending interrupts */

		arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_FSR, fsr);

		/*

		 * Barrier required to ensure that the FSR is cleared

		 * before resuming SMMU operation.

		 */

		wmb();



		/*

		 * TBU halt takes care of resuming any stalled transcation.

		 * Kept it here for completeness sake.

		 */

		if (fsr & FSR_SS)

			arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_RESUME,

					  RESUME_TERMINATE);

	}



	/* Only one concurrent atos operation */

	ret = qsmmuv500_ecats_lock(smmu_domain, tbu, &flags);

	if (ret)
@@ -5189,10 +5205,12 @@ static phys_addr_t qsmmuv500_iova_to_phys( 


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

	fsr = arm_smmu_cb_read(smmu, idx, ARM_SMMU_CB_FSR);

	if (fsr & FSR_FAULT) {

	if (val & DEBUG_PAR_FAULT_VAL) {

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

			fsr, sid);



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

			val);

		/* Clear pending interrupts */

		arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_FSR, fsr);

		/*
@@ -5200,13 +5218,11 @@ static phys_addr_t qsmmuv500_iova_to_phys( 
		 * before resuming SMMU operation.

		 */

		wmb();



		if (fsr & FSR_SS)

			arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_RESUME,

					  RESUME_TERMINATE);



		/* Check if ECATS translation failed */

		if (val & DEBUG_PAR_FAULT_VAL)

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

					val);

		ret = -EINVAL;

	}