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

Commit a076d1bd 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/next-queue 



Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2017-02-03

This series contains updates to i40e/i40evf only.

Jake fixes up the driver to not call i40e_vsi_kill_vlan() or
i40e_vsi_add_vlan() when the PVID is set or when the VID is less than 1.
Cleaned up a check which really is not needed since there is no real
reason why we cannot just call i40e_del_mac_all_vlan() directly.  Renamed
functions to better reflect their actual purpose and how they function
in a more clear manner.

Bimmy cleans up unused/deprecated macros.

Mitch cleans up unused device ids which were intended for use when
running Linux VF drivers under Hyper-V, but found to be not needed.
Then cleaned up a function that is no longer needed since the client
open and close functions were refactored.  Adds a sleep without timeout
until the reply from the PF driver has been received since the iWARP
client cannot continue until the operation has been completed.

Tushar Dave fixes an issue seen on SPARC where the use of the 'packed'
directive was causing kernel unaligned errors.

Alex does a refactor to pull some data off of the stack and store it
in the transmit buffer info section of the transmit ring.

Alan fixes a bug which was caused by passing a bad register value to the
firmware, by refactoring the macro INTRL_USEC_TO_REG into a static
inline function.  Also added feedback to the user as to the actual
interrupt rate limit being used when it differs from the requested limit.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6e7bc478 33084060

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

+6 −19
Original line number Diff line number Diff line
@@ -134,19 +134,6 @@ 
/* default to trying for four seconds */

#define I40E_TRY_LINK_TIMEOUT	(4 * HZ)



/**

 * i40e_is_mac_710 - Return true if MAC is X710/XL710

 * @hw: ptr to the hardware info

 **/

static inline bool i40e_is_mac_710(struct i40e_hw *hw)

{

	if ((hw->mac.type == I40E_MAC_X710) ||

	    (hw->mac.type == I40E_MAC_XL710))

		return true;



	return false;

}



/* driver state flags */

enum i40e_state_t {

	__I40E_TESTING,
@@ -762,6 +749,7 @@ 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,

					const u8 *macaddr, s16 vlan);

void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f);

void i40e_del_filter(struct i40e_vsi *vsi, const u8 *macaddr, s16 vlan);

int i40e_sync_vsi_filters(struct i40e_vsi *vsi);

struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type,
@@ -804,7 +792,6 @@ int i40e_lan_add_device(struct i40e_pf *pf); 
int i40e_lan_del_device(struct i40e_pf *pf);

void i40e_client_subtask(struct i40e_pf *pf);

void i40e_notify_client_of_l2_param_changes(struct i40e_vsi *vsi);

void i40e_notify_client_of_netdev_open(struct i40e_vsi *vsi);

void i40e_notify_client_of_netdev_close(struct i40e_vsi *vsi, bool reset);

void i40e_notify_client_of_vf_enable(struct i40e_pf *pf, u32 num_vfs);

void i40e_notify_client_of_vf_reset(struct i40e_pf *pf, u32 vf_id);
@@ -852,12 +839,12 @@ int i40e_close(struct net_device *netdev); 
int i40e_vsi_open(struct i40e_vsi *vsi);

void i40e_vlan_stripping_disable(struct i40e_vsi *vsi);

int i40e_add_vlan_all_mac(struct i40e_vsi *vsi, s16 vid);

int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid);

int i40e_vsi_add_vlan(struct i40e_vsi *vsi, u16 vid);

void i40e_rm_vlan_all_mac(struct i40e_vsi *vsi, s16 vid);

void i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid);

struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi,

void i40e_vsi_kill_vlan(struct i40e_vsi *vsi, u16 vid);

struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi,

					    const u8 *macaddr);

int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, const u8 *macaddr);

int i40e_del_mac_filter(struct i40e_vsi *vsi, const u8 *macaddr);

bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi);

struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, const u8 *macaddr);

#ifdef I40E_FCOE

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

+0 −35
Original line number Diff line number Diff line
@@ -200,41 +200,6 @@ void i40e_notify_client_of_l2_param_changes(struct i40e_vsi *vsi) 
	mutex_unlock(&i40e_client_instance_mutex);

}



/**

 * i40e_notify_client_of_netdev_open - call the client open callback

 * @vsi: the VSI with netdev opened

 *

 * If there is a client to this netdev, call the client with open

 **/

void i40e_notify_client_of_netdev_open(struct i40e_vsi *vsi)

{

	struct i40e_client_instance *cdev;

	int ret = 0;



	if (!vsi)

		return;

	mutex_lock(&i40e_client_instance_mutex);

	list_for_each_entry(cdev, &i40e_client_instances, list) {

		if (cdev->lan_info.netdev == vsi->netdev) {

			if (!cdev->client ||

			    !cdev->client->ops || !cdev->client->ops->open) {

				dev_dbg(&vsi->back->pdev->dev,

					"Cannot locate client instance open routine\n");

				continue;

			}

			if (!(test_bit(__I40E_CLIENT_INSTANCE_OPENED,

				       &cdev->state))) {

				ret = cdev->client->ops->open(&cdev->lan_info,

							      cdev->client);

				if (!ret)

					set_bit(__I40E_CLIENT_INSTANCE_OPENED,

						&cdev->state);

			}

		}

	}

	mutex_unlock(&i40e_client_instance_mutex);

}



/**

 * i40e_client_release_qvlist

 * @ldev: pointer to L2 context.

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

+11 −4
Original line number Diff line number Diff line
@@ -2072,7 +2072,7 @@ static void i40e_set_itr_per_queue(struct i40e_vsi *vsi, 
	struct i40e_q_vector *q_vector;

	u16 vector, intrl;



	intrl = INTRL_USEC_TO_REG(vsi->int_rate_limit);

	intrl = i40e_intrl_usec_to_reg(vsi->int_rate_limit);



	vsi->rx_rings[queue]->rx_itr_setting = ec->rx_coalesce_usecs;

	vsi->tx_rings[queue]->tx_itr_setting = ec->tx_coalesce_usecs;
@@ -2116,6 +2116,7 @@ static int __i40e_set_coalesce(struct net_device *netdev, 
	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_pf *pf = vsi->back;

	u16 intrl_reg;

	int i;



	if (ec->tx_max_coalesced_frames_irq || ec->rx_max_coalesced_frames_irq)
@@ -2127,8 +2128,9 @@ static int __i40e_set_coalesce(struct net_device *netdev, 
		return -EINVAL;

	}



	if (ec->rx_coalesce_usecs_high >= INTRL_REG_TO_USEC(I40E_MAX_INTRL)) {

		netif_info(pf, drv, netdev, "Invalid value, rx-usecs-high range is 0-235\n");

	if (ec->rx_coalesce_usecs_high > INTRL_REG_TO_USEC(I40E_MAX_INTRL)) {

		netif_info(pf, drv, netdev, "Invalid value, rx-usecs-high range is 0-%lu\n",

			   INTRL_REG_TO_USEC(I40E_MAX_INTRL));

		return -EINVAL;

	}
@@ -2141,7 +2143,12 @@ static int __i40e_set_coalesce(struct net_device *netdev, 
			return -EINVAL;

	}



	vsi->int_rate_limit = ec->rx_coalesce_usecs_high;

	intrl_reg = i40e_intrl_usec_to_reg(ec->rx_coalesce_usecs_high);

	vsi->int_rate_limit = INTRL_REG_TO_USEC(intrl_reg);

	if (vsi->int_rate_limit != ec->rx_coalesce_usecs_high) {

		netif_info(pf, drv, netdev, "Interrupt rate limit rounded down to %d\n",

			   vsi->int_rate_limit);

	}



	if (ec->tx_coalesce_usecs == 0) {

		if (ec->use_adaptive_tx_coalesce)

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

+34 −32
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi, 
 * the "safe" variants of any list iterators, e.g. list_for_each_entry_safe()

 * instead of list_for_each_entry().

 **/

static void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f)

void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f)

{

	if (!f)

		return;
@@ -1477,17 +1477,18 @@ void i40e_del_filter(struct i40e_vsi *vsi, const u8 *macaddr, s16 vlan) 
}



/**

 * i40e_put_mac_in_vlan - Make macvlan filters from macaddrs and vlans

 * i40e_add_mac_filter - Add a MAC filter for all active VLANs

 * @vsi: the VSI to be searched

 * @macaddr: the mac address to be filtered

 *

 * Goes through all the macvlan filters and adds a macvlan filter for each

 * If we're not in VLAN mode, just add the filter to I40E_VLAN_ANY. Otherwise,

 * go through all the macvlan filters and add a macvlan filter for each

 * unique vlan that already exists. If a PVID has been assigned, instead only

 * add the macaddr to that VLAN.

 *

 * Returns last filter added on success, else NULL

 **/

struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi,

struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi,

					    const u8 *macaddr)

{

	struct i40e_mac_filter *f, *add = NULL;
@@ -1498,6 +1499,9 @@ struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi, 
		return i40e_add_filter(vsi, macaddr,

				       le16_to_cpu(vsi->info.pvid));



	if (!i40e_is_vsi_in_vlan(vsi))

		return i40e_add_filter(vsi, macaddr, I40E_VLAN_ANY);



	hash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {

		if (f->state == I40E_FILTER_REMOVE)

			continue;
@@ -1510,15 +1514,16 @@ struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi, 
}



/**

 * i40e_del_mac_all_vlan - Remove a MAC filter from all VLANS

 * i40e_del_mac_filter - Remove a MAC filter from all VLANs

 * @vsi: the VSI to be searched

 * @macaddr: the mac address to be removed

 *

 * Removes a given MAC address from a VSI, regardless of VLAN

 * Removes a given MAC address from a VSI regardless of what VLAN it has been

 * associated with.

 *

 * Returns 0 for success, or error

 **/

int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, const u8 *macaddr)

int i40e_del_mac_filter(struct i40e_vsi *vsi, const u8 *macaddr)

{

	struct i40e_mac_filter *f;

	struct hlist_node *h;
@@ -1579,8 +1584,8 @@ static int i40e_set_mac(struct net_device *netdev, void *p) 
		netdev_info(netdev, "set new mac address %pM\n", addr->sa_data);



	spin_lock_bh(&vsi->mac_filter_hash_lock);

	i40e_del_mac_all_vlan(vsi, netdev->dev_addr);

	i40e_put_mac_in_vlan(vsi, addr->sa_data);

	i40e_del_mac_filter(vsi, netdev->dev_addr);

	i40e_add_mac_filter(vsi, addr->sa_data);

	spin_unlock_bh(&vsi->mac_filter_hash_lock);

	ether_addr_copy(netdev->dev_addr, addr->sa_data);

	if (vsi->type == I40E_VSI_MAIN) {
@@ -1756,14 +1761,8 @@ static int i40e_addr_sync(struct net_device *netdev, const u8 *addr) 
{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_mac_filter *f;



	if (i40e_is_vsi_in_vlan(vsi))

		f = i40e_put_mac_in_vlan(vsi, addr);

	else

		f = i40e_add_filter(vsi, addr, I40E_VLAN_ANY);



	if (f)

	if (i40e_add_mac_filter(vsi, addr))

		return 0;

	else

		return -ENOMEM;
@@ -1782,10 +1781,7 @@ static int i40e_addr_unsync(struct net_device *netdev, const u8 *addr) 
	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_vsi *vsi = np->vsi;



	if (i40e_is_vsi_in_vlan(vsi))

		i40e_del_mac_all_vlan(vsi, addr);

	else

		i40e_del_filter(vsi, addr, I40E_VLAN_ANY);

	i40e_del_mac_filter(vsi, addr);



	return 0;

}
@@ -2568,12 +2564,15 @@ int i40e_add_vlan_all_mac(struct i40e_vsi *vsi, s16 vid) 
/**

 * i40e_vsi_add_vlan - Add VSI membership for given VLAN

 * @vsi: the VSI being configured

 * @vid: VLAN id to be added (0 = untagged only , -1 = any)

 * @vid: VLAN id to be added

 **/

int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)

int i40e_vsi_add_vlan(struct i40e_vsi *vsi, u16 vid)

{

	int err;



	if (!vid || vsi->info.pvid)

		return -EINVAL;



	/* Locked once because all functions invoked below iterates list*/

	spin_lock_bh(&vsi->mac_filter_hash_lock);

	err = i40e_add_vlan_all_mac(vsi, vid);
@@ -2616,10 +2615,13 @@ void i40e_rm_vlan_all_mac(struct i40e_vsi *vsi, s16 vid) 
/**

 * i40e_vsi_kill_vlan - Remove VSI membership for given VLAN

 * @vsi: the VSI being configured

 * @vid: VLAN id to be removed (0 = untagged only , -1 = any)

 * @vid: VLAN id to be removed

 **/

void i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)

void i40e_vsi_kill_vlan(struct i40e_vsi *vsi, u16 vid)

{

	if (!vid || vsi->info.pvid)

		return;



	spin_lock_bh(&vsi->mac_filter_hash_lock);

	i40e_rm_vlan_all_mac(vsi, vid);

	spin_unlock_bh(&vsi->mac_filter_hash_lock);
@@ -3266,7 +3268,7 @@ static void i40e_vsi_configure_msix(struct i40e_vsi *vsi) 
		wr32(hw, I40E_PFINT_ITRN(I40E_TX_ITR, vector - 1),

		     q_vector->tx.itr);

		wr32(hw, I40E_PFINT_RATEN(vector - 1),

		     INTRL_USEC_TO_REG(vsi->int_rate_limit));

		     i40e_intrl_usec_to_reg(vsi->int_rate_limit));



		/* Linked list for the queuepairs assigned to this vector */

		wr32(hw, I40E_PFINT_LNKLSTN(vector - 1), qp);
@@ -8682,7 +8684,7 @@ static int i40e_sw_init(struct i40e_pf *pf) 
				 pf->hw.func_caps.fd_filters_best_effort;

	}



	if (i40e_is_mac_710(&pf->hw) &&

	if ((pf->hw.mac.type == I40E_MAC_XL710) &&

	    (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||

	    (pf->hw.aq.fw_maj_ver < 4))) {

		pf->flags |= I40E_FLAG_RESTART_AUTONEG;
@@ -8691,13 +8693,13 @@ static int i40e_sw_init(struct i40e_pf *pf) 
	}



	/* Disable FW LLDP if FW < v4.3 */

	if (i40e_is_mac_710(&pf->hw) &&

	if ((pf->hw.mac.type == I40E_MAC_XL710) &&

	    (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 3)) ||

	    (pf->hw.aq.fw_maj_ver < 4)))

		pf->flags |= I40E_FLAG_STOP_FW_LLDP;



	/* Use the FW Set LLDP MIB API if FW > v4.40 */

	if (i40e_is_mac_710(&pf->hw) &&

	if ((pf->hw.mac.type == I40E_MAC_XL710) &&

	    (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver >= 40)) ||

	    (pf->hw.aq.fw_maj_ver >= 5)))

		pf->flags |= I40E_FLAG_USE_SET_LLDP_MIB;
@@ -9339,7 +9341,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
		 */

		i40e_rm_default_mac_filter(vsi, mac_addr);

		spin_lock_bh(&vsi->mac_filter_hash_lock);

		i40e_add_filter(vsi, mac_addr, I40E_VLAN_ANY);

		i40e_add_mac_filter(vsi, mac_addr);

		spin_unlock_bh(&vsi->mac_filter_hash_lock);

	} else {

		/* relate the VSI_VMDQ name to the VSI_MAIN name */
@@ -9348,7 +9350,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
		random_ether_addr(mac_addr);



		spin_lock_bh(&vsi->mac_filter_hash_lock);

		i40e_add_filter(vsi, mac_addr, I40E_VLAN_ANY);

		i40e_add_mac_filter(vsi, mac_addr);

		spin_unlock_bh(&vsi->mac_filter_hash_lock);

	}
@@ -9367,7 +9369,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
	 */

	eth_broadcast_addr(broadcast);

	spin_lock_bh(&vsi->mac_filter_hash_lock);

	i40e_add_filter(vsi, broadcast, I40E_VLAN_ANY);

	i40e_add_mac_filter(vsi, broadcast);

	spin_unlock_bh(&vsi->mac_filter_hash_lock);



	ether_addr_copy(netdev->dev_addr, mac_addr);

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

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct i40e_dma_mem { 
	void *va;

	dma_addr_t pa;

	u32 size;

} __packed;

};



#define i40e_allocate_dma_mem(h, m, unused, s, a) \

			i40e_allocate_dma_mem_d(h, m, s, a)
@@ -64,7 +64,7 @@ struct i40e_dma_mem { 
struct i40e_virt_mem {

	void *va;

	u32 size;

} __packed;

};



#define i40e_allocate_virt_mem(h, m, s) i40e_allocate_virt_mem_d(h, m, s)

#define i40e_free_virt_mem(h, m) i40e_free_virt_mem_d(h, m)