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

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

tg3: Remove 4G_DMA_BNDRY_BUG flag 



Now that all chips have this bug, the flag checks become useless code.
This patch removes the flag.

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

drivers/net/tg3.c

+3 −11
Original line number Diff line number Diff line
@@ -5822,8 +5822,7 @@ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi, 
		/* Make sure new skb does not cross any 4G boundaries.

		 * Drop the packet if it does.

		 */

		} else if (tg3_flag(tp, 4G_DMA_BNDRY_BUG) &&

			   tg3_4g_overflow_test(new_addr, new_skb->len)) {

		} else if (tg3_4g_overflow_test(new_addr, new_skb->len)) {

			pci_unmap_single(tp->pdev, new_addr, new_skb->len,

					 PCI_DMA_TODEVICE);

			ret = -1;
@@ -6018,8 +6017,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (tg3_flag(tp, SHORT_DMA_BUG) && len <= 8)

		would_hit_hwbug = 1;



	if (tg3_flag(tp, 4G_DMA_BNDRY_BUG) &&

	    tg3_4g_overflow_test(mapping, len))

	if (tg3_4g_overflow_test(mapping, len))

		would_hit_hwbug = 1;



	if (tg3_40bit_overflow_test(tp, mapping, len))
@@ -6055,8 +6053,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) 
			    len <= 8)

				would_hit_hwbug = 1;



			if (tg3_flag(tp, 4G_DMA_BNDRY_BUG) &&

			    tg3_4g_overflow_test(mapping, len))

			if (tg3_4g_overflow_test(mapping, len))

				would_hit_hwbug = 1;



			if (tg3_40bit_overflow_test(tp, mapping, len))
@@ -13703,11 +13700,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
		}

	}



	/* All chips can get confused if TX buffers

	 * straddle the 4GB address boundary.

	 */

	tg3_flag_set(tp, 4G_DMA_BNDRY_BUG);



	if (tg3_flag(tp, 5755_PLUS))

		tg3_flag_set(tp, SHORT_DMA_BUG);

drivers/net/tg3.h

+0 −1
Original line number Diff line number Diff line
@@ -2896,7 +2896,6 @@ enum TG3_FLAGS { 
	TG3_FLAG_NO_NVRAM,

	TG3_FLAG_ENABLE_RSS,

	TG3_FLAG_ENABLE_TSS,

	TG3_FLAG_4G_DMA_BNDRY_BUG,

	TG3_FLAG_SHORT_DMA_BUG,

	TG3_FLAG_USE_JUMBO_BDFLAG,

	TG3_FLAG_L1PLLPD_EN,