[src/netbsd-3-0]: src/sys/arch/cobalt/conf Pull up following revision(s) (req...

[ghen <ghen%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef2a2873a543
branches:  netbsd-3-0
changeset: 579283:ef2a2873a543
user:      ghen <ghen%NetBSD.org@localhost>
date:      Sat Aug 26 14:40:18 2006 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1478):
        sys/arch/cobalt/conf/GENERIC: revision 1.102
        sys/arch/cobalt/conf/INSTALL: revision 1.24
Add options SOSEND_NO_LOAN. See the following comment for details:
---

diffstat:

 sys/arch/cobalt/conf/GENERIC |  11 +++++++++--
 sys/arch/cobalt/conf/INSTALL |  11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diffs (64 lines):

diff -r 1d3570cb881e -r ef2a2873a543 sys/arch/cobalt/conf/GENERIC
--- a/sys/arch/cobalt/conf/GENERIC      Fri Aug 25 11:51:57 2006 +0000
+++ b/sys/arch/cobalt/conf/GENERIC      Sat Aug 26 14:40:18 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.70.2.5 2005/11/05 00:39:47 tron Exp $
+# $NetBSD: GENERIC,v 1.70.2.5.2.1 2006/08/26 14:40:18 ghen Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.70.2.5 $"
+#ident                 "GENERIC-$Revision: 1.70.2.5.2.1 $"
 
 maxusers       32
 
@@ -145,6 +145,13 @@
 
 options        NFS_BOOT_DHCP
 
+# XXX Disable zero-copy page loaning in sosend() temporarily:
+#     PV mappings created by sosend_loan() in sys/kern/uipc_socket.c may
+#     produce virtual cache aliases and it seems to cause TLB MISS panic
+#     in cache flush code called from bus_dmamap_sync(9) PREWRITE ops
+#     during heavy TX packet traffic on tlp(4).
+options        SOSEND_NO_LOAN
+
 config         netbsd  root on ? type ?
 
 mainbus0       at root
diff -r 1d3570cb881e -r ef2a2873a543 sys/arch/cobalt/conf/INSTALL
--- a/sys/arch/cobalt/conf/INSTALL      Fri Aug 25 11:51:57 2006 +0000
+++ b/sys/arch/cobalt/conf/INSTALL      Sat Aug 26 14:40:18 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.4.2.3 2005/07/18 21:13:05 riz Exp $
+# $NetBSD: INSTALL,v 1.4.2.3.2.1 2006/08/26 14:40:18 ghen Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.4.2.3 $"
+#ident                 "GENERIC-$Revision: 1.4.2.3.2.1 $"
 
 makeoptions     COPTS="-Os"
 
@@ -134,6 +134,13 @@
 
 options        NFS_BOOT_DHCP
 
+# XXX Disable zero-copy page loaning in sosend() temporarily:
+#     PV mappings created by sosend_loan() in sys/kern/uipc_socket.c may
+#     produce virtual cache aliases and it seems to cause TLB MISS panic
+#     in cache flush code called from bus_dmamap_sync(9) PREWRITE ops
+#     during heavy TX packet traffic on tlp(4).
+options        SOSEND_NO_LOAN
+
 config         netbsd  root on ? type nfs
 
 mainbus0       at root