Module Name: src
Committed By: cherry
Date: Sat Feb 2 12:05:09 UTC 2019
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0
Log Message:
Summary: Disable ixg(4) until the linuxist mb() API re-definition
within the XEN amd64 dom0 build is resolved.
Detail:
The xen public headers >= 0x00030201 depend on a linuxism - a memory
barrier "API" namely mb(), rmb() and wmb(). These are made accessible
to NetBSD code via the interface
sys/external/bsd/common/include/asm/barrier.h
Currently the ixg(4) driver uses an identical API by defining them
(incorrectly) to inline assembler macro definitions in
sys/dev/pci/ixgbe/ixgbe_osdep.h
This will result in the dom0 builds failing to build due to this
redefinition of the macros. We therefore disable the driver in
NetBSD/amd64 dom0 in order to facilitate smoothly moving the XEN
kernel builds to the new XEN source level API (RELEASE-4.11.1).
The fix for this is trivial, but needs the attention of the driver
maintainer.
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/arch/amd64/conf/XEN3_DOM0
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/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.162 src/sys/arch/amd64/conf/XEN3_DOM0:1.163
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.162 Tue Dec 25 11:56:14 2018
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Feb 2 12:05:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.162 2018/12/25 11:56:14 mlelstv Exp $
+# $NetBSD: XEN3_DOM0,v 1.163 2019/02/02 12:05:09 cherry Exp $
include "arch/amd64/conf/std.xen"
@@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.162 $"
+#ident "XEN3_DOM0-$Revision: 1.163 $"
maxusers 32 # estimated number of users
@@ -371,7 +371,7 @@ ipw* at pci? dev ? function ? # Intel PR
iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG
iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN
iwm* at pci? dev ? function ? # Intel Wireless WiFi Link 7xxx
-ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit
+#ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit
jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet
le* at pci? dev ? function ? # PCnet-PCI Ethernet
lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
