From 474699860bc9a7248723eda0f90b19695aad53c3 Mon Sep 17 00:00:00 2001 From: sborrill Date: Thu, 24 Jul 2008 08:14:49 +0000 Subject: [PATCH] Add support for Broadcom 5722 and identify 5755 ASICs. --- sys/dev/pci/if_bge.c | 25 +++++++++++++++++++++++-- sys/dev/pci/if_bgereg.h | 7 ++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index abe82d0f1ea3..159146e4bfb6 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.148 2008/06/17 06:08:46 mlelstv Exp $ */ +/* $NetBSD: if_bge.c,v 1.149 2008/07/24 08:14:49 sborrill Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.148 2008/06/17 06:08:46 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.149 2008/07/24 08:14:49 sborrill Exp $"); #include "bpfilter.h" #include "vlan.h" @@ -2008,6 +2008,22 @@ static const struct bge_revision { BGE_QUIRK_ONLY_PHY_1|BGE_QUIRK_5705_CORE, "BCM5752 A2" }, + { BGE_CHIPID_BCM5755_A0, + BGE_QUIRK_ONLY_PHY_1|BGE_QUIRK_5705_CORE, + "BCM5755 A0" }, + + { BGE_CHIPID_BCM5755_A1, + BGE_QUIRK_ONLY_PHY_1|BGE_QUIRK_5705_CORE, + "BCM5755 A1" }, + + { BGE_CHIPID_BCM5755_A2, + BGE_QUIRK_ONLY_PHY_1|BGE_QUIRK_5705_CORE, + "BCM5755 A2" }, + + { BGE_CHIPID_BCM5755_C0, + BGE_QUIRK_ONLY_PHY_1|BGE_QUIRK_5705_CORE, + "BCM5755 C0" }, + { BGE_CHIPID_BCM5787_A0, BGE_QUIRK_ONLY_PHY_1|BGE_QUIRK_5705_CORE, "BCM5754/5787 A0" }, @@ -2206,6 +2222,11 @@ static const struct bge_product { "Broadcom BCM5721 Gigabit Ethernet", }, + { PCI_VENDOR_BROADCOM, + PCI_PRODUCT_BROADCOM_BCM5722, + "Broadcom BCM5722 Gigabit Ethernet", + }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5750, "Broadcom BCM5750 Gigabit Ethernet", diff --git a/sys/dev/pci/if_bgereg.h b/sys/dev/pci/if_bgereg.h index b2c08500bf4a..ef59320fac79 100644 --- a/sys/dev/pci/if_bgereg.h +++ b/sys/dev/pci/if_bgereg.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_bgereg.h,v 1.46 2008/06/17 06:12:10 mlelstv Exp $ */ +/* $NetBSD: if_bgereg.h,v 1.47 2008/07/24 08:14:49 sborrill Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -275,10 +275,15 @@ #define BGE_CHIPID_BCM5715_A0 0x90000000 #define BGE_CHIPID_BCM5715_A1 0x90010000 #define BGE_CHIPID_BCM5715_A3 0x90030000 +#define BGE_CHIPID_BCM5755_A0 0xa0000000 +#define BGE_CHIPID_BCM5755_A1 0xa0010000 +#define BGE_CHIPID_BCM5755_A2 0xa0020000 +#define BGE_CHIPID_BCM5755_C0 0xa2000000 #define BGE_CHIPID_BCM5787_A0 0xb0000000 #define BGE_CHIPID_BCM5787_A1 0xb0010000 #define BGE_CHIPID_BCM5787_A2 0xb0020000 #define BGE_CHIPID_BCM5906_A1 0xc0010000 +#define BGE_CHIPID_BCM5906_A2 0xc0020000 /* shorthand one */ #define BGE_ASICREV(x) ((x) >> 28)