Attachment #168910 for bug #242548

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

Lines 197-202 static struct pci_device_id tg3_pci_tbl[] = { Link Here

(-)a/drivers/net/tg3.c (-3 / +7 lines)
197	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },	197	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
198	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5721,	198	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5721,
199	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },	199	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
		200	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5722,
		201	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
200	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750,	202	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750,
201	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },	203	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
202	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751,	204	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751,
Lines 10531-10539 static int __devinit tg3_get_invariants(struct tg3 *tp) Link Here
10531		10533
10532	if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) {	10534	if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) {
10533	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 \|\|	10535	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 \|\|
10534	GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787)	10536	GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787) {
10535	tp->tg3_flags2 \|= TG3_FLG2_PHY_JITTER_BUG;	10537	if (tp->pdev->device != PCI_DEVICE_ID_TIGON3_5722)
10536	else	10538	tp->tg3_flags2 \|= TG3_FLG2_PHY_JITTER_BUG;
		10539	} else
10537	tp->tg3_flags2 \|= TG3_FLG2_PHY_BER_BUG;	10540	tp->tg3_flags2 \|= TG3_FLG2_PHY_BER_BUG;
10538	}	10541	}
10539		10542
Lines 11281-11286 static char * __devinit tg3_phy_string(struct tg3 *tp) Link Here
11281	case PHY_ID_BCM5780: return "5780";	11284	case PHY_ID_BCM5780: return "5780";
11282	case PHY_ID_BCM5755: return "5755";	11285	case PHY_ID_BCM5755: return "5755";
11283	case PHY_ID_BCM5787: return "5787";	11286	case PHY_ID_BCM5787: return "5787";
		11287	case PHY_ID_BCM5756: return "5722/5756";
11284	case PHY_ID_BCM8002: return "8002/serdes";	11288	case PHY_ID_BCM8002: return "8002/serdes";
11285	case 0: return "serdes";	11289	case 0: return "serdes";
11286	default: return "unknown";	11290	default: return "unknown";

Lines 1905-1910 Link Here

(-)a/include/linux/pci_ids.h (+1 lines)
1905	#define PCI_DEVICE_ID_TIGON3_5705_2 0x1654	1905	#define PCI_DEVICE_ID_TIGON3_5705_2 0x1654
1906	#define PCI_DEVICE_ID_TIGON3_5720 0x1658	1906	#define PCI_DEVICE_ID_TIGON3_5720 0x1658
1907	#define PCI_DEVICE_ID_TIGON3_5721 0x1659	1907	#define PCI_DEVICE_ID_TIGON3_5721 0x1659
		1908	#define PCI_DEVICE_ID_TIGON3_5722 0x165a
1908	#define PCI_DEVICE_ID_TIGON3_5705M 0x165d	1909	#define PCI_DEVICE_ID_TIGON3_5705M 0x165d
1909	#define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e	1910	#define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e
1910	#define PCI_DEVICE_ID_TIGON3_5714 0x1668	1911	#define PCI_DEVICE_ID_TIGON3_5714 0x1668

Return to bug 242548

Lines 2276-2281 struct tg3 { Link Here

(-)a/drivers/net/tg3.h (-1 / +3 lines)
2276	#define PHY_ID_BCM5780 0x60008350	2276	#define PHY_ID_BCM5780 0x60008350
2277	#define PHY_ID_BCM5755 0xbc050cc0	2277	#define PHY_ID_BCM5755 0xbc050cc0
2278	#define PHY_ID_BCM5787 0xbc050ce0	2278	#define PHY_ID_BCM5787 0xbc050ce0
		2279	#define PHY_ID_BCM5756 0xbc050ed0
2279	#define PHY_ID_BCM8002 0x60010140	2280	#define PHY_ID_BCM8002 0x60010140
2280	#define PHY_ID_INVALID 0xffffffff	2281	#define PHY_ID_INVALID 0xffffffff
2281	#define PHY_ID_REV_MASK 0x0000000f	2282	#define PHY_ID_REV_MASK 0x0000000f
Lines 2302-2308 struct tg3 { Link Here
2302	(X) == PHY_ID_BCM5705 \|\| (X) == PHY_ID_BCM5750 \|\| \	2303	(X) == PHY_ID_BCM5705 \|\| (X) == PHY_ID_BCM5750 \|\| \
2303	(X) == PHY_ID_BCM5752 \|\| (X) == PHY_ID_BCM5714 \|\| \	2304	(X) == PHY_ID_BCM5752 \|\| (X) == PHY_ID_BCM5714 \|\| \
2304	(X) == PHY_ID_BCM5780 \|\| (X) == PHY_ID_BCM5787 \|\| \	2305	(X) == PHY_ID_BCM5780 \|\| (X) == PHY_ID_BCM5787 \|\| \
2305	(X) == PHY_ID_BCM5755 \|\| (X) == PHY_ID_BCM8002)	2306	(X) == PHY_ID_BCM5755 \|\| (X) == PHY_ID_BCM5756 \|\| \
		2307	(X) == PHY_ID_BCM8002)
2306		2308
2307	struct tg3_hw_stats *hw_stats;	2309	struct tg3_hw_stats *hw_stats;
2308	dma_addr_t stats_mapping;	2310	dma_addr_t stats_mapping;