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

Commit 8b75451b authored by Neerav Parikh's avatar Neerav Parikh Committed by Jeff Kirsher
Browse files

ixgbe: Fix MDD events generated when FCoE+SRIOV are enabled 



When FCoE is enabled with SR-IOV on the X550 NIC the hardware
generates MDD events.

This patch fixes these by setting the expected values in the
Tx context descriptors for FCoE/FIP frames and adding a flush
after writing the RDLEN register.

Signed-off-by: default avatarNeerav Parikh <neerav.parikh@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b262a9a7

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

+4 −1
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ int ixgbe_fso(struct ixgbe_ring *tx_ring, 
	u32 vlan_macip_lens;

	u32 fcoe_sof_eof = 0;

	u32 mss_l4len_idx;

	u32 type_tucmd = IXGBE_ADVTXT_TUCMD_FCOE;

	u8 sof, eof;



	if (skb_is_gso(skb) && (skb_shinfo(skb)->gso_type != SKB_GSO_FCOE)) {
@@ -593,6 +594,8 @@ int ixgbe_fso(struct ixgbe_ring *tx_ring, 
					       skb_shinfo(skb)->gso_size);

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

		first->tx_flags |= IXGBE_TX_FLAGS_TSO;

		/* Hardware expects L4T to be RSV for FCoE TSO */

		type_tucmd |= IXGBE_ADVTXD_TUCMD_L4T_RSV;

	}



	/* set flag indicating FCOE to ixgbe_tx_map call */
@@ -610,7 +613,7 @@ int ixgbe_fso(struct ixgbe_ring *tx_ring, 


	/* write context desc */

	ixgbe_tx_ctxtdesc(tx_ring, vlan_macip_lens, fcoe_sof_eof,

			  IXGBE_ADVTXT_TUCMD_FCOE, mss_l4len_idx);

			  type_tucmd, mss_l4len_idx);



	return 0;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -3619,6 +3619,9 @@ void ixgbe_configure_rx_ring(struct ixgbe_adapter *adapter, 
	IXGBE_WRITE_REG(hw, IXGBE_RDBAH(reg_idx), (rdba >> 32));

	IXGBE_WRITE_REG(hw, IXGBE_RDLEN(reg_idx),

			ring->count * sizeof(union ixgbe_adv_rx_desc));

	/* Force flushing of IXGBE_RDLEN to prevent MDD */

	IXGBE_WRITE_FLUSH(hw);



	IXGBE_WRITE_REG(hw, IXGBE_RDH(reg_idx), 0);

	IXGBE_WRITE_REG(hw, IXGBE_RDT(reg_idx), 0);

	ring->tail = adapter->io_addr + IXGBE_RDT(reg_idx);

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+1 −0
Original line number Diff line number Diff line
@@ -2780,6 +2780,7 @@ struct ixgbe_adv_tx_context_desc { 
#define IXGBE_ADVTXD_TUCMD_L4T_UDP   0x00000000  /* L4 Packet TYPE of UDP */

#define IXGBE_ADVTXD_TUCMD_L4T_TCP   0x00000800  /* L4 Packet TYPE of TCP */

#define IXGBE_ADVTXD_TUCMD_L4T_SCTP  0x00001000  /* L4 Packet TYPE of SCTP */

#define IXGBE_ADVTXD_TUCMD_L4T_RSV     0x00001800 /* RSV L4 Packet TYPE */

#define IXGBE_ADVTXD_TUCMD_MKRREQ    0x00002000 /*Req requires Markers and CRC*/

#define IXGBE_ADVTXD_POPTS_IPSEC      0x00000400 /* IPSec offload request */

#define IXGBE_ADVTXD_TUCMD_IPSEC_TYPE_ESP 0x00002000 /* IPSec Type ESP */