Commit 2dabf0c4 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 2016-04-20

This series contains updates to fm10k only.

Jacob provides majority of the changes in this series, starting with the
addition of helper functions to reduce code duplication and the amount
of code indentation.  Fixed the use or should we say abuse of the ethtool
stats API, which could result in corrupt memory or misleading statistic
output.  Added the appropriate rtnl_lock() and rtnl_unlock() to avoid
RCU warnings during AER events.  Come to find out, the PTP/1588 support
is not working with the current version of switch management software
and possibly never worked, so just remove support for PTP/1588 for now.
Fixed how error responses from the switch manager after a LPORT_MAP
request are handled, originally which were silently being ignored.
Fixed up code documentation to hopefully ease the code and comment
comprehension.  Fixed a possible NULL pointer dereference after a
kcalloc(), where when writing a new default redirection table, and we
needed to populate a new RSS table using ethtool_rxfh_indir_default().
We populate this table into a region of memory allocated using kcalloc()
but never check it for NULL.

Alex adds support for bulk transmit cleanup for fm10k, like he did for
all of our other drivers.

Ngai-Mint fixes a number of issues with the unicast and multicast address
syncs.  Where an issue would occur when the netdev is pre-configured to
either multicast mode and is enabled for the first time.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 10c9ead9 dc1b4c2b

drivers/net/ethernet/intel/fm10k/Makefile

+3 −4
Original line number Diff line number Diff line 
################################################################################

#

# Intel Ethernet Switch Host Interface Driver

# Copyright(c) 2013 - 2015 Intel Corporation.

# Intel(R) Ethernet Switch Host Interface Driver

# Copyright(c) 2013 - 2016 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,
@@ -22,7 +22,7 @@ 
################################################################################



#

# Makefile for the Intel(R) FM10000 Ethernet Switch Host Interface driver

# Makefile for the Intel(R) Ethernet Switch Host Interface Driver

#



obj-$(CONFIG_FM10K) += fm10k.o
@@ -30,7 +30,6 @@ obj-$(CONFIG_FM10K) += fm10k.o 
fm10k-y := fm10k_main.o \

	   fm10k_common.o \

	   fm10k_pci.o \

	   fm10k_ptp.o \

	   fm10k_netdev.o \

	   fm10k_ethtool.o \

	   fm10k_pf.o \

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

+3 −34
Original line number Diff line number Diff line 
/* Intel Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2015 Intel Corporation.

/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 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,
@@ -27,9 +27,6 @@ 
#include <linux/rtnetlink.h>

#include <linux/if_vlan.h>

#include <linux/pci.h>

#include <linux/net_tstamp.h>

#include <linux/clocksource.h>

#include <linux/ptp_clock_kernel.h>



#include "fm10k_pf.h"

#include "fm10k_vf.h"
@@ -333,6 +330,7 @@ struct fm10k_intfc { 
	unsigned long last_reset;

	unsigned long link_down_event;

	bool host_ready;

	bool lport_map_failed;



	u32 reta[FM10K_RETA_SIZE];

	u32 rssrk[FM10K_RSSRK_SIZE];
@@ -342,22 +340,8 @@ struct fm10k_intfc { 


#ifdef CONFIG_DEBUG_FS

	struct dentry *dbg_intfc;



#endif /* CONFIG_DEBUG_FS */

	struct ptp_clock_info ptp_caps;

	struct ptp_clock *ptp_clock;



	struct sk_buff_head ts_tx_skb_queue;

	u32 tx_hwtstamp_timeouts;



	struct hwtstamp_config ts_config;

	/* We are unable to actually adjust the clock beyond the frequency

	 * value.  Once the clock is started there is no resetting it.  As

	 * such we maintain a separate offset from the actual hardware clock

	 * to allow for offset adjustment.

	 */

	s64 ptp_adjust;

	rwlock_t systime_lock;

#ifdef CONFIG_DCB

	u8 pfc_en;

#endif
@@ -546,21 +530,6 @@ static inline void fm10k_dbg_init(void) {} 
static inline void fm10k_dbg_exit(void) {}

#endif /* CONFIG_DEBUG_FS */



/* Time Stamping */

void fm10k_systime_to_hwtstamp(struct fm10k_intfc *interface,

			       struct skb_shared_hwtstamps *hwtstamp,

			       u64 systime);

void fm10k_ts_tx_enqueue(struct fm10k_intfc *interface, struct sk_buff *skb);

void fm10k_ts_tx_hwtstamp(struct fm10k_intfc *interface, __le16 dglort,

			  u64 systime);

void fm10k_ts_reset(struct fm10k_intfc *interface);

void fm10k_ts_init(struct fm10k_intfc *interface);

void fm10k_ts_tx_subtask(struct fm10k_intfc *interface);

void fm10k_ptp_register(struct fm10k_intfc *interface);

void fm10k_ptp_unregister(struct fm10k_intfc *interface);

int fm10k_get_ts_config(struct net_device *netdev, struct ifreq *ifr);

int fm10k_set_ts_config(struct net_device *netdev, struct ifreq *ifr);



/* DCB */

#ifdef CONFIG_DCB

void fm10k_dcbnl_set_ops(struct net_device *dev);

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

+2 −2
Original line number Diff line number Diff line 
/* Intel Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2014 Intel Corporation.

/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 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,

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

+2 −2
Original line number Diff line number Diff line 
/* Intel Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2014 Intel Corporation.

/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 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,

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

+2 −2
Original line number Diff line number Diff line 
/* Intel Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2015 Intel Corporation.

/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE