Module Name: src
Committed By: bouyer
Date: Mon Apr 20 19:40:24 UTC 2020
Modified Files:
src/sys/arch/xen/conf [bouyer-xenpvh]: files.xen files.xen.pv
src/sys/arch/xen/x86 [bouyer-xenpvh]: xen_bus_dma.c
Log Message:
We need xenbus_bus_dma_tag for PVHVM too, but without phys->machine translation
To generate a diff of this commit:
cvs rdiff -u -r1.180.2.5 -r1.180.2.6 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/xen/conf/files.xen.pv
cvs rdiff -u -r1.28.10.1 -r1.28.10.2 src/sys/arch/xen/x86/xen_bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.180.2.5 src/sys/arch/xen/conf/files.xen:1.180.2.6
--- src/sys/arch/xen/conf/files.xen:1.180.2.5 Sun Apr 19 20:29:30 2020
+++ src/sys/arch/xen/conf/files.xen Mon Apr 20 19:40:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.180.2.5 2020/04/19 20:29:30 bouyer Exp $
+# $NetBSD: files.xen,v 1.180.2.6 2020/04/20 19:40:24 bouyer Exp $
defflag opt_xen.h XEN XENPVH XENPVHVM
@@ -9,6 +9,7 @@ file arch/xen/xen/evtchn.c xen
file arch/xen/xen/xengnt.c xen
file arch/xen/x86/xen_mainbus.c xen
file arch/xen/xen/xen_clock.c xen
+file arch/xen/x86/xen_bus_dma.c xen
define hypervisorbus {}
define xendevbus {}
Index: src/sys/arch/xen/conf/files.xen.pv
diff -u src/sys/arch/xen/conf/files.xen.pv:1.1.2.3 src/sys/arch/xen/conf/files.xen.pv:1.1.2.4
--- src/sys/arch/xen/conf/files.xen.pv:1.1.2.3 Sun Apr 19 20:29:30 2020
+++ src/sys/arch/xen/conf/files.xen.pv Mon Apr 20 19:40:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen.pv,v 1.1.2.3 2020/04/19 20:29:30 bouyer Exp $
+# $NetBSD: files.xen.pv,v 1.1.2.4 2020/04/20 19:40:24 bouyer Exp $
file arch/xen/x86/autoconf.c xenpv
file arch/xen/x86/x86_xpmap.c xenpv
@@ -6,7 +6,6 @@ file arch/xen/x86/xen_pmap.c xenpv
file arch/xen/x86/xenfunc.c xenpv
file arch/xen/xen/xen_acpi_machdep.c acpi & xenpv
-file arch/xen/x86/xen_bus_dma.c machdep & xenpv
file arch/xen/x86/consinit.c machdep & xenpv
file arch/xen/x86/pintr.c machdep & dom0ops & xenpv
Index: src/sys/arch/xen/x86/xen_bus_dma.c
diff -u src/sys/arch/xen/x86/xen_bus_dma.c:1.28.10.1 src/sys/arch/xen/x86/xen_bus_dma.c:1.28.10.2
--- src/sys/arch/xen/x86/xen_bus_dma.c:1.28.10.1 Mon Apr 20 11:29:01 2020
+++ src/sys/arch/xen/x86/xen_bus_dma.c Mon Apr 20 19:40:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_bus_dma.c,v 1.28.10.1 2020/04/20 11:29:01 bouyer Exp $ */
+/* $NetBSD: xen_bus_dma.c,v 1.28.10.2 2020/04/20 19:40:23 bouyer Exp $ */
/* NetBSD bus_dma.c,v 1.21 2005/04/16 07:53:35 yamt Exp */
/*-
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.28.10.1 2020/04/20 11:29:01 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.28.10.2 2020/04/20 19:40:23 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.
#include <uvm/uvm.h>
-extern paddr_t avail_end;
+#include "opt_xen.h"
/* No special needs */
struct x86_bus_dma_tag xenbus_bus_dma_tag = {
@@ -56,6 +56,10 @@ struct x86_bus_dma_tag xenbus_bus_dma_ta
._may_bounce = NULL,
};
+#ifdef XENPV
+
+extern paddr_t avail_end;
+
/* Pure 2^n version of get_order */
static inline int get_order(unsigned long size)
{
@@ -318,3 +322,4 @@ dorealloc:
return error;
goto again;
}
+#endif /* XENPV */
