Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Match 5703 ASIC A3.



details:   https://anonhg.NetBSD.org/src/rev/b49c3aec4fcb
branches:  trunk
changeset: 556179:b49c3aec4fcb
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Dec 08 17:09:39 2003 +0000

description:
Match 5703 ASIC A3.

Also, when printing the ASIC ID, print the revision in hex in all
cases to avoid extra confusion if only the "superclass" of the ASIC
is recognized.

diffstat:

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

diffs (66 lines):

diff -r d3f2d6f118f3 -r b49c3aec4fcb sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Mon Dec 08 17:05:27 2003 +0000
+++ b/sys/dev/pci/if_bge.c      Mon Dec 08 17:09:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.54 2003/11/11 22:28:58 fvdl Exp $ */
+/*     $NetBSD: if_bge.c,v 1.55 2003/12/08 17:09:39 pooka Exp $        */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.54 2003/11/11 22:28:58 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.55 2003/12/08 17:09:39 pooka Exp $");
 
 #include "bpfilter.h"
 #include "vlan.h"
@@ -1740,6 +1740,10 @@
          BGE_QUIRK_ONLY_PHY_1,
          "BCM5703 A2" },
 
+       { BGE_CHIPID_BCM5703_A3,
+         BGE_QUIRK_ONLY_PHY_1,
+         "BCM5703 A3" },
+
        { BGE_CHIPID_BCM5704_A0,
          BGE_QUIRK_ONLY_PHY_1|BGE_QUIRK_FEWER_MBUFS,
          "BCM5704 A0" },
@@ -1881,6 +1885,10 @@
          PCI_PRODUCT_BROADCOM_BCM5703X,
          "Broadcom BCM5703X Gigabit Ethernet",
          },
+       { PCI_VENDOR_BROADCOM,
+         PCI_PRODUCT_BROADCOM_BCM5703A3,
+         "Broadcom BCM5703A3 Gigabit Ethernet",
+         },
 
        { PCI_VENDOR_BROADCOM,
          PCI_PRODUCT_BROADCOM_BCM5704C,
@@ -2164,7 +2172,7 @@
                aprint_normal("unknown ASIC 0x%08x", sc->bge_chipid);
                sc->bge_quirks = 0;
        } else {
-               aprint_normal("ASIC %s", br->br_name);
+               aprint_normal("ASIC %s (0x%x)", br->br_name, sc->bge_chipid);
                sc->bge_quirks |= br->br_quirks;
        }
        aprint_normal(", Ethernet address %s\n", ether_sprintf(eaddr));
diff -r d3f2d6f118f3 -r b49c3aec4fcb sys/dev/pci/if_bgereg.h
--- a/sys/dev/pci/if_bgereg.h   Mon Dec 08 17:05:27 2003 +0000
+++ b/sys/dev/pci/if_bgereg.h   Mon Dec 08 17:09:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bgereg.h,v 1.14 2003/11/02 10:31:06 wiz Exp $       */
+/*     $NetBSD: if_bgereg.h,v 1.15 2003/12/08 17:09:39 pooka Exp $     */
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -235,6 +235,7 @@
 #define BGE_CHIPID_BCM5703_A0          0x10000000
 #define BGE_CHIPID_BCM5703_A1          0x10010000
 #define BGE_CHIPID_BCM5703_A2          0x10020000
+#define BGE_CHIPID_BCM5703_A3          0x11000000
 #define BGE_CHIPID_BCM5704_A0          0x20000000
 #define BGE_CHIPID_BCM5704_A1          0x20010000
 #define BGE_CHIPID_BCM5704_A2          0x20020000



Home | Main Index | Thread Index | Old Index