ixgbe: Add function for testing status bits in Rx descriptor (f56e0cb1) · Commits · e / devices / android_kernel_fairphone_FP4

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

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -329,6 +329,13 @@ struct ixgbe_q_vector {
	#define IXGBE_10K_ITR 400		#define IXGBE_10K_ITR 400
	#define IXGBE_8K_ITR 500		#define IXGBE_8K_ITR 500

			/* ixgbe_test_staterr - tests bits in Rx descriptor status and error fields */
			static inline __le32 ixgbe_test_staterr(union ixgbe_adv_rx_desc *rx_desc,
			const u32 stat_err_bits)
			{
			return rx_desc->wb.upper.status_error & cpu_to_le32(stat_err_bits);
			}

	static inline u16 ixgbe_desc_unused(struct ixgbe_ring *ring)		static inline u16 ixgbe_desc_unused(struct ixgbe_ring *ring)
	{		{
	u16 ntc = ring->next_to_clean;		u16 ntc = ring->next_to_clean;
	@@ -618,8 +625,7 @@ extern int ixgbe_fso(struct ixgbe_ring tx_ring, struct sk_buff skb,
	extern void ixgbe_cleanup_fcoe(struct ixgbe_adapter *adapter);		extern void ixgbe_cleanup_fcoe(struct ixgbe_adapter *adapter);
	extern int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,		extern int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
	union ixgbe_adv_rx_desc *rx_desc,		union ixgbe_adv_rx_desc *rx_desc,
	struct sk_buff *skb,		struct sk_buff *skb);
	u32 staterr);
	extern int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,		extern int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
	struct scatterlist *sgl, unsigned int sgc);		struct scatterlist *sgl, unsigned int sgc);
	extern int ixgbe_fcoe_ddp_target(struct net_device *netdev, u16 xid,		extern int ixgbe_fcoe_ddp_target(struct net_device *netdev, u16 xid,

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

+35 −24

Original line number	Original line	Diff line number	Diff line
	@@ -357,22 +357,20 @@ int ixgbe_fcoe_ddp_target(struct net_device *netdev, u16 xid,
	*/		*/
	int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,		int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
	union ixgbe_adv_rx_desc *rx_desc,		union ixgbe_adv_rx_desc *rx_desc,
	struct sk_buff *skb,		struct sk_buff *skb)
	u32 staterr)
	{		{
	u16 xid;
	u32 fctl;
	u32 fceofe, fcerr, fcstat;
	int rc = -EINVAL;		int rc = -EINVAL;
	struct ixgbe_fcoe *fcoe;		struct ixgbe_fcoe *fcoe;
	struct ixgbe_fcoe_ddp *ddp;		struct ixgbe_fcoe_ddp *ddp;
	struct fc_frame_header *fh;		struct fc_frame_header *fh;
	struct fcoe_crc_eof *crc;		struct fcoe_crc_eof *crc;
			__le32 fcerr = ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_ERR_FCERR);
			__le32 ddp_err;
			u32 fctl;
			u16 xid;

	fcerr = (staterr & IXGBE_RXDADV_ERR_FCERR);		if (fcerr == cpu_to_le32(IXGBE_FCERR_BADCRC))
	fceofe = (staterr & IXGBE_RXDADV_ERR_FCEOFE);		skb->ip_summed = CHECKSUM_NONE;
	if (fcerr == IXGBE_FCERR_BADCRC)
	skb_checksum_none_assert(skb);
	else		else
	skb->ip_summed = CHECKSUM_UNNECESSARY;		skb->ip_summed = CHECKSUM_UNNECESSARY;

	@@ -382,6 +380,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
	else		else
	fh = (struct fc_frame_header *)(skb->data +		fh = (struct fc_frame_header *)(skb->data +
	sizeof(struct fcoe_hdr));		sizeof(struct fcoe_hdr));

	fctl = ntoh24(fh->fh_f_ctl);		fctl = ntoh24(fh->fh_f_ctl);
	if (fctl & FC_FC_EX_CTX)		if (fctl & FC_FC_EX_CTX)
	xid = be16_to_cpu(fh->fh_ox_id);		xid = be16_to_cpu(fh->fh_ox_id);
	@@ -396,27 +395,39 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
	if (!ddp->udl)		if (!ddp->udl)
	goto ddp_out;		goto ddp_out;

	if (fcerr \| fceofe)		ddp_err = ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_ERR_FCEOFE \|
			IXGBE_RXDADV_ERR_FCERR);
			if (ddp_err)
	goto ddp_out;		goto ddp_out;

	fcstat = (staterr & IXGBE_RXDADV_STAT_FCSTAT);		switch (ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_FCSTAT)) {
	if (fcstat) {		/* return 0 to bypass going to ULD for DDPed data */
			case __constant_cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_DDP):
	/* update length of DDPed data */		/* update length of DDPed data */
	ddp->len = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);		ddp->len = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
	/* unmap the sg list when FCP_RSP is received */		rc = 0;
	if (fcstat == IXGBE_RXDADV_STAT_FCSTAT_FCPRSP) {		break;
			/* unmap the sg list when FCPRSP is received */
			case __constant_cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_FCPRSP):
	pci_unmap_sg(adapter->pdev, ddp->sgl,		pci_unmap_sg(adapter->pdev, ddp->sgl,
	ddp->sgc, DMA_FROM_DEVICE);		ddp->sgc, DMA_FROM_DEVICE);
	ddp->err = (fcerr \| fceofe);		ddp->err = ddp_err;
	ddp->sgl = NULL;		ddp->sgl = NULL;
	ddp->sgc = 0;		ddp->sgc = 0;
	}		/* fall through */
	/* return 0 to bypass going to ULD for DDPed data */		/* if DDP length is present pass it through to ULD */
	if (fcstat == IXGBE_RXDADV_STAT_FCSTAT_DDP)		case __constant_cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_NODDP):
	rc = 0;		/* update length of DDPed data */
	else if (ddp->len)		ddp->len = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
			if (ddp->len)
	rc = ddp->len;		rc = ddp->len;
			break;
			/* no match will return as an error */
			case __constant_cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_NOMTCH):
			default:
			break;
	}		}

	/* In target mode, check the last data frame of the sequence.		/* In target mode, check the last data frame of the sequence.
	* For DDP in target mode, data is already DDPed but the header		* For DDP in target mode, data is already DDPed but the header
	* indication of the last data frame ould allow is to tell if we		* indication of the last data frame ould allow is to tell if we

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

+22 −29

Original line number	Original line	Diff line number	Diff line
	@@ -1019,25 +1019,23 @@ static inline bool ixgbe_rx_is_fcoe(struct ixgbe_adapter *adapter,
	* ixgbe_receive_skb - Send a completed packet up the stack		* ixgbe_receive_skb - Send a completed packet up the stack
	* @adapter: board private structure		* @adapter: board private structure
	* @skb: packet to send up		* @skb: packet to send up
	* @status: hardware indication of status of receive
	* @rx_ring: rx descriptor ring (for a specific queue) to setup		* @rx_ring: rx descriptor ring (for a specific queue) to setup
	* @rx_desc: rx descriptor		* @rx_desc: rx descriptor
	**/		**/
	static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector,		static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector,
	struct sk_buff *skb, u8 status,		struct sk_buff *skb,
	struct ixgbe_ring *ring,		struct ixgbe_ring *ring,
	union ixgbe_adv_rx_desc *rx_desc)		union ixgbe_adv_rx_desc *rx_desc)
	{		{
	struct ixgbe_adapter *adapter = q_vector->adapter;		struct ixgbe_adapter *adapter = q_vector->adapter;
	struct napi_struct *napi = &q_vector->napi;
	bool is_vlan = (status & IXGBE_RXD_STAT_VP);
	u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);

	if (is_vlan && (tag & VLAN_VID_MASK))		if (ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
	__vlan_hwaccel_put_tag(skb, tag);		u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan);
			__vlan_hwaccel_put_tag(skb, vid);
			}

	if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL))		if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL))
	napi_gro_receive(napi, skb);		napi_gro_receive(&q_vector->napi, skb);
	else		else
	netif_rx(skb);		netif_rx(skb);
	}		}
	@@ -1047,12 +1045,10 @@ static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector,
	* @adapter: address of board private structure		* @adapter: address of board private structure
	* @status_err: hardware indication of status of receive		* @status_err: hardware indication of status of receive
	* @skb: skb currently being received and modified		* @skb: skb currently being received and modified
	* @status_err: status error value of last descriptor in packet
	**/		**/
	static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,		static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,
	union ixgbe_adv_rx_desc *rx_desc,		union ixgbe_adv_rx_desc *rx_desc,
	struct sk_buff *skb,		struct sk_buff *skb)
	u32 status_err)
	{		{
	skb->ip_summed = CHECKSUM_NONE;		skb->ip_summed = CHECKSUM_NONE;

	@@ -1061,16 +1057,16 @@ static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,
	return;		return;

	/* if IP and error */		/* if IP and error */
	if ((status_err & IXGBE_RXD_STAT_IPCS) &&		if (ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_IPCS) &&
	(status_err & IXGBE_RXDADV_ERR_IPE)) {		ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_ERR_IPE)) {
	adapter->hw_csum_rx_error++;		adapter->hw_csum_rx_error++;
	return;		return;
	}		}

	if (!(status_err & IXGBE_RXD_STAT_L4CS))		if (!ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_L4CS))
	return;		return;

	if (status_err & IXGBE_RXDADV_ERR_TCPE) {		if (ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_ERR_TCPE)) {
	u16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;		u16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;

	/*		/*
	@@ -1091,6 +1087,7 @@ static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,

	static inline void ixgbe_release_rx_desc(struct ixgbe_ring *rx_ring, u32 val)		static inline void ixgbe_release_rx_desc(struct ixgbe_ring *rx_ring, u32 val)
	{		{
			rx_ring->next_to_use = val;
	/*		/*
	* Force memory writes to complete before letting h/w		* Force memory writes to complete before letting h/w
	* know there are new descriptors to fetch. (Only		* know there are new descriptors to fetch. (Only
	@@ -1219,11 +1216,9 @@ void ixgbe_alloc_rx_buffers(struct ixgbe_ring *rx_ring, u16 cleaned_count)

	i += rx_ring->count;		i += rx_ring->count;

	if (rx_ring->next_to_use != i) {		if (rx_ring->next_to_use != i)
	rx_ring->next_to_use = i;
	ixgbe_release_rx_desc(rx_ring, i);		ixgbe_release_rx_desc(rx_ring, i);
	}		}
	}

	static inline u16 ixgbe_get_hlen(union ixgbe_adv_rx_desc *rx_desc)		static inline u16 ixgbe_get_hlen(union ixgbe_adv_rx_desc *rx_desc)
	{		{
	@@ -1469,15 +1464,13 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
	#ifdef IXGBE_FCOE		#ifdef IXGBE_FCOE
	int ddp_bytes = 0;		int ddp_bytes = 0;
	#endif /* IXGBE_FCOE */		#endif /* IXGBE_FCOE */
	u32 staterr;
	u16 i;		u16 i;
	u16 cleaned_count = 0;		u16 cleaned_count = 0;

	i = rx_ring->next_to_clean;		i = rx_ring->next_to_clean;
	rx_desc = IXGBE_RX_DESC_ADV(rx_ring, i);		rx_desc = IXGBE_RX_DESC_ADV(rx_ring, i);
	staterr = le32_to_cpu(rx_desc->wb.upper.status_error);

	while (staterr & IXGBE_RXD_STAT_DD) {		while (ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_DD)) {
	u32 upper_len = 0;		u32 upper_len = 0;

	rmb(); /* read descriptor and rx_buffer_info after status DD */		rmb(); /* read descriptor and rx_buffer_info after status DD */
	@@ -1553,12 +1546,13 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
	prefetch(next_rxd);		prefetch(next_rxd);
	cleaned_count++;		cleaned_count++;

	if (!(staterr & IXGBE_RXD_STAT_EOP)) {		if ((!ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_EOP))) {
	struct ixgbe_rx_buffer *next_buffer;		struct ixgbe_rx_buffer *next_buffer;
	u32 nextp;		u32 nextp;

	if (IXGBE_CB(skb)->append_cnt) {		if (IXGBE_CB(skb)->append_cnt) {
	nextp = staterr & IXGBE_RXDADV_NEXTP_MASK;		nextp = le32_to_cpu(
			rx_desc->wb.upper.status_error);
	nextp >>= IXGBE_RXDADV_NEXTP_SHIFT;		nextp >>= IXGBE_RXDADV_NEXTP_SHIFT;
	} else {		} else {
	nextp = i;		nextp = i;
	@@ -1597,12 +1591,13 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
	ixgbe_update_rsc_stats(rx_ring, skb);		ixgbe_update_rsc_stats(rx_ring, skb);

	/* ERR_MASK will only have valid bits if EOP set */		/* ERR_MASK will only have valid bits if EOP set */
	if (unlikely(staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK)) {		if (unlikely(ixgbe_test_staterr(rx_desc,
			IXGBE_RXDADV_ERR_FRAME_ERR_MASK))) {
	dev_kfree_skb_any(skb);		dev_kfree_skb_any(skb);
	goto next_desc;		goto next_desc;
	}		}

	ixgbe_rx_checksum(adapter, rx_desc, skb, staterr);		ixgbe_rx_checksum(adapter, rx_desc, skb);
	if (adapter->netdev->features & NETIF_F_RXHASH)		if (adapter->netdev->features & NETIF_F_RXHASH)
	ixgbe_rx_hash(rx_desc, skb);		ixgbe_rx_hash(rx_desc, skb);

	@@ -1614,15 +1609,14 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
	#ifdef IXGBE_FCOE		#ifdef IXGBE_FCOE
	/* if ddp, not passing to ULD unless for FCP_RSP or error */		/* if ddp, not passing to ULD unless for FCP_RSP or error */
	if (ixgbe_rx_is_fcoe(adapter, rx_desc)) {		if (ixgbe_rx_is_fcoe(adapter, rx_desc)) {
	ddp_bytes = ixgbe_fcoe_ddp(adapter, rx_desc, skb,		ddp_bytes = ixgbe_fcoe_ddp(adapter, rx_desc, skb);
	staterr);
	if (!ddp_bytes) {		if (!ddp_bytes) {
	dev_kfree_skb_any(skb);		dev_kfree_skb_any(skb);
	goto next_desc;		goto next_desc;
	}		}
	}		}
	#endif /* IXGBE_FCOE */		#endif /* IXGBE_FCOE */
	ixgbe_receive_skb(q_vector, skb, staterr, rx_ring, rx_desc);		ixgbe_receive_skb(q_vector, skb, rx_ring, rx_desc);

	budget--;		budget--;
	next_desc:		next_desc:
	@@ -1637,7 +1631,6 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,

	/* use prefetched values */		/* use prefetched values */
	rx_desc = next_rxd;		rx_desc = next_rxd;
	staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
	}		}

	rx_ring->next_to_clean = i;		rx_ring->next_to_clean = i;