Commit 55a47dc2 authored by David S. Miller's avatar David S. Miller
Browse files

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



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2019-08-04

This series contains more updates to fm10k from Jake Keller.

Jake removes the unnecessary initialization of some variables to help
resolve static code checker warnings.  Explicitly return success during
resume, since the value of 'err' is always success.  Fixed a issue with
incrementing a void pointer, which can produce undefined behavior.  Used
the __always_unused macro for function templates that are passed as
parameters in functions, but are not used.  Simplified the code by
removing an unnecessary macro in determining the value of NON_Q_VECTORS.
Fixed an issue, using bitwise operations to prevent the low address
overwriting the high portion of the address.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a7a92cf8 1fa475fe

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

+3 −7
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright(c) 2013 - 2018 Intel Corporation. */

/* Copyright(c) 2013 - 2019 Intel Corporation. */



#ifndef _FM10K_H_

#define _FM10K_H_
@@ -177,14 +177,10 @@ static inline struct netdev_queue *txring_txq(const struct fm10k_ring *ring) 
#define MIN_Q_VECTORS	1

enum fm10k_non_q_vectors {

	FM10K_MBX_VECTOR,

#define NON_Q_VECTORS_VF NON_Q_VECTORS_PF

	NON_Q_VECTORS_PF

	NON_Q_VECTORS

};



#define NON_Q_VECTORS(hw)	(((hw)->mac.type == fm10k_mac_pf) ? \

						NON_Q_VECTORS_PF : \

						NON_Q_VECTORS_VF)

#define MIN_MSIX_COUNT(hw)	(MIN_Q_VECTORS + NON_Q_VECTORS(hw))

#define MIN_MSIX_COUNT(hw)	(MIN_Q_VECTORS + NON_Q_VECTORS)



struct fm10k_q_vector {

	struct fm10k_intfc *interface;

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

+2 −4
Original line number Diff line number Diff line
@@ -1114,13 +1114,12 @@ static void fm10k_get_channels(struct net_device *dev, 
			       struct ethtool_channels *ch)

{

	struct fm10k_intfc *interface = netdev_priv(dev);

	struct fm10k_hw *hw = &interface->hw;



	/* report maximum channels */

	ch->max_combined = fm10k_max_channels(dev);



	/* report info for other vector */

	ch->max_other = NON_Q_VECTORS(hw);

	ch->max_other = NON_Q_VECTORS;

	ch->other_count = ch->max_other;



	/* record RSS queues */
@@ -1132,14 +1131,13 @@ static int fm10k_set_channels(struct net_device *dev, 
{

	struct fm10k_intfc *interface = netdev_priv(dev);

	unsigned int count = ch->combined_count;

	struct fm10k_hw *hw = &interface->hw;



	/* verify they are not requesting separate vectors */

	if (!count || ch->rx_count || ch->tx_count)

		return -EINVAL;



	/* verify other_count has not changed */

	if (ch->other_count != NON_Q_VECTORS(hw))

	if (ch->other_count != NON_Q_VECTORS)

		return -EINVAL;



	/* verify the number of channels does not exceed hardware limits */

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

+3 −3
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static struct sk_buff *fm10k_fetch_rx_buffer(struct fm10k_ring *rx_ring, 
		/* prefetch first cache line of first page */

		prefetch(page_addr);

#if L1_CACHE_BYTES < 128

		prefetch(page_addr + L1_CACHE_BYTES);

		prefetch((void *)((u8 *)page_addr + L1_CACHE_BYTES));

#endif



		/* allocate a skb to store the frags */
@@ -1824,7 +1824,7 @@ static int fm10k_init_msix_capability(struct fm10k_intfc *interface) 
	v_budget = min_t(u16, v_budget, num_online_cpus());



	/* account for vectors not related to queues */

	v_budget += NON_Q_VECTORS(hw);

	v_budget += NON_Q_VECTORS;



	/* At the same time, hardware can only support a maximum of

	 * hw.mac->max_msix_vectors vectors.  With features
@@ -1856,7 +1856,7 @@ static int fm10k_init_msix_capability(struct fm10k_intfc *interface) 
	}



	/* record the number of queues available for q_vectors */

	interface->num_q_vectors = v_budget - NON_Q_VECTORS(hw);

	interface->num_q_vectors = v_budget - NON_Q_VECTORS;



	return 0;

}

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

+3 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2013 - 2018 Intel Corporation. */

/* Copyright(c) 2013 - 2019 Intel Corporation. */



#include "fm10k_common.h"
@@ -2134,7 +2134,8 @@ fifo_err: 
 *  DWORDs, not bytes.  Any invalid values will cause the mailbox to return

 *  error.

 **/

s32 fm10k_sm_mbx_init(struct fm10k_hw *hw, struct fm10k_mbx_info *mbx,

s32 fm10k_sm_mbx_init(struct fm10k_hw __always_unused *hw,

		      struct fm10k_mbx_info *mbx,

		      const struct fm10k_msg_data *msg_data)

{

	mbx->mbx_reg = FM10K_GMBX;

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

+6 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2013 - 2018 Intel Corporation. */

/* Copyright(c) 2013 - 2019 Intel Corporation. */



#include "fm10k.h"

#include <linux/vmalloc.h>
@@ -54,7 +54,7 @@ err: 
 **/

static int fm10k_setup_all_tx_resources(struct fm10k_intfc *interface)

{

	int i, err = 0;

	int i, err;



	for (i = 0; i < interface->num_tx_queues; i++) {

		err = fm10k_setup_tx_resources(interface->tx_ring[i]);
@@ -121,7 +121,7 @@ err: 
 **/

static int fm10k_setup_all_rx_resources(struct fm10k_intfc *interface)

{

	int i, err = 0;

	int i, err;



	for (i = 0; i < interface->num_rx_queues; i++) {

		err = fm10k_setup_rx_resources(interface->rx_ring[i]);
@@ -871,7 +871,7 @@ static int fm10k_uc_vlan_unsync(struct net_device *netdev, 
	u16 glort = interface->glort;

	u16 vid = interface->vid;

	bool set = !!(vid / VLAN_N_VID);

	int err = -EHOSTDOWN;

	int err;



	/* drop any leading bits on the VLAN ID */

	vid &= VLAN_N_VID - 1;
@@ -891,7 +891,7 @@ static int fm10k_mc_vlan_unsync(struct net_device *netdev, 
	u16 glort = interface->glort;

	u16 vid = interface->vid;

	bool set = !!(vid / VLAN_N_VID);

	int err = -EHOSTDOWN;

	int err;



	/* drop any leading bits on the VLAN ID */

	vid &= VLAN_N_VID - 1;
@@ -1463,7 +1463,7 @@ static void *fm10k_dfwd_add_station(struct net_device *dev, 
	struct fm10k_l2_accel *old_l2_accel = NULL;

	struct fm10k_dglort_cfg dglort = { 0 };

	struct fm10k_hw *hw = &interface->hw;

	int size = 0, i;

	int size, i;

	u16 vid, glort;



	/* The hardware supported by fm10k only filters on the destination MAC

CRA Git | Maintained and supported by SUSTech CRA and CCSE