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

Commit 57ef5527 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-11-23

This series contains updates to ixgbe, ixgbevf, fm10k, i40e and i40evf.

Jacob fixes an issue where VF could attempt to read queues it does not own,
so prevent this we check queue 0 before we continue.

Matthew fixes the MTU for jumbo frames for fm10k.

Julia Lawall cleans up a unneeded NULL test in ixgbe.

Mark cleans up a redundant header inclusion.  Adds KR mode support for
CS4227 chip.  Cleaned up diagnostic code, which is no longer needed, for
the CS4227 chip.

Jean Sacren fixes kernel documentation for ixgbe.

Alex Duyck fixes an fm10k and ixgbe issue in which the polling routine would
increase the budget for receive to at least 1 per queue if multiple queues were
present.  This would result in receive packets being processed when the budget
was 0 which is meant to indicate that no receive can be handled.  Also fixes
an ixgbevf performance issue where netperf test will starve for memory in the
time form one transmit interrupt to the next, so limit lowest interrupt rate
for adaptive interrupt moderation to 12K.  Fixed up ixgbe and ixgbevf to
use napi_schedule_irqoff() where the drivers were run from hard interrupt
context or with interrupts already disabled in netpoll.

Jesse fixes a compiler warning about an unused variable for i40evf.

John Greene fixes an issue with ixgbevf, where if the VF driver is loaded
while the corresponding PH interface is down, the driver assigns a random
MAC address, can be overwritten with the value of hw->mac.perm_addr which
is 0 at that point.  So avoid this case by initializing hw->mac.perm_addr
to the randomly generated address and do not set it unless we receive an
ACK from ixgbe.

Rasmus Villemoes cleans up some confusing code in i40e debugfs code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3b22dae3 0286c67e

drivers/net/ethernet/intel/fm10k/fm10k.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "fm10k_pf.h"

#include "fm10k_vf.h"



#define FM10K_MAX_JUMBO_FRAME_SIZE	15358	/* Maximum supported size 15K */

#define FM10K_MAX_JUMBO_FRAME_SIZE	15342	/* Maximum supported size 15K */



#define MAX_QUEUES	FM10K_MAX_QUEUES_PF

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+4 −0
Original line number Diff line number Diff line
@@ -1428,6 +1428,10 @@ static int fm10k_poll(struct napi_struct *napi, int budget) 
	fm10k_for_each_ring(ring, q_vector->tx)

		clean_complete &= fm10k_clean_tx_irq(q_vector, ring);



	/* Handle case where we are called by netpoll with a budget of 0 */

	if (budget <= 0)

		return budget;



	/* attempt to distribute budget to each queue fairly, but don't

	 * allow the budget to go below 1 because we'll exit polling

	 */

drivers/net/ethernet/intel/fm10k/fm10k_type.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ struct fm10k_hw; 
#define FM10K_PCIE_SRIOV_CTRL_VFARI		0x10



#define FM10K_ERR_PARAM				-2

#define FM10K_ERR_NO_RESOURCES			-3

#define FM10K_ERR_REQUESTS_PENDING		-4

#define FM10K_ERR_RESET_REQUESTED		-5

#define FM10K_ERR_DMA_PENDING			-6

drivers/net/ethernet/intel/fm10k/fm10k_vf.c

+6 −1
Original line number Diff line number Diff line
@@ -103,7 +103,12 @@ static s32 fm10k_init_hw_vf(struct fm10k_hw *hw) 
	s32 err;

	u16 i;



	/* assume we always have at least 1 queue */

	/* verify we have at least 1 queue */

	if (!~fm10k_read_reg(hw, FM10K_TXQCTL(0)) ||

	    !~fm10k_read_reg(hw, FM10K_RXQCTL(0)))

		return FM10K_ERR_NO_RESOURCES;



	/* determine how many queues we have */

	for (i = 1; tqdloc0 && (i < FM10K_MAX_QUEUES_POOL); i++) {

		/* verify the Descriptor cache offsets are increasing */

		tqdloc = ~fm10k_read_reg(hw, FM10K_TQDLOC(i));

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

+10 −14
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ static ssize_t i40e_dbg_dump_read(struct file *filp, char __user *buffer, 
	len = min_t(int, count, (i40e_dbg_dump_data_len - *ppos));



	bytes_not_copied = copy_to_user(buffer, &i40e_dbg_dump_buf[*ppos], len);

	if (bytes_not_copied < 0)

		return bytes_not_copied;

	if (bytes_not_copied)

		return -EFAULT;



	*ppos += len;

	return len;
@@ -353,8 +353,8 @@ static ssize_t i40e_dbg_command_read(struct file *filp, char __user *buffer, 
	bytes_not_copied = copy_to_user(buffer, buf, len);

	kfree(buf);



	if (bytes_not_copied < 0)

		return bytes_not_copied;

	if (bytes_not_copied)

		return -EFAULT;



	*ppos = len;

	return len;
@@ -981,12 +981,10 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
	if (!cmd_buf)

		return count;

	bytes_not_copied = copy_from_user(cmd_buf, buffer, count);

	if (bytes_not_copied < 0) {

	if (bytes_not_copied) {

		kfree(cmd_buf);

		return bytes_not_copied;

		return -EFAULT;

	}

	if (bytes_not_copied > 0)

		count -= bytes_not_copied;

	cmd_buf[count] = '\0';



	cmd_buf_tmp = strchr(cmd_buf, '\n');
@@ -2034,8 +2032,8 @@ static ssize_t i40e_dbg_netdev_ops_read(struct file *filp, char __user *buffer, 
	bytes_not_copied = copy_to_user(buffer, buf, len);

	kfree(buf);



	if (bytes_not_copied < 0)

		return bytes_not_copied;

	if (bytes_not_copied)

		return -EFAULT;



	*ppos = len;

	return len;
@@ -2068,10 +2066,8 @@ static ssize_t i40e_dbg_netdev_ops_write(struct file *filp, 
	memset(i40e_dbg_netdev_ops_buf, 0, sizeof(i40e_dbg_netdev_ops_buf));

	bytes_not_copied = copy_from_user(i40e_dbg_netdev_ops_buf,

					  buffer, count);

	if (bytes_not_copied < 0)

		return bytes_not_copied;

	else if (bytes_not_copied > 0)

		count -= bytes_not_copied;

	if (bytes_not_copied)

		return -EFAULT;

	i40e_dbg_netdev_ops_buf[count] = '\0';



	buf_tmp = strchr(i40e_dbg_netdev_ops_buf, '\n');