[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20181119162633.797817212@linuxfoundation.org>
Date: Mon, 19 Nov 2018 17:29:34 +0100
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Stefano Stabellini <stefanos@...inx.com>,
Juergen Gross <jgross@...e.com>, Jeff.Kubascik@...nerworks.com,
Jarvis.Roach@...nerworks.com, Nathan.Studer@...nerworks.com,
vkuznets@...hat.com, boris.ostrovsky@...cle.com,
julien.grall@....com
Subject: [PATCH 4.14 120/124] CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefano Stabellini <stefanos@...inx.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@...r.kernel.org> # 4.12
Fixes: 16624390816c ("xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds")
Signed-off-by: Stefano Stabellini <stefanos@...inx.com>
Reviewed-by: Juergen Gross <jgross@...e.com>
CC: Jeff.Kubascik@...nerworks.com
CC: Jarvis.Roach@...nerworks.com
CC: Nathan.Studer@...nerworks.com
CC: vkuznets@...hat.com
CC: boris.ostrovsky@...cle.com
CC: jgross@...e.com
CC: julien.grall@....com
Signed-off-by: Juergen Gross <jgross@...e.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.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
@@ -40,7 +40,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);
Powered by blists - more mailing lists