svn commit: r202862 - stable/8/sys/dev/bge

[Xin LI]

Author: delphij
Date: Sat Jan 23 01:25:09 2010
New Revision: 202862
URL: http://svn.freebsd.org/changeset/base/202862

Log:
  MFC r202268:
  
   o Add PCI ID for BCM 5756.
   o Don't enable BGE_FLAG_BER_BUG on both 5722 and 5756, and based
     on their PCI IDs rather than their chip IDs.
  
  Reported by:    several PC-BSD users via kmoore
  Reviewed by:    yongari, imp, jhb, davidch
  Sponsored by:   iXsystems, Inc.

Modified:
  stable/8/sys/dev/bge/if_bge.c
  stable/8/sys/dev/bge/if_bgereg.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/bge/if_bge.c
==============================================================================
--- stable/8/sys/dev/bge/if_bge.c	Sat Jan 23 01:20:59 2010	(r202861)
+++ stable/8/sys/dev/bge/if_bge.c	Sat Jan 23 01:25:09 2010	(r202862)
@@ -187,6 +187,7 @@ static const struct bge_type {
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5754M },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5755 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5755M },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5756 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761E },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5761S },
@@ -2612,7 +2613,8 @@ bge_attach(device_t dev)
 		    sc->bge_asicrev == BGE_ASICREV_BCM5761 ||
 		    sc->bge_asicrev == BGE_ASICREV_BCM5784 ||
 		    sc->bge_asicrev == BGE_ASICREV_BCM5787) {
-			if (sc->bge_chipid != BGE_CHIPID_BCM5722_A0)
+			if (pci_get_device(dev) != BCOM_DEVICEID_BCM5722 &&
+			    pci_get_device(dev) != BCOM_DEVICEID_BCM5756)
 				sc->bge_flags |= BGE_FLAG_JITTER_BUG;
 		} else if (sc->bge_asicrev != BGE_ASICREV_BCM5906)
 			sc->bge_flags |= BGE_FLAG_BER_BUG;

Modified: stable/8/sys/dev/bge/if_bgereg.h
==============================================================================
--- stable/8/sys/dev/bge/if_bgereg.h	Sat Jan 23 01:20:59 2010	(r202861)
+++ stable/8/sys/dev/bge/if_bgereg.h	Sat Jan 23 01:25:09 2010	(r202862)
@@ -2138,6 +2138,7 @@ struct bge_status_block {
 #define	BCOM_DEVICEID_BCM5754M		0x1672
 #define	BCOM_DEVICEID_BCM5755		0x167B
 #define	BCOM_DEVICEID_BCM5755M		0x1673
+#define	BCOM_DEVICEID_BCM5756		0x1674
 #define	BCOM_DEVICEID_BCM5761		0x1681
 #define	BCOM_DEVICEID_BCM5761E		0x1680
 #define	BCOM_DEVICEID_BCM5761S		0x1688