Unverified Commit 6e2603a8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5360 iommu/arm-smmu-v3: Disable ECMDQ before reset 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Wensheng <wangwensheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6ATDODEPGGWGQNEDTXTAP4GZZKJXKKUB/ 
 
https://gitee.com/openeuler/kernel/issues/I97CSY 
 
Link:https://gitee.com/openeuler/kernel/pulls/5360

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 604f6630 234a7db2

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+13 −0
Original line number Diff line number Diff line
@@ -4606,6 +4606,19 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool resume) 
		ecmdq = *per_cpu_ptr(smmu->ecmdq, i);

		q = &ecmdq->cmdq.q;



		reg = readl(q->prod_reg);

		if (reg & ECMDQ_PROD_EN) {

			/* disable ecmdq */

			writel(reg & ~ECMDQ_PROD_EN, q->prod_reg);

			ret = readl_relaxed_poll_timeout(q->cons_reg, reg,

				!(reg & ECMDQ_CONS_ENACK), 1, ARM_SMMU_POLL_TIMEOUT_US);

			if (ret) {

				dev_warn(smmu->dev, "ecmdq[%d] disable failed\n", i);

				smmu->ecmdq_enabled = 0;

				break;

			}

		}



		if (WARN_ON(q->llq.prod != q->llq.cons)) {

			q->llq.prod = 0;

			q->llq.cons = 0;