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

Commit c44f5f51 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Always use context 0, even for FCoE and TSO 



We were spending cycles separating the FCoE and TSO contexts even though we
always overwriting the context anyway.  Instead of doing that we can just
use context 0 for all descriptors.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8f4fbb9b

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c

+1 −2
Original line number Diff line number Diff line
@@ -550,9 +550,8 @@ int ixgbe_fso(struct ixgbe_ring *tx_ring, 
	/* set flag indicating FCOE to ixgbe_tx_map call */

	first->tx_flags |= IXGBE_TX_FLAGS_FCOE;



	/* mss_l4len_id: use 1 for FSO as TSO, no need for L4LEN */

	/* mss_l4len_id: use 0 for FSO as TSO, no need for L4LEN */

	mss_l4len_idx = skb_shinfo(skb)->gso_size << IXGBE_ADVTXD_MSS_SHIFT;

	mss_l4len_idx |= 1 << IXGBE_ADVTXD_IDX_SHIFT;



	/* vlan_macip_lens: HEADLEN, MACLEN, VLAN tag */

	vlan_macip_lens = skb_transport_offset(skb) +

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −10
Original line number Diff line number Diff line
@@ -5944,10 +5944,9 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring, 
	first->gso_segs = skb_shinfo(skb)->gso_segs;

	first->bytecount += (first->gso_segs - 1) * *hdr_len;



	/* mss_l4len_id: use 1 as index for TSO */

	/* mss_l4len_id: use 0 as index for TSO */

	mss_l4len_idx = l4len << IXGBE_ADVTXD_L4LEN_SHIFT;

	mss_l4len_idx |= skb_shinfo(skb)->gso_size << IXGBE_ADVTXD_MSS_SHIFT;

	mss_l4len_idx |= 1 << IXGBE_ADVTXD_IDX_SHIFT;



	/* vlan_macip_lens: HEADLEN, MACLEN, VLAN tag */

	vlan_macip_lens = skb_network_header_len(skb);
@@ -6073,14 +6072,6 @@ static void ixgbe_tx_olinfo_status(union ixgbe_adv_tx_desc *tx_desc, 
	if (tx_flags & IXGBE_TX_FLAGS_IPV4)

		olinfo_status |= cpu_to_le32(IXGBE_ADVTXD_POPTS_IXSM);



	/* use index 1 context for TSO/FSO/FCOE */

#ifdef IXGBE_FCOE

	if (tx_flags & (IXGBE_TX_FLAGS_TSO | IXGBE_TX_FLAGS_FCOE))

#else

	if (tx_flags & IXGBE_TX_FLAGS_TSO)

#endif

		olinfo_status |= cpu_to_le32(1 << IXGBE_ADVTXD_IDX_SHIFT);



	/*

	 * Check Context must be set if Tx switch is enabled, which it

	 * always is for case where virtual functions are running