diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index 0969224aff7b5c01e53c10e4b3fda9b984645171..34f6366dcc6c54bb1dfad0881531fdd175b8b7cc 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -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);
 }