Module Name: src
Committed By: riz
Date: Thu Mar 8 17:56:46 UTC 2012
Modified Files:
src/sys/arch/ofppc/conf [netbsd-6]: GENERIC
Log Message:
Pull up following revision(s) (requested by phx in ticket #103):
sys/arch/ofppc/conf/GENERIC: revision 1.140
When detecting a new USB device on the bus ofppc panics in usb_allocmem().
Although the problem doesn't seem to affect other PPC ports, it causes big
trouble for my Pegasos2.
So as long as there is no real solution we should add the option
USB_FRAG_DMA_WORKAROUND to the GENERIC config file.
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.139.2.1 src/sys/arch/ofppc/conf/GENERIC
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/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.139 src/sys/arch/ofppc/conf/GENERIC:1.139.2.1
--- src/sys/arch/ofppc/conf/GENERIC:1.139 Sun Dec 18 05:49:31 2011
+++ src/sys/arch/ofppc/conf/GENERIC Thu Mar 8 17:56:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.139 2011/12/18 05:49:31 dholland Exp $
+# $NetBSD: GENERIC,v 1.139.2.1 2012/03/08 17:56:46 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.139 $"
+#ident "GENERIC-$Revision: 1.139.2.1 $"
maxusers 32
@@ -339,6 +339,7 @@ urlphy* at mii? phy ? # Realtek RTL815
uhci* at pci? dev ? function ? # USB Universal Host Controller
ohci* at pci? dev ? function ? # USB Open Host Controller
ehci* at pci? dev ? function ? # USB Enhanced Host Controller
+options USB_FRAG_DMA_WORKAROUND # Workaround panic in usb_allocmem()
usb* at uhci? # USB bus support
usb* at ohci? # USB bus support