Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ebe3151 authored by David Woodhouse's avatar David Woodhouse
Browse files

intel-iommu: Limit DOMAIN_MAX_PFN to fit in an 'unsigned long' 



This means we're limited to 44-bit addresses on 32-bit kernels, and
makes it sane for us to use 'unsigned long' for PFNs throughout.

Which is just as well, really, since we already do that.

Reported-by: default avatarBenjamin LaHaise <ben.lahaise@neterion.com>
Tested-by: default avatarBenjamin LaHaise <ben.lahaise@neterion.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 074835f0

drivers/pci/intel-iommu.c

+8 −2
Original line number Diff line number Diff line
@@ -56,8 +56,14 @@ 


#define MAX_AGAW_WIDTH 64



#define DOMAIN_MAX_ADDR(gaw) ((((u64)1) << gaw) - 1)

#define DOMAIN_MAX_PFN(gaw)  ((((u64)1) << (gaw-VTD_PAGE_SHIFT)) - 1)

#define __DOMAIN_MAX_PFN(gaw)  ((((uint64_t)1) << (gaw-VTD_PAGE_SHIFT)) - 1)

#define __DOMAIN_MAX_ADDR(gaw) ((((uint64_t)1) << gaw) - 1)



/* We limit DOMAIN_MAX_PFN to fit in an unsigned long, and DOMAIN_MAX_ADDR

   to match. That way, we can use 'unsigned long' for PFNs with impunity. */

#define DOMAIN_MAX_PFN(gaw)	((unsigned long) min_t(uint64_t, \

				__DOMAIN_MAX_PFN(gaw), (unsigned long)-1))

#define DOMAIN_MAX_ADDR(gaw)	(((uint64_t)__DOMAIN_MAX_PFN(gaw)) << VTD_PAGE_SHIFT)



#define IOVA_PFN(addr)		((addr) >> PAGE_SHIFT)

#define DMA_32BIT_PFN		IOVA_PFN(DMA_BIT_MASK(32))