From: Andre Guedes Date: Mon, 10 Aug 2020 14:08:32 -0700 Subject: [Intel-wired-lan] [PATCH 3/3] igc: Fix SRRCTL register setup In-Reply-To: <20200810210832.34699-1-andre.guedes@intel.com> References: <20200810210832.34699-1-andre.guedes@intel.com> Message-ID: <20200810210832.34699-3-andre.guedes@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: intel-wired-lan@osuosl.org List-ID: SRRCTL register is set with 'one buffer descriptor' option (see DESCTYPE setting a few lines below) so setting BSIZEHEADER bits is pointless. They should be zero. Also, since there is no header buffer we should set the header buffer address field from the receive descriptor to zero for the sake of consistency. Signed-off-by: Andre Guedes --- drivers/net/ethernet/intel/igc/igc_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 0c481dc906ad..a5d825d44002 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -531,14 +531,11 @@ static void igc_configure_rx_ring(struct igc_adapter *adapter, ring->next_to_clean = 0; ring->next_to_use = 0; - /* set descriptor configuration */ - srrctl = IGC_RX_HDR_LEN << IGC_SRRCTL_BSIZEHDRSIZE_SHIFT; if (ring_uses_large_buffer(ring)) srrctl |= IGC_RXBUFFER_3072 >> IGC_SRRCTL_BSIZEPKT_SHIFT; else srrctl |= IGC_RXBUFFER_2048 >> IGC_SRRCTL_BSIZEPKT_SHIFT; srrctl |= IGC_SRRCTL_DESCTYPE_ADV_ONEBUF; - wr32(IGC_SRRCTL(reg_idx), srrctl); rxdctl |= IGC_RX_PTHRESH; @@ -1869,6 +1866,7 @@ static void igc_alloc_rx_buffers(struct igc_ring *rx_ring, u16 cleaned_count) * because each write-back erases this info. */ rx_desc->read.pkt_addr = cpu_to_le64(bi->dma + bi->page_offset); + rx_desc->read.hdr_addr = 0; rx_desc++; bi++; -- 2.26.2