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

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

igb: Add workaround for byte swapped VLAN on i350 local traffic 



On i350 when traffic is looped back from a VF to the PF the value is byte
swapped from the normal format.  In order to address this we need to add a
flag indicating that the ring will need to byte swap the loopback packets
prior to processing them.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9ab64ba3

drivers/net/ethernet/intel/igb/e1000_defines.h

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
#define E1000_RXD_STAT_TCPCS    0x20    /* TCP xsum calculated */

#define E1000_RXD_STAT_TS       0x10000 /* Pkt was time stamped */



#define E1000_RXDEXT_STATERR_LB    0x00040000

#define E1000_RXDEXT_STATERR_CE    0x01000000

#define E1000_RXDEXT_STATERR_SE    0x02000000

#define E1000_RXDEXT_STATERR_SEQ   0x04000000

drivers/net/ethernet/intel/igb/igb.h

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ struct igb_ring { 


enum e1000_ring_flags_t {

	IGB_RING_FLAG_RX_SCTP_CSUM,

	IGB_RING_FLAG_RX_LB_VLAN_BSWAP,

	IGB_RING_FLAG_TX_CTX_IDX,

	IGB_RING_FLAG_TX_DETECT_HANG

};

drivers/net/ethernet/intel/igb/igb_main.c

+23 −6
Original line number Diff line number Diff line
@@ -735,6 +735,11 @@ static int igb_alloc_queues(struct igb_adapter *adapter) 
		/* set flag indicating ring supports SCTP checksum offload */

		if (adapter->hw.mac.type >= e1000_82576)

			set_bit(IGB_RING_FLAG_RX_SCTP_CSUM, &ring->flags);



		/* On i350, loopback VLAN packets have the tag byte-swapped. */

		if (adapter->hw.mac.type == e1000_i350)

			set_bit(IGB_RING_FLAG_RX_LB_VLAN_BSWAP, &ring->flags);



		adapter->rx_ring[i] = ring;

	}

	/* Restore the adapter's original node */
@@ -5864,6 +5869,23 @@ static void igb_rx_hwtstamp(struct igb_q_vector *q_vector, 


	igb_systim_to_hwtstamp(adapter, skb_hwtstamps(skb), regval);

}



static void igb_rx_vlan(struct igb_ring *ring,

			union e1000_adv_rx_desc *rx_desc,

			struct sk_buff *skb)

{

	if (igb_test_staterr(rx_desc, E1000_RXD_STAT_VP)) {

		u16 vid;

		if (igb_test_staterr(rx_desc, E1000_RXDEXT_STATERR_LB) &&

		    test_bit(IGB_RING_FLAG_RX_LB_VLAN_BSWAP, &ring->flags))

			vid = be16_to_cpu(rx_desc->wb.upper.vlan);

		else

			vid = le16_to_cpu(rx_desc->wb.upper.vlan);



		__vlan_hwaccel_put_tag(skb, vid);

	}

}



static inline u16 igb_get_hlen(union e1000_adv_rx_desc *rx_desc)

{

	/* HW will not DMA in data larger than the given buffer, even if it
@@ -5960,12 +5982,7 @@ static bool igb_clean_rx_irq(struct igb_q_vector *q_vector, int budget) 
		igb_rx_hwtstamp(q_vector, rx_desc, skb);

		igb_rx_hash(rx_ring, rx_desc, skb);

		igb_rx_checksum(rx_ring, rx_desc, skb);



		if (igb_test_staterr(rx_desc, E1000_RXD_STAT_VP)) {

			u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan);



			__vlan_hwaccel_put_tag(skb, vid);

		}

		igb_rx_vlan(rx_ring, rx_desc, skb);



		total_bytes += skb->len;

		total_packets++;