[src/trunk]: src/sys/dev/pci - BGE_CHIPID_BCM5784_A1 is not 0x5784100 but 0x5...

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

details:   https://anonhg.NetBSD.org/src/rev/8f4ac1059621
branches:  trunk
changeset: 337843:8f4ac1059621
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Apr 30 15:48:46 2015 +0000

description:
- BGE_CHIPID_BCM5784_A1 is not 0x5784100 but 0x5784001. Only dmesg output
  is affected.
- Add BGE_CHIPREV_5784_AX and BGE_CHIPID_BCM5784_B0.

diffstat:

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

diffs (53 lines):

diff -r 3ab05c044695 -r 8f4ac1059621 sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Thu Apr 30 15:22:32 2015 +0000
+++ b/sys/dev/pci/if_bge.c      Thu Apr 30 15:48:46 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.283 2015/04/27 17:42:20 christos Exp $    */
+/*     $NetBSD: if_bge.c,v 1.284 2015/04/30 15:48:46 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.283 2015/04/27 17:42:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.284 2015/04/30 15:48:46 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -740,6 +740,7 @@
        { BGE_CHIPID_BCM5761_A1, "BCM5761 A1" },
        { BGE_CHIPID_BCM5784_A0, "BCM5784 A0" },
        { BGE_CHIPID_BCM5784_A1, "BCM5784 A1" },
+       { BGE_CHIPID_BCM5784_B0, "BCM5784 B0" },
        /* 5754 and 5787 share the same ASIC ID */
        { BGE_CHIPID_BCM5787_A0, "BCM5754/5787 A0" },
        { BGE_CHIPID_BCM5787_A1, "BCM5754/5787 A1" },
diff -r 3ab05c044695 -r 8f4ac1059621 sys/dev/pci/if_bgereg.h
--- a/sys/dev/pci/if_bgereg.h   Thu Apr 30 15:22:32 2015 +0000
+++ b/sys/dev/pci/if_bgereg.h   Thu Apr 30 15:48:46 2015 +0000
@@ -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.89 2015/04/30 15:48:47 msaitoh Exp $   */
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -318,7 +318,8 @@
 #define BGE_CHIPID_BCM5761_A0          0x5761000
 #define BGE_CHIPID_BCM5761_A1          0x5761100
 #define BGE_CHIPID_BCM5784_A0          0x5784000
-#define BGE_CHIPID_BCM5784_A1          0x5784100
+#define BGE_CHIPID_BCM5784_A1          0x5784001
+#define BGE_CHIPID_BCM5784_B0          0x5784100
 #define BGE_CHIPID_BCM5752_A0          0x6000
 #define BGE_CHIPID_BCM5752_A1          0x6001
 #define BGE_CHIPID_BCM5752_A2          0x6002
@@ -385,6 +386,7 @@
 #define BGE_CHIPREV_5704_BX            0x21
 #define BGE_CHIPREV_5750_AX            0x40
 #define BGE_CHIPREV_5750_BX            0x41
+#define BGE_CHIPREV_5784_AX            0x57840
 #define BGE_CHIPREV_57765_AX           0x577850
 
 /* PCI DMA Read/Write Control register */