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

Commit d7ed7474 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/net-next 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-03-07

This series contains updates to i40e and i40evf only.

Most notably, Greg provides the patch to remove the dreaded configfs
changes in the driver.

Shannon cleans up a sparse warning by simply straighting out the code
so it is less convoluted.  Fixes an issue where the vector allocation
was trying too hard to save vectors for VMDq, to the point of not giving
the PF enough when in a tight situation, such as an NPAR partition.
Changed the driver to make sure that the PF will get all the queues and
vectors it wants to fill out its destiny.  Cleans up reporting to only
print the port and VEB stats if it is the first partition of a
multiplexed port.

Catherine cleans up some duplicated code by simply removing the duplicate
code.

Kamil cleans up the driver by removing an un-needed endian conversion
because it is already done by a register read function.

Jesse fixes a variable width of a datatype, where a u16 should have been
a u32.  Also cleans up debug_read_register() to resolve some sparse
warnings.  Updates the driver to use prefetch() to get the next Tx
descriptor, like in ixgbe, to improve performance.

Akeem moves around code to enable/disable loopback so that other non-SRIOV
supported driver functions can take advantage of the changes.

Anjali cleans up the logging for adding/deleting FD-SB filters, since
ethtool shows all the filters on an interface.  Updates the driver to
use l4_tunnel type generically to keep code flow simple.  Simplifies
the RSS code since the driver initializes the rss_size_max in sw_init.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 04b0a80b cd77f5e1

drivers/net/ethernet/intel/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -303,15 +303,6 @@ config I40E_FCOE 


	  If unsure, say N.



config I40E_CONFIGFS_FS

	bool "Config File System Support (configfs)"

	default n

	depends on I40E && CONFIGFS_FS && !(I40E=y && CONFIGFS_FS=m)

	---help---

	  Provides support for the configfs file system for additional

	  driver configuration.  Say Y here if you want to use the

	  configuration file system in the driver.



config I40EVF

	tristate "Intel(R) XL710 X710 Virtual Function Ethernet support"

	depends on PCI_MSI

drivers/net/ethernet/intel/i40e/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ i40e-objs := i40e_main.o \ 
	i40e_hmc.o	\

	i40e_lan_hmc.o	\

	i40e_nvm.o	\

	i40e_configfs.o	\

	i40e_debugfs.o	\

	i40e_diag.o	\

	i40e_txrx.o	\

drivers/net/ethernet/intel/i40e/i40e.h

+6 −8
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ struct i40e_lump_tracking { 
#define I40E_FDIR_MAX_RAW_PACKET_SIZE	512

#define I40E_FDIR_BUFFER_FULL_MARGIN	10

#define I40E_FDIR_BUFFER_HEAD_ROOM	32

#define I40E_FDIR_BUFFER_HEAD_ROOM_FOR_ATR (I40E_FDIR_BUFFER_HEAD_ROOM * 4)



enum i40e_fd_stat_idx {

	I40E_FD_STAT_ATR,
@@ -276,7 +277,7 @@ struct i40e_pf { 
	enum i40e_interrupt_policy int_policy;

	u16 rx_itr_default;

	u16 tx_itr_default;

	u16 msg_enable;

	u32 msg_enable;

	char int_name[I40E_INT_NAME_STR_LEN];

	u16 adminq_work_limit; /* num of admin receive queue desc to process */

	unsigned long service_timer_period;
@@ -636,9 +637,10 @@ int i40e_program_fdir_filter(struct i40e_fdir_filter *fdir_data, u8 *raw_packet, 
int i40e_add_del_fdir(struct i40e_vsi *vsi,

		      struct i40e_fdir_filter *input, bool add);

void i40e_fdir_check_and_reenable(struct i40e_pf *pf);

int i40e_get_current_fd_count(struct i40e_pf *pf);

int i40e_get_cur_guaranteed_fd_count(struct i40e_pf *pf);

int i40e_get_current_atr_cnt(struct i40e_pf *pf);

u32 i40e_get_current_fd_count(struct i40e_pf *pf);

u32 i40e_get_cur_guaranteed_fd_count(struct i40e_pf *pf);

u32 i40e_get_current_atr_cnt(struct i40e_pf *pf);

u32 i40e_get_global_fd_count(struct i40e_pf *pf);

bool i40e_set_ntuple(struct i40e_pf *pf, netdev_features_t features);

void i40e_set_ethtool_ops(struct net_device *netdev);

struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,
@@ -747,10 +749,6 @@ int i40e_ptp_get_ts_config(struct i40e_pf *pf, struct ifreq *ifr); 
void i40e_ptp_init(struct i40e_pf *pf);

void i40e_ptp_stop(struct i40e_pf *pf);

int i40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi);

#if IS_ENABLED(CONFIG_I40E_CONFIGFS_FS)

int i40e_configfs_init(void);

void i40e_configfs_exit(void);

#endif /* CONFIG_I40E_CONFIGFS_FS */

i40e_status i40e_get_npar_bw_setting(struct i40e_pf *pf);

i40e_status i40e_set_npar_bw_setting(struct i40e_pf *pf);

i40e_status i40e_commit_npar_bw_setting(struct i40e_pf *pf);

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

+29 −31
Original line number Diff line number Diff line
@@ -85,9 +85,8 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 
{

	struct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc;

	u16 len = le16_to_cpu(aq_desc->datalen);

	u8 *aq_buffer = (u8 *)buffer;

	u32 data[4];

	u32 i = 0;

	u8 *buf = (u8 *)buffer;

	u16 i = 0;



	if ((!(mask & hw->debug_mask)) || (desc == NULL))

		return;
@@ -109,29 +108,30 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 
		   le32_to_cpu(aq_desc->params.external.addr_low));



	if ((buffer != NULL) && (aq_desc->datalen != 0)) {

		memset(data, 0, sizeof(data));

		i40e_debug(hw, mask, "AQ CMD Buffer:\n");

		if (buf_len < len)

			len = buf_len;

		for (i = 0; i < len; i++) {

			data[((i % 16) / 4)] |=

				((u32)aq_buffer[i]) << (8 * (i % 4));

			if ((i % 16) == 15) {

		/* write the full 16-byte chunks */

		for (i = 0; i < (len - 16); i += 16)

			i40e_debug(hw, mask,

					   "\t0x%04X  %08X %08X %08X %08X\n",

					   i - 15, le32_to_cpu(data[0]),

					   le32_to_cpu(data[1]),

					   le32_to_cpu(data[2]),

					   le32_to_cpu(data[3]));

				memset(data, 0, sizeof(data));

			}

				   "\t0x%04X  %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",

				   i, buf[i], buf[i + 1], buf[i + 2],

				   buf[i + 3], buf[i + 4], buf[i + 5],

				   buf[i + 6], buf[i + 7], buf[i + 8],

				   buf[i + 9], buf[i + 10], buf[i + 11],

				   buf[i + 12], buf[i + 13], buf[i + 14],

				   buf[i + 15]);

		/* write whatever's left over without overrunning the buffer */

		if (i < len) {

			char d_buf[80];

			int j = 0;



			memset(d_buf, 0, sizeof(d_buf));

			j += sprintf(d_buf, "\t0x%04X ", i);

			while (i < len)

				j += sprintf(&d_buf[j], " %02X", buf[i++]);

			i40e_debug(hw, mask, "%s\n", d_buf);

		}

		if ((i % 16) != 0)

			i40e_debug(hw, mask, "\t0x%04X  %08X %08X %08X %08X\n",

				   i - (i % 16), le32_to_cpu(data[0]),

				   le32_to_cpu(data[1]),

				   le32_to_cpu(data[2]),

				   le32_to_cpu(data[3]));

	}

}
@@ -2137,17 +2137,15 @@ i40e_status i40e_aq_debug_read_register(struct i40e_hw *hw, 
	if (reg_val == NULL)

		return I40E_ERR_PARAM;



	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_debug_read_reg);

	i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_debug_read_reg);



	cmd_resp->address = cpu_to_le32(reg_addr);



	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);



	if (!status) {

		*reg_val = ((u64)cmd_resp->value_high << 32) |

			    (u64)cmd_resp->value_low;

		*reg_val = le64_to_cpu(*reg_val);

		*reg_val = ((u64)le32_to_cpu(cmd_resp->value_high) << 32) |

			   (u64)le32_to_cpu(cmd_resp->value_low);

	}



	return status;
@@ -3409,7 +3407,7 @@ i40e_status i40e_aq_add_rem_control_packet_filter(struct i40e_hw *hw, 
 * is not passed then only register at 'reg_addr0' is read.

 *

 **/

i40e_status i40e_aq_alternate_read(struct i40e_hw *hw,

static i40e_status i40e_aq_alternate_read(struct i40e_hw *hw,

					  u32 reg_addr0, u32 *reg_val0,

					  u32 reg_addr1, u32 *reg_val1)

{

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

deleted100644 → 0
+0 −354
Original line number Diff line number Diff line 
/*******************************************************************************

 *

 * Intel Ethernet Controller XL710 Family Linux Driver

 * Copyright(c) 2013 - 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program.  If not, see <http://www.gnu.org/licenses/>.

 *

 * The full GNU General Public License is included in this distribution in

 * the file called "COPYING".

 *

 * Contact Information:

 * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 ******************************************************************************/



#include <linux/configfs.h>

#include "i40e.h"



#if IS_ENABLED(CONFIG_I40E_CONFIGFS_FS)



/**

 * configfs structure for i40e

 *

 * This file adds code for configfs support for the i40e driver.  This sets

 * up a filesystem under /sys/kernel/config in which configuration changes

 * can be made for the driver's netdevs.

 *

 * The initialization in this code creates the "i40e" entry in the configfs

 * system.  After that, the user needs to use mkdir to create configurations

 * for specific netdev ports; for example "mkdir eth3".  This code will verify

 * that such a netdev exists and that it is owned by i40e.

 *

 **/



struct i40e_cfgfs_vsi {

	struct config_item item;

	struct i40e_vsi *vsi;

};



static inline struct i40e_cfgfs_vsi *to_i40e_cfgfs_vsi(struct config_item *item)

{

	return item ? container_of(item, struct i40e_cfgfs_vsi, item) : NULL;

}



static struct configfs_attribute i40e_cfgfs_vsi_attr_min_bw = {

	.ca_owner = THIS_MODULE,

	.ca_name = "min_bw",

	.ca_mode = S_IRUGO | S_IWUSR,

};



static struct configfs_attribute i40e_cfgfs_vsi_attr_max_bw = {

	.ca_owner = THIS_MODULE,

	.ca_name = "max_bw",

	.ca_mode = S_IRUGO | S_IWUSR,

};



static struct configfs_attribute i40e_cfgfs_vsi_attr_commit = {

	.ca_owner = THIS_MODULE,

	.ca_name = "commit",

	.ca_mode = S_IRUGO | S_IWUSR,

};



static struct configfs_attribute i40e_cfgfs_vsi_attr_port_count = {

	.ca_owner = THIS_MODULE,

	.ca_name = "ports",

	.ca_mode = S_IRUGO | S_IWUSR,

};



static struct configfs_attribute i40e_cfgfs_vsi_attr_part_count = {

	.ca_owner = THIS_MODULE,

	.ca_name = "partitions",

	.ca_mode = S_IRUGO | S_IWUSR,

};



static struct configfs_attribute *i40e_cfgfs_vsi_attrs[] = {

	&i40e_cfgfs_vsi_attr_min_bw,

	&i40e_cfgfs_vsi_attr_max_bw,

	&i40e_cfgfs_vsi_attr_commit,

	&i40e_cfgfs_vsi_attr_port_count,

	&i40e_cfgfs_vsi_attr_part_count,

	NULL,

};



/**

 * i40e_cfgfs_vsi_attr_show - Show a VSI's NPAR BW partition info

 * @item: A pointer back to the configfs item created on driver load

 * @attr: A pointer to this item's configuration attribute

 * @page: A pointer to the output buffer

 **/

static ssize_t i40e_cfgfs_vsi_attr_show(struct config_item *item,

					struct configfs_attribute *attr,

					char *page)

{

	struct i40e_cfgfs_vsi *i40e_cfgfs_vsi = to_i40e_cfgfs_vsi(item);

	struct i40e_pf *pf = i40e_cfgfs_vsi->vsi->back;

	ssize_t count;



	if (i40e_cfgfs_vsi->vsi != pf->vsi[pf->lan_vsi])

		return 0;



	if (strncmp(attr->ca_name, "min_bw", 6) == 0)

		count = sprintf(page, "%s %s %d%%\n",

				i40e_cfgfs_vsi->vsi->netdev->name,

				(pf->npar_min_bw & I40E_ALT_BW_RELATIVE_MASK) ?

				"Relative Min BW" : "Absolute Min BW",

				pf->npar_min_bw & I40E_ALT_BW_VALUE_MASK);

	else if (strncmp(attr->ca_name, "max_bw", 6) == 0)

		count = sprintf(page, "%s %s %d%%\n",

				i40e_cfgfs_vsi->vsi->netdev->name,

				(pf->npar_max_bw & I40E_ALT_BW_RELATIVE_MASK) ?

				"Relative Max BW" : "Absolute Max BW",

				pf->npar_max_bw & I40E_ALT_BW_VALUE_MASK);

	else if (strncmp(attr->ca_name, "ports", 5) == 0)

		count = sprintf(page, "%d\n",

				pf->hw.num_ports);

	else if (strncmp(attr->ca_name, "partitions", 10) == 0)

		count = sprintf(page, "%d\n",

				pf->hw.num_partitions);

	else

		return 0;



	return count;

}



/**

 * i40e_cfgfs_vsi_attr_store - Show a VSI's NPAR BW partition info

 * @item: A pointer back to the configfs item created on driver load

 * @attr: A pointer to this item's configuration attribute

 * @page: A pointer to the user input buffer holding the user input values

 **/

static ssize_t i40e_cfgfs_vsi_attr_store(struct config_item *item,

					 struct configfs_attribute *attr,

					 const char *page, size_t count)

{

	struct i40e_cfgfs_vsi *i40e_cfgfs_vsi = to_i40e_cfgfs_vsi(item);

	struct i40e_pf *pf = i40e_cfgfs_vsi->vsi->back;

	char *p = (char *)page;

	int rc;

	unsigned long tmp;



	if (i40e_cfgfs_vsi->vsi != pf->vsi[pf->lan_vsi])

		return 0;



	if (!p || (*p && (*p == '\n')))

		return -EINVAL;



	rc = kstrtoul(p, 10, &tmp);

	if (rc)

		return rc;

	if (tmp > 100)

		return -ERANGE;



	if (strncmp(attr->ca_name, "min_bw", 6) == 0) {

		if (tmp > (pf->npar_max_bw & I40E_ALT_BW_VALUE_MASK))

			return -ERANGE;

		/* Preserve the valid and relative BW bits - the rest is

		 * don't care.

		 */

		pf->npar_min_bw &= (I40E_ALT_BW_RELATIVE_MASK |

				    I40E_ALT_BW_VALID_MASK);

		pf->npar_min_bw |= (tmp & I40E_ALT_BW_VALUE_MASK);

		i40e_set_npar_bw_setting(pf);

	} else if (strncmp(attr->ca_name, "max_bw", 6) == 0) {

		if (tmp < 1 ||

		    tmp < (pf->npar_min_bw & I40E_ALT_BW_VALUE_MASK))

			return -ERANGE;

		/* Preserve the valid and relative BW bits - the rest is

		 * don't care.

		 */

		pf->npar_max_bw &= (I40E_ALT_BW_RELATIVE_MASK |

				    I40E_ALT_BW_VALID_MASK);

		pf->npar_max_bw |= (tmp & I40E_ALT_BW_VALUE_MASK);

		i40e_set_npar_bw_setting(pf);

	} else if (strncmp(attr->ca_name, "commit", 6) == 0 && tmp == 1) {

		if (i40e_commit_npar_bw_setting(pf))

			return -EIO;

	}



	return count;

}



/**

 * i40e_cfgfs_vsi_release - Free up the configuration item memory

 * @item: A pointer back to the configfs item created on driver load

 **/

static void i40e_cfgfs_vsi_release(struct config_item *item)

{

	kfree(to_i40e_cfgfs_vsi(item));

}



static struct configfs_item_operations i40e_cfgfs_vsi_item_ops = {

	.release		= i40e_cfgfs_vsi_release,

	.show_attribute		= i40e_cfgfs_vsi_attr_show,

	.store_attribute	= i40e_cfgfs_vsi_attr_store,

};



static struct config_item_type i40e_cfgfs_vsi_type = {

	.ct_item_ops	= &i40e_cfgfs_vsi_item_ops,

	.ct_attrs	= i40e_cfgfs_vsi_attrs,

	.ct_owner	= THIS_MODULE,

};



struct i40e_cfgfs_group {

	struct config_group group;

};



/**

 * to_i40e_cfgfs_group - Get the group pointer from the config item

 * @item: A pointer back to the configfs item created on driver load

 **/

static inline struct i40e_cfgfs_group *

to_i40e_cfgfs_group(struct config_item *item)

{

	return item ? container_of(to_config_group(item),

				   struct i40e_cfgfs_group, group) : NULL;

}



/**

 * i40e_cfgfs_group_make_item - Create the configfs item with group container

 * @group: A pointer to our configfs group

 * @name: A pointer to the nume of the device we're looking for

 **/

static struct config_item *

i40e_cfgfs_group_make_item(struct config_group *group, const char *name)

{

	struct i40e_cfgfs_vsi *i40e_cfgfs_vsi;

	struct net_device *netdev;

	struct i40e_netdev_priv *np;



	read_lock(&dev_base_lock);

	netdev = first_net_device(&init_net);

	while (netdev) {

		if (strncmp(netdev->name, name, sizeof(netdev->name)) == 0)

			break;

		netdev = next_net_device(netdev);

	}

	read_unlock(&dev_base_lock);



	if (!netdev)

		return ERR_PTR(-ENODEV);



	/* is this netdev owned by i40e? */

	if (netdev->netdev_ops->ndo_open != i40e_open)

		return ERR_PTR(-EACCES);



	i40e_cfgfs_vsi = kzalloc(sizeof(*i40e_cfgfs_vsi), GFP_KERNEL);

	if (!i40e_cfgfs_vsi)

		return ERR_PTR(-ENOMEM);



	np = netdev_priv(netdev);

	i40e_cfgfs_vsi->vsi = np->vsi;

	config_item_init_type_name(&i40e_cfgfs_vsi->item, name,

				   &i40e_cfgfs_vsi_type);



	return &i40e_cfgfs_vsi->item;

}



static struct configfs_attribute i40e_cfgfs_group_attr_description = {

	.ca_owner = THIS_MODULE,

	.ca_name = "description",

	.ca_mode = S_IRUGO,

};



static struct configfs_attribute *i40e_cfgfs_group_attrs[] = {

	&i40e_cfgfs_group_attr_description,

	NULL,

};



static ssize_t i40e_cfgfs_group_attr_show(struct config_item *item,

					  struct configfs_attribute *attr,

					  char *page)

{

	return sprintf(page,

"i40e\n"

"\n"

"This subsystem allows the modification of network port configurations.\n"

"To start, use the name of the network port to be configured in a 'mkdir'\n"

"command, e.g. 'mkdir eth3'.\n");

}



static void i40e_cfgfs_group_release(struct config_item *item)

{

	kfree(to_i40e_cfgfs_group(item));

}



static struct configfs_item_operations i40e_cfgfs_group_item_ops = {

	.release	= i40e_cfgfs_group_release,

	.show_attribute	= i40e_cfgfs_group_attr_show,

};



/* Note that, since no extra work is required on ->drop_item(),

 * no ->drop_item() is provided.

 */

static struct configfs_group_operations i40e_cfgfs_group_ops = {

	.make_item	= i40e_cfgfs_group_make_item,

};



static struct config_item_type i40e_cfgfs_group_type = {

	.ct_item_ops	= &i40e_cfgfs_group_item_ops,

	.ct_group_ops	= &i40e_cfgfs_group_ops,

	.ct_attrs	= i40e_cfgfs_group_attrs,

	.ct_owner	= THIS_MODULE,

};



static struct configfs_subsystem i40e_cfgfs_group_subsys = {

	.su_group = {

		.cg_item = {

			.ci_namebuf = "i40e",

			.ci_type = &i40e_cfgfs_group_type,

		},

	},

};



/**

 * i40e_configfs_init - Initialize configfs support for our driver

 **/

int i40e_configfs_init(void)

{

	int ret;

	struct configfs_subsystem *subsys;



	subsys = &i40e_cfgfs_group_subsys;



	config_group_init(&subsys->su_group);

	mutex_init(&subsys->su_mutex);

	ret = configfs_register_subsystem(subsys);

	if (ret) {

		pr_err("Error %d while registering configfs subsystem %s\n",

		       ret, subsys->su_group.cg_item.ci_namebuf);

		return ret;

	}



	return 0;

}



/**

 * i40e_configfs_init - Bail out - unregister configfs subsystem and release

 **/

void i40e_configfs_exit(void)

{

	configfs_unregister_subsystem(&i40e_cfgfs_group_subsys);

}

#endif /* IS_ENABLED(CONFIG_I40E_CONFIGFS_FS) */