4.18-stable patches

added patches:
	config_xen_pv-breaks-xen_create_contiguous_region-on-arm.patch

diff --git a/queue-4.18/config_xen_pv-breaks-xen_create_contiguous_region-on-arm.patch b/queue-4.18/config_xen_pv-breaks-xen_create_contiguous_region-on-arm.patch
new file mode 100644 (file)
index 0000000..9f727f0
--- /dev/null
+++ b/queue-4.18/config_xen_pv-breaks-xen_create_contiguous_region-on-arm.patch
@@ -0,0 +1,45 @@
+From f9005571701920551bcf54a500973fb61f2e1eda Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefanos@xilinx.com>
+Date: Wed, 31 Oct 2018 16:11:49 -0700
+Subject: CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM
+
+From: Stefano Stabellini <stefanos@xilinx.com>
+
+commit f9005571701920551bcf54a500973fb61f2e1eda upstream.
+
+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).
+
+[backport: remove change to xen_remap_pfn]
+
+Cc: <stable@vger.kernel.org> # 4.12
+Fixes: 16624390816c ("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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/xen/xen-ops.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/xen/xen-ops.h
++++ b/include/xen/xen-ops.h
+@@ -41,7 +41,7 @@ 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);

diff --git a/queue-4.18/series b/queue-4.18/series
index 7ea4035913260e438ee1fe75f2c0f444f4711977..4dd48e54c435f023983ef384db9c9a1059daaa09 100644 (file)
--- a/queue-4.18/series
+++ b/queue-4.18/series
@@ -168,3 +168,4 @@ drm-i915-mark-pin-flags-as-u64.patch
 drm-i915-ringbuffer-delay-after-emit_invalidate-for-gen4-gen5.patch
 drm-i915-execlists-force-write-serialisation-into-context-image-vs-execution.patch
 drm-i915-fix-possible-race-in-intel_dp_add_mst_connector.patch
+config_xen_pv-breaks-xen_create_contiguous_region-on-arm.patch