svn commit: r301848 - stable/10/sys/dev/bge

[Sepherosa Ziehau]

Author: sephe
Date: Mon Jun 13 03:03:08 2016
New Revision: 301848
URL: https://svnweb.freebsd.org/changeset/base/301848

Log:
  MFC 300985, 301103
  
  r300985
  bge: Support 5717 C0, which is almost same as 5720 A0
  
  PR:         209758
  Obtained from:      DragonFlyBSD d79f5d8f5fe94cd6769207b2901422977d502bc0
  MFC after:  1 week
  
  ============
  
  r301103
  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:
  stable/10/sys/dev/bge/if_bge.c
  stable/10/sys/dev/bge/if_bgereg.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/bge/if_bge.c
==============================================================================
--- stable/10/sys/dev/bge/if_bge.c	Mon Jun 13 02:54:58 2016	(r301847)
+++ stable/10/sys/dev/bge/if_bge.c	Mon Jun 13 03:03:08 2016	(r301848)
@@ -170,6 +170,7 @@ static const struct bge_type {
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5715 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5715S },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5717 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5717C },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5718 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5719 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5720 },
@@ -310,6 +311,7 @@ static const struct bge_revision {
 	{ BGE_CHIPID_BCM5715_A3,	"BCM5715 A3" },
 	{ BGE_CHIPID_BCM5717_A0,	"BCM5717 A0" },
 	{ BGE_CHIPID_BCM5717_B0,	"BCM5717 B0" },
+	{ BGE_CHIPID_BCM5717_C0,	"BCM5717 C0" },
 	{ BGE_CHIPID_BCM5719_A0,	"BCM5719 A0" },
 	{ BGE_CHIPID_BCM5720_A0,	"BCM5720 A0" },
 	{ BGE_CHIPID_BCM5755_A0,	"BCM5755 A0" },
@@ -2689,6 +2691,10 @@ bge_chipid(device_t dev)
 		 * registers.
 		 */
 		switch (pci_get_device(dev)) {
+		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:

Modified: stable/10/sys/dev/bge/if_bgereg.h
==============================================================================
--- stable/10/sys/dev/bge/if_bgereg.h	Mon Jun 13 02:54:58 2016	(r301847)
+++ stable/10/sys/dev/bge/if_bgereg.h	Mon Jun 13 03:03:08 2016	(r301848)
@@ -329,6 +329,7 @@
 #define	BGE_CHIPID_BCM57780_A1		0x57780001
 #define	BGE_CHIPID_BCM5717_A0		0x05717000
 #define	BGE_CHIPID_BCM5717_B0		0x05717100
+#define	BGE_CHIPID_BCM5717_C0		0x05717200
 #define	BGE_CHIPID_BCM5719_A0		0x05719000
 #define	BGE_CHIPID_BCM5720_A0		0x05720000
 #define	BGE_CHIPID_BCM5762_A0		0x05762000
@@ -2452,6 +2453,7 @@ struct bge_status_block {
 #define	BCOM_DEVICEID_BCM5715		0x1678
 #define	BCOM_DEVICEID_BCM5715S		0x1679
 #define	BCOM_DEVICEID_BCM5717		0x1655
+#define	BCOM_DEVICEID_BCM5717C		0x1665
 #define	BCOM_DEVICEID_BCM5718		0x1656
 #define	BCOM_DEVICEID_BCM5719		0x1657
 #define	BCOM_DEVICEID_BCM5720_PP	0x1658	/* Not released to public. */