Commit d9ab5ad1 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[TG3]: Add 5787 and 5754 basic support 



Add basic support for 2 new chips 5787 and 5754.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6cb153ca

drivers/net/tg3.c

+25 −2
Original line number Diff line number Diff line
@@ -221,6 +221,14 @@ static struct pci_device_id tg3_pci_tbl[] = { 
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753F,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5754,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5754M,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787M,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },

	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714S,
@@ -4388,6 +4396,10 @@ static int tg3_chip_reset(struct tg3 *tp) 
		tp->nvram_lock_cnt = 0;

	}



	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787)

		tw32(GRC_FASTBOOT_PC, 0);



	/*

	 * We must avoid the readl() that normally takes place.

	 * It locks machines, causes machine checks, and other
@@ -6018,6 +6030,10 @@ static int tg3_reset_hw(struct tg3 *tp) 
		}

	}



	/* Enable host coalescing bug fix */

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787)

		val |= (1 << 29);



	tw32_f(WDMAC_MODE, val);

	udelay(40);
@@ -8326,6 +8342,9 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest, 
		if (!err)

			tg3_nvram_unlock(tp);



		if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)

			tg3_phy_reset(tp);



		if (tg3_test_registers(tp) != 0) {

			etest->flags |= ETH_TEST_FL_FAILED;

			data[2] = 1;
@@ -9681,6 +9700,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 


	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787 ||

	    (tp->tg3_flags2 & TG3_FLG2_5780_CLASS))

		tp->tg3_flags2 |= TG3_FLG2_5750_PLUS;
@@ -9693,7 +9713,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 


	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&

	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750 &&

	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5752)

	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5752 &&

	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5787)

		tp->tg3_flags2 |= TG3_FLG2_JUMBO_CAPABLE;



	if (pci_find_capability(tp->pdev, PCI_CAP_ID_EXP) != 0)
@@ -9903,7 +9924,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0)

		tp->tg3_flags2 |= TG3_FLG2_PHY_5704_A0_BUG;



	if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)

	if ((tp->tg3_flags2 & TG3_FLG2_5705_PLUS) &&

	    (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5787))

		tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG;



	tp->coalesce_mode = 0;
@@ -10628,6 +10650,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp) 
	case PHY_ID_BCM5752:	return "5752";

	case PHY_ID_BCM5714:	return "5714";

	case PHY_ID_BCM5780:	return "5780";

	case PHY_ID_BCM5787:	return "5787";

	case PHY_ID_BCM8002:	return "8002/serdes";

	case 0:			return "serdes";

	default:		return "unknown";

drivers/net/tg3.h

+5 −1
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ 
#define   ASIC_REV_5752			 0x06

#define   ASIC_REV_5780			 0x08

#define   ASIC_REV_5714			 0x09

#define   ASIC_REV_5787			 0x0b

#define  GET_CHIP_REV(CHIP_REV_ID)	((CHIP_REV_ID) >> 8)

#define   CHIPREV_5700_AX		 0x70

#define   CHIPREV_5700_BX		 0x71
@@ -1393,6 +1394,7 @@ 
#define GRC_MDI_CTRL			0x00006844

#define GRC_SEEPROM_DELAY		0x00006848

/* 0x684c --> 0x6c00 unused */

#define GRC_FASTBOOT_PC			0x00006894	/* 5752, 5755, 5787 */



/* 0x6c00 --> 0x7000 unused */
@@ -2247,6 +2249,7 @@ struct tg3 { 
#define PHY_ID_BCM5752			0x60008100

#define PHY_ID_BCM5714			0x60008340

#define PHY_ID_BCM5780			0x60008350

#define PHY_ID_BCM5787			0xbc050ce0

#define PHY_ID_BCM8002			0x60010140

#define PHY_ID_INVALID			0xffffffff

#define PHY_ID_REV_MASK			0x0000000f
@@ -2271,7 +2274,8 @@ struct tg3 { 
	 (X) == PHY_ID_BCM5703 || (X) == PHY_ID_BCM5704 || \

	 (X) == PHY_ID_BCM5705 || (X) == PHY_ID_BCM5750 || \

	 (X) == PHY_ID_BCM5752 || (X) == PHY_ID_BCM5714 || \

	 (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM8002)

	 (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \

	 (X) == PHY_ID_BCM8002)



	struct tg3_hw_stats		*hw_stats;

	dma_addr_t			stats_mapping;

include/linux/pci_ids.h

+4 −0
Original line number Diff line number Diff line
@@ -1861,14 +1861,18 @@ 
#define PCI_DEVICE_ID_TIGON3_5780	0x166a

#define PCI_DEVICE_ID_TIGON3_5780S	0x166b

#define PCI_DEVICE_ID_TIGON3_5705F	0x166e

#define PCI_DEVICE_ID_TIGON3_5754M	0x1672

#define PCI_DEVICE_ID_TIGON3_5750	0x1676

#define PCI_DEVICE_ID_TIGON3_5751	0x1677

#define PCI_DEVICE_ID_TIGON3_5715	0x1678

#define PCI_DEVICE_ID_TIGON3_5715S	0x1679

#define PCI_DEVICE_ID_TIGON3_5754	0x167a

#define PCI_DEVICE_ID_TIGON3_5750M	0x167c

#define PCI_DEVICE_ID_TIGON3_5751M	0x167d

#define PCI_DEVICE_ID_TIGON3_5751F	0x167e

#define PCI_DEVICE_ID_TIGON3_5787M	0x1693

#define PCI_DEVICE_ID_TIGON3_5782	0x1696

#define PCI_DEVICE_ID_TIGON3_5787	0x169b

#define PCI_DEVICE_ID_TIGON3_5788	0x169c

#define PCI_DEVICE_ID_TIGON3_5789	0x169d

#define PCI_DEVICE_ID_TIGON3_5702X	0x16a6

CRA Git | Maintained and supported by SUSTech CRA and CCSE