From: Greg Kroah-Hartman Date: Mon, 19 Nov 2018 15:22:26 +0000 (+0100) Subject: 4.18-stable patches X-Git-Tag: v4.19.3~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a3ade5a600014a32c5790b57d18e84e0493b74e;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..9f727f00480 --- /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 +Date: Wed, 31 Oct 2018 16:11:49 -0700 +Subject: CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM + +From: Stefano Stabellini + +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: # 4.12 +Fixes: 16624390816c ("xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds") +Signed-off-by: Stefano Stabellini +Reviewed-by: Juergen Gross +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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 7ea40359132..4dd48e54c43 100644 --- 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