tg3: Add 57765 asic rev
Subsystems (2)
PATCH 2/6 tg3: Add 57765 asic rev
This patch adds the 57765 asic revision.
Signed-off-by Matt Carlson <[email protected]>
Signed-off-by Michael Chan <[email protected]>
--- drivers/net/tg3.c | 72 +++++++++++++++++++++++++++++++++++++++-------------- drivers/net/tg3.h | 9 ++++++ 2 files changed, 62 insertions(+), 19 deletions(-)
drivers/net/tg3.c +53 -19
@@ -5515,7 +5515,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, tnapi->tx_buffers[entry].skb = skb;pci_unmap_addr_set (&tnapi->tx_buffers[entry], mapping, mapping); -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 && +if ((tp->tg3_flags3 &TG3_FLG3_USE_JUMBO_BDFLAG ) && !mss && skb->len >ETH_DATA_LEN ) base_flags |=TXD_FLAG_JMB_PKT ;
@@ -5727,7 +5727,7 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb, (vlan_tx_tag_get(skb) << 16));#endif -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 && +if ((tp->tg3_flags3 &TG3_FLG3_USE_JUMBO_BDFLAG ) && !mss && skb->len >ETH_DATA_LEN ) base_flags |=TXD_FLAG_JMB_PKT ;
@@ -6972,7 +6972,8 @@ static int tg3_chip_reset(struct tg3 *tp)if ((tp->tg3_flags2 &TG3_FLG2_PCI_EXPRESS ) && tp->pci_chip_rev_id !=CHIPREV_ID_5750_A0 &&GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_5785 && -GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_5717 ) { +GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_5717 && +GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_57765 ) { val =tr32 (0x7c00 );tw32 (0x7c00 , val | (1 <<25 ));
@@ -7399,6 +7400,8 @@ static void tg3_rings_reset(struct tg3 *tp)/* Disable all transmit rings but the first. */ if (!(tp->tg3_flags2 &TG3_FLG2_5705_PLUS )) limit =NIC_SRAM_SEND_RCB +TG3_BDINFO_SIZE *16 ; +else if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) + limit =NIC_SRAM_SEND_RCB +TG3_BDINFO_SIZE *2 ;else limit =NIC_SRAM_SEND_RCB +TG3_BDINFO_SIZE ;
@@ -7413,7 +7416,8 @@ static void tg3_rings_reset(struct tg3 *tp) limit =NIC_SRAM_RCV_RET_RCB +TG3_BDINFO_SIZE *17 ; else if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) limit =NIC_SRAM_RCV_RET_RCB +TG3_BDINFO_SIZE *16 ; - else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755) + else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 || + GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) limit =NIC_SRAM_RCV_RET_RCB +TG3_BDINFO_SIZE *4 ; else limit =NIC_SRAM_RCV_RET_RCB +TG3_BDINFO_SIZE ;
@@ -7610,7 +7614,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)if (err)return err; -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 ) { +if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) { val =tr32 (TG3PCI_DMA_RW_CTRL ) & ~DMA_RWCTRL_DIS_CACHE_ALIGNMENT ;tw32 (TG3PCI_DMA_RW_CTRL , val | tp->dma_rwctrl);
@@ -7771,7 +7776,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) BDINFO_FLAGS_DISABLED); } -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 ) +if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) val = (RX_STD_MAX_SIZE_5705 <<BDINFO_FLAGS_MAXLEN_SHIFT ) | (RX_STD_MAX_SIZE <<2 );else
@@ -7788,7 +7794,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) tp->rx_jumbo_pending : 0;tw32_rx_mbox (TG3_RX_JMB_PROD_IDX_REG , tpr->rx_jmb_prod_idx); -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 ) { +if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) {tw32 (STD_REPLENISH_LWM ,32 );tw32 (JMB_REPLENISH_LWM ,16 ); }
@@ -8465,7 +8472,8 @@ static int tg3_test_interrupt(struct tg3 *tp)* Turn off MSI one shot mode. Otherwise this test has no * observable way to know whether the interrupt was delivered. */ -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 && +if ((GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) && (tp->tg3_flags2 &TG3_FLG2_USING_MSI )) { val =tr32 (MSGINT_MODE ) |MSGINT_MODE_ONE_SHOT_DISABLE ;tw32 (MSGINT_MODE , val);
@@ -8508,7 +8516,8 @@ static int tg3_test_interrupt(struct tg3 *tp)if (intr_ok) {/* Reenable MSI one shot mode. */ -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 && +if ((GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) && (tp->tg3_flags2 &TG3_FLG2_USING_MSI )) { val =tr32 (MSGINT_MODE ) & ~MSGINT_MODE_ONE_SHOT_DISABLE ;tw32 (MSGINT_MODE , val);
@@ -8804,6 +8813,7 @@ static int tg3_open(struct net_device *dev) }if (GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_5717 && +GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_57765 && (tp->tg3_flags2 &TG3_FLG2_USING_MSI ) && (tp->tg3_flags2 &TG3_FLG2_1SHOT_MSI )) {u32 val =tr32 (PCIE_TRANSACTION_CFG );
@@ -11698,7 +11708,8 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)tg3_get_5761_nvram_info (tp); else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) tg3_get_5906_nvram_info(tp); - else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780) + else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 || + GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) tg3_get_57780_nvram_info(tp); else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) tg3_get_5717_nvram_info(tp);
@@ -12532,6 +12543,8 @@ out_not_found:else if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57780 && tp->pdev->device ==TG3PCI_DEVICE_TIGON3_57788 )strcpy (tp->board_part_number,"BCM57788" ); +else if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) +strcpy (tp->board_part_number,"BCM57765" );else strcpy (tp->board_part_number,"none" ); }
@@ -12821,6 +12834,15 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)pci_read_config_dword (tp->pdev,TG3PCI_GEN2_PRODID_ASICREV , &prod_id_asic_rev); + else if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_57781 || + tp->pdev->device == TG3PCI_DEVICE_TIGON3_57785 || + tp->pdev->device == TG3PCI_DEVICE_TIGON3_57761 || + tp->pdev->device == TG3PCI_DEVICE_TIGON3_57765 || + tp->pdev->device == TG3PCI_DEVICE_TIGON3_57791 || + tp->pdev->device == TG3PCI_DEVICE_TIGON3_57795) + pci_read_config_dword(tp->pdev, + TG3PCI_GEN15_PRODID_ASICREV, + &prod_id_asic_rev); else pci_read_config_dword(tp->pdev, TG3PCI_PRODID_ASICREV, &prod_id_asic_rev);
@@ -12974,7 +12996,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5761 ||GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5785 ||GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57780 || - GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || + GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) tp->tg3_flags3 |= TG3_FLG3_5755_PLUS; if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
@@ -13001,7 +13024,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) }/* Determine TSO capabilities */ -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 ) +if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) tp->tg3_flags2 |=TG3_FLG2_HW_TSO_3 ;else if ((tp->tg3_flags3 &TG3_FLG3_5755_PLUS ) ||GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5906 )
@@ -13037,7 +13061,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) tp->tg3_flags2 |=TG3_FLG2_1SHOT_MSI ; } -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 ) { +if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) { tp->tg3_flags |=TG3_FLAG_SUPPORT_MSIX ; tp->irq_max =TG3_IRQ_MAX_VECS ; }
@@ -13051,9 +13076,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) tp->tg3_flags3 |=TG3_FLG3_40BIT_DMA_LIMIT_BUG ; } +if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) + tp->tg3_flags3 |=TG3_FLG3_USE_JUMBO_BDFLAG ; +if (!(tp->tg3_flags2 &TG3_FLG2_5705_PLUS ) || (tp->tg3_flags2 &TG3_FLG2_5780_CLASS ) || -GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 ) + (tp->tg3_flags3 &TG3_FLG3_USE_JUMBO_BDFLAG )) tp->tg3_flags |=TG3_FLAG_JUMBO_CAPABLE ; pci_read_config_dword(tp->pdev, TG3PCI_PCISTATE,
@@ -13246,7 +13275,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5761 ||GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5785 ||GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57780 || - GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || + GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) tp->tg3_flags |= TG3_FLAG_CPMU_PRESENT;/* Set up tp->grc_local_ctrl before calling tg3_set_power_state().
@@ -13325,7 +13355,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) !(tp->tg3_flags3 &TG3_FLG3_PHY_IS_FET ) &&GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_5785 &&GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_57780 && - GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717) { +GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_5717 && + GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_57765) { if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||
@@ -13649,7 +13680,8 @@ static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val)#endif #endif -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 ) { +if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) { val = goal ?0 :DMA_RWCTRL_DIS_CACHE_ALIGNMENT ; goto out; }
@@ -13861,7 +13893,8 @@ static int __devinit tg3_test_dma(struct tg3 *tp) tp->dma_rwctrl =tg3_calc_dma_bndry (tp, tp->dma_rwctrl); -if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 ) +if (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5717 || +GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_57765 ) goto out;if (tp->tg3_flags2 &TG3_FLG2_PCI_EXPRESS ) {
@@ -14054,7 +14087,8 @@ static void __devinit tg3_init_link_config(struct tg3 *tp)static void __devinit tg3_init_bufmgr_config (struct tg3 *tp) {if (tp->tg3_flags2 &TG3_FLG2_5705_PLUS && -GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_5717 ) { +GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_5717 && +GET_ASIC_REV (tp->pci_chip_rev_id) !=ASIC_REV_57765 ) { tp->bufmgr_config.mbuf_read_dma_low_water =DEFAULT_MB_RDMA_LOW_WATER_5705 ; tp->bufmgr_config.mbuf_mac_rx_low_water =
drivers/net/tg3.h +9 -0
@@ -49,6 +49,12 @@#define TG3PCI_DEVICE_TIGON3_5717 0x1655#define TG3PCI_DEVICE_TIGON3_5718 0x1656#define TG3PCI_DEVICE_TIGON3_5724 0x165c +#define TG3PCI_DEVICE_TIGON3_57781 0x16b1 +#define TG3PCI_DEVICE_TIGON3_57785 0x16b5 +#define TG3PCI_DEVICE_TIGON3_57761 0x16b0 +#define TG3PCI_DEVICE_TIGON3_57765 0x16b4 +#define TG3PCI_DEVICE_TIGON3_57791 0x16b2 +#define TG3PCI_DEVICE_TIGON3_57795 0x16b6/* 0x04 --> 0x64 unused */ #define TG3PCI_MSI_DATA 0x00000064/* 0x66 --> 0x68 unused */
@@ -122,6 +128,7 @@#define ASIC_REV_5785 0x5785#define ASIC_REV_57780 0x57780#define ASIC_REV_5717 0x5717 +#define ASIC_REV_57765 0x57785#define GET_CHIP_REV (CHIP_REV_ID ) ((CHIP_REV_ID) >> 8)#define CHIPREV_5700_AX 0x70#define CHIPREV_5700_BX 0x71
@@ -220,6 +227,7 @@/* 0xc0 --> 0xf4 unused */ #define TG3PCI_GEN2_PRODID_ASICREV 0x000000f4 +#define TG3PCI_GEN15_PRODID_ASICREV 0x000000fc/* 0xf8 --> 0x200 unused */ #define TG3_CORR_ERR_STAT 0x00000110
@@ -2795,6 +2803,7 @@ struct tg3 {#define TG3_FLG3_4G_DMA_BNDRY_BUG 0x00080000#define TG3_FLG3_40BIT_DMA_LIMIT_BUG 0x00100000#define TG3_FLG3_SHORT_DMA_BUG 0x00200000 +#define TG3_FLG3_USE_JUMBO_BDFLAG 0x00400000struct timer_list timer;u16 timer_counter;
Signature · 1 line
1.6.4.4