@@ -20,6 +20,7 @@
#define _IOMMU_H_
#include <xen/init.h>
+#include <xen/page-defs.h>
#include <xen/spinlock.h>
#include <xen/pci.h>
#include <public/hvm/ioreq.h>
@@ -37,20 +38,6 @@ extern bool_t amd_iommu_perdev_intremap;
extern unsigned int iommu_dev_iotlb_timeout;
-#define IOMMU_PAGE_SIZE(sz) (1UL << PAGE_SHIFT_##sz)
-#define IOMMU_PAGE_MASK(sz) (~(u64)0 << PAGE_SHIFT_##sz)
-#define IOMMU_PAGE_ALIGN(sz, addr) (((addr) + ~PAGE_MASK_##sz) & PAGE_MASK_##sz)
-
-#define PAGE_SHIFT_4K (12)
-#define PAGE_SIZE_4K IOMMU_PAGE_SIZE(4K)
-#define PAGE_MASK_4K IOMMU_PAGE_MASK(4K)
-#define PAGE_ALIGN_4K(addr) IOMMU_PAGE_ALIGN(4K, addr)
-
-#define PAGE_SHIFT_64K (16)
-#define PAGE_SIZE_64K IOMMU_PAGE_SIZE(64K)
-#define PAGE_MASK_64K IOMMU_PAGE_MASK(64K)
-#define PAGE_ALIGN_64K(addr) IOMMU_PAGE_ALIGN(64K, addr)
-
int iommu_setup(void);
int iommu_add_device(struct pci_dev *pdev);
new file mode 100644
@@ -0,0 +1,24 @@
+#ifndef __XEN_PAGE_DEFS_H__
+#define __XEN_PAGE_DEFS_H__
+
+/* Helpers for different page granularities. */
+#define PAGE_SIZE_GRAN(gran) ((paddr_t)1 << PAGE_SHIFT_##gran)
+#define PAGE_MASK_GRAN(gran) (-PAGE_SIZE_GRAN(gran))
+#define PAGE_ALIGN_GRAN(gran, addr) ((addr + ~PAGE_MASK_##gran) & PAGE_MASK_##gran)
+
+#define PAGE_SHIFT_4K 12
+#define PAGE_SIZE_4K PAGE_SIZE_GRAN(4K)
+#define PAGE_MASK_4K PAGE_MASK_GRAN(4K)
+#define PAGE_ALIGN_4K(addr) PAGE_ALIGN_GRAN(4K, addr)
+
+#define PAGE_SHIFT_16K 14
+#define PAGE_SIZE_16K PAGE_SIZE_GRAN(16K)
+#define PAGE_MASK_16K PAGE_MASK_GRAN(16K)
+#define PAGE_ALIGN_16K(addr) PAGE_ALIGN_GRAN(16K, addr)
+
+#define PAGE_SHIFT_64K 16
+#define PAGE_SIZE_64K PAGE_SIZE_GRAN(64K)
+#define PAGE_MASK_64K PAGE_MASK_GRAN(64K)
+#define PAGE_ALIGN_64K(addr) PAGE_ALIGN_GRAN(64K, addr)
+
+#endif /* __XEN_PAGE_DEFS_H__ */
The following commits introduce a software guest page table walk software implementation that supports varying guest page size granularities. This commit moves already existing PAGE_(SHIFT|SIZE|MASK|ALIGN)_(4K|64K) and introduces corresponding defines for 16K page granularity to a common place in xen/page-defs.h as to allow the following commits to use the consolidated defines. Signed-off-by: Sergej Proskurin <proskurin@sec.in.tum.de> --- Cc: Andrew Cooper <andrew.cooper3@citrix.com> Cc: George Dunlap <George.Dunlap@eu.citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Jan Beulich <jbeulich@suse.com> Cc: Julien Grall <julien.grall@arm.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Tim Deegan <tim@xen.org> Cc: Wei Liu <wei.liu2@citrix.com> --- v6: Move in addition to PAGE_SHIFT_* also PAGE_(SIZE|MASK|ALIGN)_(4K|64K) macros and introduce the corresponding macros for 16K. Also, move the macros mentioned above into xen/page-defs.h instead of xen/lib.h. v7: Use the type paddr_t for PAGE_SIZE_GRAN instead of UL as it was used before. Also, use PAGE_SIZE_GRAN to define PAGE_MASK_GRAN and thus avoid these defines to have a differing type. Remove unnecessary parenthesis. --- xen/include/xen/iommu.h | 15 +-------------- xen/include/xen/page-defs.h | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 xen/include/xen/page-defs.h