CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM (f9005571) · Commits · 戴 / test

xen_create_contiguous_region has now only an implementation if CONFIG_XEN_PV is defined. However, on ARM we never set CONFIG_XEN_PV but we do have an implementation of xen_create_contiguous_region which is required for swiotlb-xen to work correctly (although it just sets *dma_handle). Cc: <stable@vger.kernel.org> # 4.12 Fixes: ("xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds") Signed-off-by:

Stefano Stabellini <stefanos@xilinx.com> Reviewed-by:

Juergen Gross <jgross@suse.com> CC: Jeff.Kubascik@dornerworks.com CC: Jarvis.Roach@dornerworks.com CC: Nathan.Studer@dornerworks.com CC: vkuznets@redhat.com CC: boris.ostrovsky@oracle.com CC: jgross@suse.com CC: julien.grall@arm.com Signed-off-by:

Juergen Gross <jgross@suse.com>

include/xen/xen-ops.h

+7 −5

Original line number	Diff line number	Diff line
		@@ -42,16 +42,12 @@ int xen_setup_shutdown_event(void);

		extern unsigned long *xen_contiguous_bitmap;

		#ifdef CONFIG_XEN_PV
		#if defined(CONFIG_XEN_PV) \|\| defined(CONFIG_ARM) \|\| defined(CONFIG_ARM64)
		int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order,
		unsigned int address_bits,
		dma_addr_t *dma_handle);

		void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order);

		int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
		xen_pfn_t pfn, int nr, int err_ptr, pgprot_t prot,
		unsigned int domid, bool no_translate, struct page **pages);
		#else
		static inline int xen_create_contiguous_region(phys_addr_t pstart,
		unsigned int order,
		@@ -63,7 +59,13 @@ static inline int xen_create_contiguous_region(phys_addr_t pstart,

		static inline void xen_destroy_contiguous_region(phys_addr_t pstart,
		unsigned int order) { }
		#endif

		#if defined(CONFIG_XEN_PV)
		int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
		xen_pfn_t pfn, int nr, int err_ptr, pgprot_t prot,
		unsigned int domid, bool no_translate, struct page **pages);
		#else
		static inline int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
		xen_pfn_t pfn, int nr, int err_ptr,
		pgprot_t prot, unsigned int domid,

Admin message