move PAGE_*_* macros to xen/page-defs.h

Move pre-existing PAGE_(SHIFT|SIZE|MASK|ALIGN)_(4K|64K) and
introduce corresponding defines for 16K page granularity to/in a
common place in xen/page-defs.h to allow later commits to use the
consolidated defines.
Signed-off-by: Sergej Proskurin <proskurin@sec.in.tum.de>
Acked-by: Jan Beulich <jbeulich@suse.com>

xen/include/xen/iommu.h

@@ -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_domain_init(struct domain *d);

xen/include/xen/page-defs.h

+#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__ */