[src/trunk]: src/sys/dev/pci Use another firmware command in bge_asf_driver_u...

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

details:   https://anonhg.NetBSD.org/src/rev/23297279f4bc
branches:  trunk
changeset: 337845:23297279f4bc
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Apr 30 16:09:06 2015 +0000

description:
Use another firmware command in bge_asf_driver_up(). Same as Linux.
This change fixes a bug that watchdog timeout occurs every 25-30 minutes
on HP ML110 G6 reported enami@ in PR#49657.

diffstat:

 sys/dev/pci/if_bge.c    |  6 +++---
 sys/dev/pci/if_bgereg.h |  3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 20a2ed31a62f -r 23297279f4bc sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Thu Apr 30 16:01:51 2015 +0000
+++ b/sys/dev/pci/if_bge.c      Thu Apr 30 16:09:06 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.284 2015/04/30 15:48:46 msaitoh Exp $     */
+/*     $NetBSD: if_bge.c,v 1.285 2015/04/30 16:09:06 msaitoh Exp $     */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.284 2015/04/30 15:48:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.285 2015/04/30 16:09:06 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -4726,7 +4726,7 @@
                        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);
diff -r 20a2ed31a62f -r 23297279f4bc sys/dev/pci/if_bgereg.h
--- a/sys/dev/pci/if_bgereg.h   Thu Apr 30 16:01:51 2015 +0000
+++ b/sys/dev/pci/if_bgereg.h   Thu Apr 30 16:09:06 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bgereg.h,v 1.89 2015/04/30 15:48:47 msaitoh Exp $   */
+/*     $NetBSD: if_bgereg.h,v 1.90 2015/04/30 16:09:06 msaitoh 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