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

Commit 3668bb8d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2017-10-10

This series contains updates to i40e only.

Stefano Brivio fixes the grammar in a function header comment.

Alex fixes a memory leak where we were not correctly placing the pages
from buffers that had been used to return a filter programming status
back on the ring.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 365ff9df 2b9478ff

drivers/net/ethernet/intel/i40e/i40e_nvm.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static i40e_status i40e_read_nvm_word_aq(struct i40e_hw *hw, u16 offset, 
}



/**

 * __i40e_read_nvm_word - Reads nvm word, assumes called does the locking

 * __i40e_read_nvm_word - Reads nvm word, assumes caller does the locking

 * @hw: pointer to the HW structure

 * @offset: offset of the Shadow RAM word to read (0x000000 - 0x001FFF)

 * @data: word read from the Shadow RAM

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+36 −27
Original line number Diff line number Diff line
@@ -1037,6 +1037,32 @@ static bool i40e_set_new_dynamic_itr(struct i40e_ring_container *rc) 
	return false;

}



/**

 * i40e_reuse_rx_page - page flip buffer and store it back on the ring

 * @rx_ring: rx descriptor ring to store buffers on

 * @old_buff: donor buffer to have page reused

 *

 * Synchronizes page for reuse by the adapter

 **/

static void i40e_reuse_rx_page(struct i40e_ring *rx_ring,

			       struct i40e_rx_buffer *old_buff)

{

	struct i40e_rx_buffer *new_buff;

	u16 nta = rx_ring->next_to_alloc;



	new_buff = &rx_ring->rx_bi[nta];



	/* update, and store next to alloc */

	nta++;

	rx_ring->next_to_alloc = (nta < rx_ring->count) ? nta : 0;



	/* transfer page from old buffer to new buffer */

	new_buff->dma		= old_buff->dma;

	new_buff->page		= old_buff->page;

	new_buff->page_offset	= old_buff->page_offset;

	new_buff->pagecnt_bias	= old_buff->pagecnt_bias;

}



/**

 * i40e_rx_is_programming_status - check for programming status descriptor

 * @qw: qword representing status_error_len in CPU ordering
@@ -1071,15 +1097,24 @@ static void i40e_clean_programming_status(struct i40e_ring *rx_ring, 
					  union i40e_rx_desc *rx_desc,

					  u64 qw)

{

	u32 ntc = rx_ring->next_to_clean + 1;

	struct i40e_rx_buffer *rx_buffer;

	u32 ntc = rx_ring->next_to_clean;

	u8 id;



	/* fetch, update, and store next to clean */

	rx_buffer = &rx_ring->rx_bi[ntc++];

	ntc = (ntc < rx_ring->count) ? ntc : 0;

	rx_ring->next_to_clean = ntc;



	prefetch(I40E_RX_DESC(rx_ring, ntc));



	/* place unused page back on the ring */

	i40e_reuse_rx_page(rx_ring, rx_buffer);

	rx_ring->rx_stats.page_reuse_count++;



	/* clear contents of buffer_info */

	rx_buffer->page = NULL;



	id = (qw & I40E_RX_PROG_STATUS_DESC_QW1_PROGID_MASK) >>

		  I40E_RX_PROG_STATUS_DESC_QW1_PROGID_SHIFT;
@@ -1638,32 +1673,6 @@ static bool i40e_cleanup_headers(struct i40e_ring *rx_ring, struct sk_buff *skb, 
	return false;

}



/**

 * i40e_reuse_rx_page - page flip buffer and store it back on the ring

 * @rx_ring: rx descriptor ring to store buffers on

 * @old_buff: donor buffer to have page reused

 *

 * Synchronizes page for reuse by the adapter

 **/

static void i40e_reuse_rx_page(struct i40e_ring *rx_ring,

			       struct i40e_rx_buffer *old_buff)

{

	struct i40e_rx_buffer *new_buff;

	u16 nta = rx_ring->next_to_alloc;



	new_buff = &rx_ring->rx_bi[nta];



	/* update, and store next to alloc */

	nta++;

	rx_ring->next_to_alloc = (nta < rx_ring->count) ? nta : 0;



	/* transfer page from old buffer to new buffer */

	new_buff->dma		= old_buff->dma;

	new_buff->page		= old_buff->page;

	new_buff->page_offset	= old_buff->page_offset;

	new_buff->pagecnt_bias	= old_buff->pagecnt_bias;

}



/**

 * i40e_page_is_reusable - check if any reuse is possible

 * @page: page struct to check