Attachment #170681 for bug #209758

View | Details | Raw Unified | Return to bug 209758
Collapse All | Expand All




	{ 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 },

	{ 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" },

		 */
		switch (pci_get_device(dev)) {
		case BCOM_DEVICEID_BCM5717:
		case BCOM_DEVICEID_BCM5717C:
		case BCOM_DEVICEID_BCM5718:
		case BCOM_DEVICEID_BCM5719:
		case BCOM_DEVICEID_BCM5720:

		default:
			id = pci_read_config(dev, BGE_PCI_PRODID_ASICREV, 4);
		}
		if (id == BGE_CHIPID_BCM5717_C0)
			id = BGE_CHIPID_BCM5720_A0;
	}
	return (id);
}

Return to bug 209758

Lines 171-176 static const struct bge_type { Link Here

(-)b/sys/dev/bge/if_bge.c (+5 lines)
171	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5715 },	171	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5715 },
172	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5715S },	172	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5715S },
173	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5717 },	173	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5717 },
		174	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5717C },
174	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5718 },	175	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5718 },
175	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5719 },	176	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5719 },
176	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5720 },	177	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5720 },
Lines 311-316 static const struct bge_revision { Link Here
311	{ BGE_CHIPID_BCM5715_A3, "BCM5715 A3" },	312	{ BGE_CHIPID_BCM5715_A3, "BCM5715 A3" },
312	{ BGE_CHIPID_BCM5717_A0, "BCM5717 A0" },	313	{ BGE_CHIPID_BCM5717_A0, "BCM5717 A0" },
313	{ BGE_CHIPID_BCM5717_B0, "BCM5717 B0" },	314	{ BGE_CHIPID_BCM5717_B0, "BCM5717 B0" },
		315	{ BGE_CHIPID_BCM5717_C0, "BCM5717 C0" },
314	{ BGE_CHIPID_BCM5719_A0, "BCM5719 A0" },	316	{ BGE_CHIPID_BCM5719_A0, "BCM5719 A0" },
315	{ BGE_CHIPID_BCM5720_A0, "BCM5720 A0" },	317	{ BGE_CHIPID_BCM5720_A0, "BCM5720 A0" },
316	{ BGE_CHIPID_BCM5755_A0, "BCM5755 A0" },	318	{ BGE_CHIPID_BCM5755_A0, "BCM5755 A0" },
Lines 2699-2704 bge_chipid(device_t dev) Link Here
2699	*/	2701	*/
2700	switch (pci_get_device(dev)) {	2702	switch (pci_get_device(dev)) {
2701	case BCOM_DEVICEID_BCM5717:	2703	case BCOM_DEVICEID_BCM5717:
		2704	case BCOM_DEVICEID_BCM5717C:
2702	case BCOM_DEVICEID_BCM5718:	2705	case BCOM_DEVICEID_BCM5718:
2703	case BCOM_DEVICEID_BCM5719:	2706	case BCOM_DEVICEID_BCM5719:
2704	case BCOM_DEVICEID_BCM5720:	2707	case BCOM_DEVICEID_BCM5720:
Lines 2727-2732 bge_chipid(device_t dev) Link Here
2727	default:	2730	default:
2728	id = pci_read_config(dev, BGE_PCI_PRODID_ASICREV, 4);	2731	id = pci_read_config(dev, BGE_PCI_PRODID_ASICREV, 4);
2729	}	2732	}
		2733	if (id == BGE_CHIPID_BCM5717_C0)
		2734	id = BGE_CHIPID_BCM5720_A0;
2730	}	2735	}
2731	return (id);	2736	return (id);
2732	}	2737	}

Lines 329-334 Link Here

(-)b/sys/dev/bge/if_bgereg.h (+2 lines)
329	#define BGE_CHIPID_BCM57780_A1 0x57780001	329	#define BGE_CHIPID_BCM57780_A1 0x57780001
330	#define BGE_CHIPID_BCM5717_A0 0x05717000	330	#define BGE_CHIPID_BCM5717_A0 0x05717000
331	#define BGE_CHIPID_BCM5717_B0 0x05717100	331	#define BGE_CHIPID_BCM5717_B0 0x05717100
		332	#define BGE_CHIPID_BCM5717_C0 0x05717200
332	#define BGE_CHIPID_BCM5719_A0 0x05719000	333	#define BGE_CHIPID_BCM5719_A0 0x05719000
333	#define BGE_CHIPID_BCM5720_A0 0x05720000	334	#define BGE_CHIPID_BCM5720_A0 0x05720000
334	#define BGE_CHIPID_BCM5762_A0 0x05762000	335	#define BGE_CHIPID_BCM5762_A0 0x05762000
Lines 2452-2457 struct bge_status_block { Link Here
2452	#define BCOM_DEVICEID_BCM5715 0x1678	2453	#define BCOM_DEVICEID_BCM5715 0x1678
2453	#define BCOM_DEVICEID_BCM5715S 0x1679	2454	#define BCOM_DEVICEID_BCM5715S 0x1679
2454	#define BCOM_DEVICEID_BCM5717 0x1655	2455	#define BCOM_DEVICEID_BCM5717 0x1655
		2456	#define BCOM_DEVICEID_BCM5717C 0x1665
2455	#define BCOM_DEVICEID_BCM5718 0x1656	2457	#define BCOM_DEVICEID_BCM5718 0x1656
2456	#define BCOM_DEVICEID_BCM5719 0x1657	2458	#define BCOM_DEVICEID_BCM5719 0x1657
2457	#define BCOM_DEVICEID_BCM5720_PP 0x1658 /* Not released to public. */	2459	#define BCOM_DEVICEID_BCM5720_PP 0x1658 /* Not released to public. */