Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 615774fe authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Use tg3_start_xmit_dma_bug for 5717 A0 



The A0 revision of the 5717 has problems with short packet fragments.
It needs to use the tg3_start_xmit_dma_bug() routine.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e849cdc3

drivers/net/tg3.c

+18 −9
Original line number Diff line number Diff line
@@ -5454,7 +5454,12 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb, 
								 IPPROTO_TCP,

								 0);



		if (tp->tg3_flags2 & TG3_FLG2_HW_TSO_2)

		if (tp->tg3_flags2 & TG3_FLG2_HW_TSO_3) {

			mss |= (hdr_len & 0xc) << 12;

			if (hdr_len & 0x10)

				base_flags |= 0x00000010;

			base_flags |= (hdr_len & 0x3e0) << 5;

		} else if (tp->tg3_flags2 & TG3_FLG2_HW_TSO_2)

			mss |= hdr_len << 9;

		else if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_1) ||

			 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
@@ -5479,6 +5484,10 @@ 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 &&

	    !mss && skb->len > ETH_DATA_LEN)

		base_flags |= TXD_FLAG_JMB_PKT;



	if (skb_dma_map(&tp->pdev->dev, skb, DMA_TO_DEVICE)) {

		dev_kfree_skb(skb);

		goto out_unlock;
@@ -12714,14 +12723,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
		}

	}



	if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS)) {

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

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

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)

		tp->tg3_flags3 |= TG3_FLG3_SHORT_DMA_BUG;

		else {

	else if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS)) {

		tp->tg3_flags3 |= TG3_FLG3_4G_DMA_BNDRY_BUG;

		tp->tg3_flags3 |= TG3_FLG3_40BIT_DMA_LIMIT_BUG;

	}

	}



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

	     (tp->tg3_flags2 & TG3_FLG2_5780_CLASS) ||
@@ -14077,7 +14085,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 
		goto err_out_iounmap;

	}



	if (tp->tg3_flags3 & TG3_FLG3_5755_PLUS)

	if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) &&

	    tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)

		dev->netdev_ops = &tg3_netdev_ops;

	else

		dev->netdev_ops = &tg3_netdev_ops_dma_bug;

drivers/net/tg3.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
#define  CHIPREV_ID_5906_A1		 0xc001

#define  CHIPREV_ID_57780_A0		 0x57780000

#define  CHIPREV_ID_57780_A1		 0x57780001

#define  CHIPREV_ID_5717_A0		 0x05717000

#define  GET_ASIC_REV(CHIP_REV_ID)	((CHIP_REV_ID) >> 12)

#define   ASIC_REV_5700			 0x07

#define   ASIC_REV_5701			 0x00