On Sun, 11 Nov 2018, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> The patch below does not apply to the 4.19-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@xxxxxxxxxxxxxxx>.
Hi Greg,
The following patch applies to 4.19, 4.18 and 4.14. I just had to remove
the change to xen_remap_pfn.
I can resend separately if you prefer.
Cheers,
Stefano
---
>From f9005571701920551bcf54a500973fb61f2e1eda Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <sstabellini@xxxxxxxxxx>
Date: Mon, 12 Nov 2018 09:49:11 -0800
Subject: [PATCH] CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM
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@xxxxxxxxxxxxxxx> # 4.12
Fixes: 16624390816c ("xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds")
Signed-off-by: Stefano Stabellini <stefanos@xxxxxxxxxx>
Reviewed-by: Juergen Gross <jgross@xxxxxxxx>
CC: Jeff.Kubascik@xxxxxxxxxxxxxxx
CC: Jarvis.Roach@xxxxxxxxxxxxxxx
CC: Nathan.Studer@xxxxxxxxxxxxxxx
CC: vkuznets@xxxxxxxxxx
CC: boris.ostrovsky@xxxxxxxxxx
CC: jgross@xxxxxxxx
CC: julien.grall@xxxxxxx
Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
---
include/xen/xen-ops.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index fd18c97..f6e798d 100644
--- 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);
--
2.7.4
