svn commit: r301103 - head/sys/dev/bge

[Sepherosa Ziehau]

Author: sephe
Date: Wed Jun  1 05:15:11 2016
New Revision: 301103
URL: https://svnweb.freebsd.org/changeset/base/301103

Log:
  bge: Force chipid to 5720 A0 for 5717 C0 in an early place
  
  Discussed with:	yongari
  MFC after:	1 week
  Sponsored by:	Microsoft OSTC

Modified:
  head/sys/dev/bge/if_bge.c

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c	Wed Jun  1 04:37:43 2016	(r301102)
+++ head/sys/dev/bge/if_bge.c	Wed Jun  1 05:15:11 2016	(r301103)
@@ -2700,8 +2700,11 @@ bge_chipid(device_t dev)
 		 * registers.
 		 */
 		switch (pci_get_device(dev)) {
-		case BCOM_DEVICEID_BCM5717:
 		case BCOM_DEVICEID_BCM5717C:
+			/* 5717 C0 seems to belong to 5720 line. */
+			id = BGE_CHIPID_BCM5720_A0;
+			break;
+		case BCOM_DEVICEID_BCM5717:
 		case BCOM_DEVICEID_BCM5718:
 		case BCOM_DEVICEID_BCM5719:
 		case BCOM_DEVICEID_BCM5720:
@@ -2730,8 +2733,6 @@ bge_chipid(device_t dev)
 		default:
 			id = pci_read_config(dev, BGE_PCI_PRODID_ASICREV, 4);
 		}
-		if (id == BGE_CHIPID_BCM5717_C0)
-			id = BGE_CHIPID_BCM5720_A0;
 	}
 	return (id);
 }