Commit 8218cb5d authored by Kunkun Jiang's avatar Kunkun Jiang Committed by Zheng Zengkai
Browse files

Revert "iommu/smmuv3: Remove the S1 mapping restriction of dirty log" 

virt inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I61SPO


CVE: NA

--------------------------------

This reverts commit b22a06ea.

Signed-off-by: default avatarKunkun Jiang <jiangkunkun@huawei.com>
Reviewed-by: default avatarKeqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 21a0d4fe

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

+3 −3
Original line number Diff line number Diff line
@@ -3534,7 +3534,7 @@ static int arm_smmu_switch_dirty_log(struct iommu_domain *domain, bool enable, 


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

		return -ENODEV;

	if (smmu_domain->stage == ARM_SMMU_DOMAIN_BYPASS)

	if (smmu_domain->stage != ARM_SMMU_DOMAIN_S1)

		return -EINVAL;



	if (enable) {
@@ -3575,7 +3575,7 @@ static int arm_smmu_sync_dirty_log(struct iommu_domain *domain, 


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

		return -ENODEV;

	if (smmu_domain->stage == ARM_SMMU_DOMAIN_BYPASS)

	if (smmu_domain->stage != ARM_SMMU_DOMAIN_S1)

		return -EINVAL;



	if (!ops || !ops->sync_dirty_log) {
@@ -3604,7 +3604,7 @@ static int arm_smmu_clear_dirty_log(struct iommu_domain *domain, 


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

		return -ENODEV;

	if (smmu_domain->stage == ARM_SMMU_DOMAIN_BYPASS)

	if (smmu_domain->stage != ARM_SMMU_DOMAIN_S1)

		return -EINVAL;



	if (!ops || !ops->clear_dirty_log) {