X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=drivers%2Fiommu%2Fio-pgtable-arm.c;h=f5c90e1366ce030249d1ae6d392762c6ea1834ef;hb=81abf2525827b29839a78fd55ab0699f033c41a5;hp=a1ed1b73fed49f11259a635a786859b6bb44c523;hpb=643d09f4618196d05ecf9b6987c890280ffac9d8;p=mirror_ubuntu-artful-kernel.git

diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index a1ed1b73fed4..f5c90e1366ce 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -576,7 +576,7 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
 	return 0;
 
 found_translation:
-	iova &= (ARM_LPAE_GRANULE(data) - 1);
+	iova &= (ARM_LPAE_BLOCK_SIZE(lvl, data) - 1);
 	return ((phys_addr_t)iopte_to_pfn(pte,data) << data->pg_shift) | iova;
 }