--- src/sys/dev/bge/if_bge.c 2008/01/21 17:17:00 1.198.2.3 +++ src/sys/dev/bge/if_bge.c 2008/03/17 18:23:44 1.198.2.4 @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/bge/if_bge.c,v 1.198.2.3 2008/01/21 17:17:00 jkim Exp $"); +__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/bge/if_bge.c,v 1.198.2.4 2008/03/17 18:23:44 jhb Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -169,6 +169,7 @@ static struct bge_type { { BCOM_VENDORID, BCOM_DEVICEID_BCM5715S }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5720 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5721 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5722 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5750 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5750M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5751 }, @@ -267,6 +268,7 @@ static const struct bge_revision { { BGE_CHIPID_BCM5755_A0, "BCM5755 A0" }, { BGE_CHIPID_BCM5755_A1, "BCM5755 A1" }, { BGE_CHIPID_BCM5755_A2, "BCM5755 A2" }, + { BGE_CHIPID_BCM5722_A0, "BCM5722 A0" }, /* 5754 and 5787 share the same ASIC ID */ { BGE_CHIPID_BCM5787_A0, "BCM5754/5787 A0" }, { BGE_CHIPID_BCM5787_A1, "BCM5754/5787 A1" }, @@ -2302,9 +2304,10 @@ bge_attach(device_t dev) if (BGE_IS_5705_PLUS(sc) && !(sc->bge_flags & BGE_FLAG_ADJUST_TRIM)) { if (sc->bge_asicrev == BGE_ASICREV_BCM5755 || - sc->bge_asicrev == BGE_ASICREV_BCM5787) - sc->bge_flags |= BGE_FLAG_JITTER_BUG; - else + sc->bge_asicrev == BGE_ASICREV_BCM5787) { + if (sc->bge_chipid != BGE_CHIPID_BCM5722_A0) + sc->bge_flags |= BGE_FLAG_JITTER_BUG; + } else sc->bge_flags |= BGE_FLAG_BER_BUG; } --- src/sys/dev/bge/if_bgereg.h 2007/05/22 19:22:58 1.73 +++ src/sys/dev/bge/if_bgereg.h 2008/03/17 18:23:44 1.73.2.1 @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/bge/if_bgereg.h,v 1.73 2007/05/22 19:22:58 jkim Exp $ + * $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/bge/if_bgereg.h,v 1.73.2.1 2008/03/17 18:23:44 jhb Exp $ */ /* @@ -277,6 +277,7 @@ #define BGE_CHIPID_BCM5755_A0 0xa0000000 #define BGE_CHIPID_BCM5755_A1 0xa0010000 #define BGE_CHIPID_BCM5755_A2 0xa0020000 +#define BGE_CHIPID_BCM5722_A0 0xa2000000 #define BGE_CHIPID_BCM5754_A0 0xb0000000 #define BGE_CHIPID_BCM5754_A1 0xb0010000 #define BGE_CHIPID_BCM5754_A2 0xb0020000 @@ -2011,6 +2012,7 @@ struct bge_status_block { #define BCOM_DEVICEID_BCM5715S 0x1679 #define BCOM_DEVICEID_BCM5720 0x1658 #define BCOM_DEVICEID_BCM5721 0x1659 +#define BCOM_DEVICEID_BCM5722 0x165A #define BCOM_DEVICEID_BCM5750 0x1676 #define BCOM_DEVICEID_BCM5750M 0x167C #define BCOM_DEVICEID_BCM5751 0x1677 --- src/sys/dev/mii/brgphy.c 2007/06/08 02:34:44 1.70 +++ src/sys/dev/mii/brgphy.c 2008/03/17 18:23:44 1.70.2.1 @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/mii/brgphy.c,v 1.70 2007/06/08 02:34:44 davidch Exp $"); +__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/mii/brgphy.c,v 1.70.2.1 2008/03/17 18:23:44 jhb Exp $"); /* * Driver for the Broadcom BCM54xx/57xx 1000baseTX PHY. @@ -131,6 +131,7 @@ static const struct mii_phydesc brgphys[ MII_PHY_DESC(xxBROADCOM_ALT1, BCM5755), MII_PHY_DESC(xxBROADCOM_ALT1, BCM5787), MII_PHY_DESC(xxBROADCOM_ALT1, BCM5708S), + MII_PHY_DESC(xxBROADCOM_ALT1, BCM5722), MII_PHY_END }; --- src/sys/dev/mii/miidevs 2007/11/05 01:42:02 1.46.2.1 +++ src/sys/dev/mii/miidevs 2008/03/17 18:23:44 1.46.2.3 @@ -1,4 +1,4 @@ -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/mii/miidevs,v 1.46.2.1 2007/11/05 01:42:02 yongari Exp $ +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/mii/miidevs,v 1.46.2.3 2008/03/17 18:23:44 jhb Exp $ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ /*- @@ -135,6 +135,7 @@ model xxBROADCOM BCM5708C 0x0036 BCM5708 model xxBROADCOM_ALT1 BCM5755 0x000c BCM5755 10/100/1000baseTX PHY model xxBROADCOM_ALT1 BCM5787 0x000e BCM5787 10/100/1000baseTX PHY model xxBROADCOM_ALT1 BCM5708S 0x0015 BCM5708S 1000/2500BaseSX PHY +model xxBROADCOM_ALT1 BCM5722 0x002d BCM5722 10/100/1000baseTX PHY /* Cicada Semiconductor PHYs (now owned by Vitesse?) */ model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY @@ -172,6 +173,8 @@ model xxLEVEL1 LXT970 0x0000 LXT970 10/ /* National Semiconductor PHYs */ model NATSEMI DP83840 0x0000 DP83840 10/100 media interface model NATSEMI DP83843 0x0001 DP83843 10/100 media interface +model NATSEMI DP83815 0x0002 DP83815 10/100 media interface +model NATSEMI DP83847 0x0003 DP83847 10/100 media interface model NATSEMI DP83891 0x0005 DP83891 10/100/1000 media interface model NATSEMI DP83861 0x0006 DP83861 10/100/1000 media interface