Module Name: src
Committed By: snj
Date: Sat May 9 08:37:53 UTC 2015
Modified Files:
src/sys/dev/pci [netbsd-7]: if_bge.c if_bgereg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #740):
sys/dev/pci/if_bge.c: revision 1.285
sys/dev/pci/if_bgereg.h: revision 1.90
Use another firmware command in bge_asf_driver_up(). Same as Lunux.
This change fixes a bug that watchdog timeout occurs every 25-30 minutes
on HP ML110 G6 reported enami@ in PR#49657.
To generate a diff of this commit:
cvs rdiff -u -r1.277.2.1 -r1.277.2.2 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.88 -r1.88.2.1 src/sys/dev/pci/if_bgereg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.277.2.1 src/sys/dev/pci/if_bge.c:1.277.2.2
--- src/sys/dev/pci/if_bge.c:1.277.2.1 Tue Feb 17 14:48:10 2015
+++ src/sys/dev/pci/if_bge.c Sat May 9 08:37:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.277.2.1 2015/02/17 14:48:10 martin Exp $ */
+/* $NetBSD: if_bge.c,v 1.277.2.2 2015/05/09 08:37:53 snj Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.277.2.1 2015/02/17 14:48:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.277.2.2 2015/05/09 08:37:53 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -4723,7 +4723,7 @@ bge_asf_driver_up(struct bge_softc *sc)
bge_wait_for_event_ack(sc);
bge_writemem_ind(sc, BGE_SRAM_FW_CMD_MB,
- BGE_FW_CMD_DRV_ALIVE);
+ BGE_FW_CMD_DRV_ALIVE3);
bge_writemem_ind(sc, BGE_SRAM_FW_CMD_LEN_MB, 4);
bge_writemem_ind(sc, BGE_SRAM_FW_CMD_DATA_MB,
BGE_FW_HB_TIMEOUT_SEC);
Index: src/sys/dev/pci/if_bgereg.h
diff -u src/sys/dev/pci/if_bgereg.h:1.88 src/sys/dev/pci/if_bgereg.h:1.88.2.1
--- src/sys/dev/pci/if_bgereg.h:1.88 Tue Jun 17 17:37:08 2014
+++ src/sys/dev/pci/if_bgereg.h Sat May 9 08:37:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bgereg.h,v 1.88 2014/06/17 17:37:08 msaitoh Exp $ */
+/* $NetBSD: if_bgereg.h,v 1.88.2.1 2015/05/09 08:37:53 snj Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -100,6 +100,7 @@
#define BGE_FW_CMD_DRV_ALIVE 0x00000001
#define BGE_FW_CMD_PAUSE 0x00000002
+#define BGE_FW_CMD_DRV_ALIVE3 0x0000000e
#define BGE_FW_HB_TIMEOUT_SEC 3
