Commit 33403edb authored by Kunkun Jiang's avatar Kunkun Jiang Committed by Zheng Zengkai
Browse files

Revert "iommu/io-pgtable-arm: Remove the limitation on the page table format... 

Revert "iommu/io-pgtable-arm: Remove the limitation on the page table format of sync/clear_dirty_log()"

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


CVE: NA

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

This reverts commit 21d56f9c.

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 6505a329

drivers/iommu/io-pgtable-arm.c

+8 −0
Original line number Diff line number Diff line
@@ -980,6 +980,10 @@ static int arm_lpae_sync_dirty_log(struct io_pgtable_ops *ops, 
	if (WARN_ON(iaext))

		return -EINVAL;



	if (data->iop.fmt != ARM_64_LPAE_S1 &&

	    data->iop.fmt != ARM_32_LPAE_S1)

		return -EINVAL;



	return __arm_lpae_sync_dirty_log(data, iova, size, lvl, ptep,

					 bitmap, base_iova, bitmap_pgshift);

}
@@ -1072,6 +1076,10 @@ static int arm_lpae_clear_dirty_log(struct io_pgtable_ops *ops, 
	if (WARN_ON(iaext))

		return -EINVAL;



	if (data->iop.fmt != ARM_64_LPAE_S1 &&

	    data->iop.fmt != ARM_32_LPAE_S1)

		return -EINVAL;



	return __arm_lpae_clear_dirty_log(data, iova, size, lvl, ptep,

			bitmap, base_iova, bitmap_pgshift);

}