Commit eaeb3b74 authored May 25, 2019 by Dmitry Bogdanov Committed by David S. Miller May 27, 2019

net: aquantia: fix LRO with FCS error



Driver stops producing skbs on ring if a packet with FCS error
was coalesced into LRO session. Ring gets hang forever.

Thats a logical error in driver processing descriptors:
When rx_stat indicates MAC Error, next pointer and eop flags
are not filled. This confuses driver so it waits for descriptor 0
to be filled by HW.

Solution is fill next pointer and eop flag even for packets with FCS error.

Fixes: bab6de8f ("net: ethernet: aquantia: Atlantic A0 and B0 specific functions.")
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: Dmitry Bogdanov <dmitry.bogdanov@aquantia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f38f1ee8

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

+32 −29

Original line number	Diff line number	Diff line
		@@ -713,7 +713,7 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,
		if ((rx_stat & BIT(0)) \|\| rxd_wb->type & 0x1000U) {
		/* MAC error or DMA error */
		buff->is_error = 1U;
		} else {
		}
		if (self->aq_nic_cfg->is_rss) {
		/* last 4 byte */
		u16 rss_type = rxd_wb->type & 0xFU;
		@@ -733,6 +733,10 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,
		buff->next = 0U;
		buff->is_eop = 1U;
		} else {
		buff->len =
		rxd_wb->pkt_len > AQ_CFG_RX_FRAME_MAX ?
		AQ_CFG_RX_FRAME_MAX : rxd_wb->pkt_len;

		if (HW_ATL_B0_RXD_WB_STAT2_RSCCNT &
		rxd_wb->status) {
		/* LRO */
		@@ -747,7 +751,6 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,
		}
		}
		}
		}

		return aq_hw_err_from_flags(self);
		}