Unverified Commit 6773fc4b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3269 iommu/arm-smmu-v3: disable stall for quiet_cd 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Jun <chenjun102@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6MF7TX3COS5NDGZDJJT6QF5EX7KYXY2T/ 
 
https://gitee.com/openeuler/kernel/issues/I8MCHF 
 
Link:https://gitee.com/openeuler/kernel/pulls/3269

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents d772518d dc65d1d0

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

+2 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,8 @@ int arm_smmu_write_ctx_desc(struct arm_smmu_domain *smmu_domain, int ssid, 
	if (!cd) { /* (5) */

		val = 0;

	} else if (cd == &quiet_cd) { /* (4) */

		if (!(smmu->features & ARM_SMMU_FEAT_STALL_FORCE))

			val &= ~(CTXDESC_CD_0_S | CTXDESC_CD_0_R);

		val |= CTXDESC_CD_0_TCR_EPD0;

	} else if (cd_live) { /* (3) */

		val &= ~CTXDESC_CD_0_ASID;