Module Name: src
Committed By: msaitoh
Date: Thu Apr 30 15:48:47 UTC 2015
Modified Files:
src/sys/dev/pci: if_bge.c if_bgereg.h
Log Message:
- BGE_CHIPID_BCM5784_A1 is not 0x5784100 but 0x5784001. Only dmesg output
is affected.
- Add BGE_CHIPREV_5784_AX and BGE_CHIPID_BCM5784_B0.
To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.88 -r1.89 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.283 src/sys/dev/pci/if_bge.c:1.284
--- src/sys/dev/pci/if_bge.c:1.283 Mon Apr 27 17:42:20 2015
+++ src/sys/dev/pci/if_bge.c Thu Apr 30 15:48:46 2015
@@ -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 @@ static const struct bge_revision {
{ 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" },
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.89
--- src/sys/dev/pci/if_bgereg.h:1.88 Tue Jun 17 17:37:08 2014
+++ src/sys/dev/pci/if_bgereg.h Thu Apr 30 15:48:47 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.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 */
