Commit 2a12d6cf 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-02-23

This series contains updates to e1000e, igbvf, i40e and i40evf.

David adds support for i219 devices to the e1000e driver.

Jeff (me) provides two patches to cleanup igbvf, first cleans up the
whitespace issues found and the second cleans up the usage of msleep(),
min() and max() with usleep_range(), min_t() and max_t() respectively.

Kamil updates the shadow RAM read/write functions by refactoring them
to prepare for future work.

Shannon renames the debugfs command "clear_stats pf" to clear_stats port"
to clarify what the function really does.

Mitch refactors the receive routine, by splitting the receive hot path
code into two, one for packet split and one for single buffer, which
improves receive performance.  Disables NAPI polling sooner when closing
the interface to fix an occasional panic during close which was
caused by the driver trying to delete and clean rings at the same time.
Also refactors reset for i40evf, since a recent change to the shutdown
flow messed up the reset flow.  Since i40evf_down() now holds the
critical section lock, we cannot call it from the reset handler, which
also holds the lock.

Nicholas restricts the virtual channel opcodes should remain consistent
between updates to the opcode enum.

Neerav converts the VSI connection type to use a #define instead of
using a magic number.

Anjali updates the registers file to remove registers no longer available.
Also fixes the EMPR interrupt handling, so that we won't trigger another
EMPR when we receive an EMPR event.

Catherine cleans up the variable an_enable since it was set and never
used.

Greg fixes the netdev op that allows the operator to turn MAC/VLAN
spoof checking on and off so that it includes the flag for VLAN spoof
checking.

v2: Updated patch #10 in the series to use test_and_clear_bit() as
    suggested by Sergei Shtylyov
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1e0629d3 54e16f64

drivers/net/ethernet/intel/e1000e/defines.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -141,6 +141,7 @@ 
#define E1000_RCTL_LBM_TCVR       0x000000C0    /* tcvr loopback mode */

#define E1000_RCTL_LBM_TCVR       0x000000C0    /* tcvr loopback mode */

#define E1000_RCTL_DTYP_PS        0x00000400    /* Packet Split descriptor */

#define E1000_RCTL_DTYP_PS        0x00000400    /* Packet Split descriptor */

#define E1000_RCTL_RDMTS_HALF     0x00000000    /* Rx desc min threshold size */

#define E1000_RCTL_RDMTS_HALF     0x00000000    /* Rx desc min threshold size */

#define E1000_RCTL_RDMTS_HEX      0x00010000

#define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */

#define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */

#define E1000_RCTL_MO_3           0x00003000    /* multicast offset 15:4 */

#define E1000_RCTL_MO_3           0x00003000    /* multicast offset 15:4 */

#define E1000_RCTL_BAM            0x00008000    /* broadcast enable */

#define E1000_RCTL_BAM            0x00008000    /* broadcast enable */

drivers/net/ethernet/intel/e1000e/e1000.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -132,6 +132,7 @@ enum e1000_boards { 
	board_pchlan,

	board_pchlan,

	board_pch2lan,

	board_pch2lan,

	board_pch_lpt,

	board_pch_lpt,

	board_pch_spt

};

};





struct e1000_ps_page {

struct e1000_ps_page {
@@ -501,6 +502,7 @@ extern const struct e1000_info e1000_ich10_info; 
extern const struct e1000_info e1000_pch_info;

extern const struct e1000_info e1000_pch_info;

extern const struct e1000_info e1000_pch2_info;

extern const struct e1000_info e1000_pch2_info;

extern const struct e1000_info e1000_pch_lpt_info;

extern const struct e1000_info e1000_pch_lpt_info;

extern const struct e1000_info e1000_pch_spt_info;

extern const struct e1000_info e1000_es2_info;

extern const struct e1000_info e1000_es2_info;





void e1000e_ptp_init(struct e1000_adapter *adapter);

void e1000e_ptp_init(struct e1000_adapter *adapter);

drivers/net/ethernet/intel/e1000e/ethtool.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -896,18 +896,20 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) 
	case e1000_pchlan:

	case e1000_pchlan:

	case e1000_pch2lan:

	case e1000_pch2lan:

	case e1000_pch_lpt:

	case e1000_pch_lpt:

	case e1000_pch_spt:

		mask |= (1 << 18);

		mask |= (1 << 18);

		break;

		break;

	default:

	default:

		break;

		break;

	}

	}





	if (mac->type == e1000_pch_lpt)

	if ((mac->type == e1000_pch_lpt) || (mac->type == e1000_pch_spt))

		wlock_mac = (er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK) >>

		wlock_mac = (er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK) >>

		    E1000_FWSM_WLOCK_MAC_SHIFT;

		    E1000_FWSM_WLOCK_MAC_SHIFT;





	for (i = 0; i < mac->rar_entry_count; i++) {

	for (i = 0; i < mac->rar_entry_count; i++) {

		if (mac->type == e1000_pch_lpt) {

		if ((mac->type == e1000_pch_lpt) ||

		    (mac->type == e1000_pch_spt)) {

			/* Cannot test write-protected SHRAL[n] registers */

			/* Cannot test write-protected SHRAL[n] registers */

			if ((wlock_mac == 1) || (wlock_mac && (i > wlock_mac)))

			if ((wlock_mac == 1) || (wlock_mac && (i > wlock_mac)))

				continue;

				continue;

drivers/net/ethernet/intel/e1000e/hw.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,10 @@ struct e1000_hw; 
#define E1000_DEV_ID_PCH_I218_V2		0x15A1

#define E1000_DEV_ID_PCH_I218_V2		0x15A1

#define E1000_DEV_ID_PCH_I218_LM3		0x15A2	/* Wildcat Point PCH */

#define E1000_DEV_ID_PCH_I218_LM3		0x15A2	/* Wildcat Point PCH */

#define E1000_DEV_ID_PCH_I218_V3		0x15A3	/* Wildcat Point PCH */

#define E1000_DEV_ID_PCH_I218_V3		0x15A3	/* Wildcat Point PCH */

#define E1000_DEV_ID_PCH_SPT_I219_LM		0x156F	/* SPT PCH */

#define E1000_DEV_ID_PCH_SPT_I219_V		0x1570	/* SPT PCH */

#define E1000_DEV_ID_PCH_SPT_I219_LM2		0x15B7	/* SPT-H PCH */

#define E1000_DEV_ID_PCH_SPT_I219_V2		0x15B8	/* SPT-H PCH */





#define E1000_REVISION_4	4

#define E1000_REVISION_4	4
@@ -108,6 +112,7 @@ enum e1000_mac_type { 
	e1000_pchlan,

	e1000_pchlan,

	e1000_pch2lan,

	e1000_pch2lan,

	e1000_pch_lpt,

	e1000_pch_lpt,

	e1000_pch_spt,

};

};





enum e1000_media_type {

enum e1000_media_type {
@@ -153,6 +158,7 @@ enum e1000_bus_width { 
	e1000_bus_width_pcie_x1,

	e1000_bus_width_pcie_x1,

	e1000_bus_width_pcie_x2,

	e1000_bus_width_pcie_x2,

	e1000_bus_width_pcie_x4 = 4,

	e1000_bus_width_pcie_x4 = 4,

	e1000_bus_width_pcie_x8 = 8,

	e1000_bus_width_32,

	e1000_bus_width_32,

	e1000_bus_width_64,

	e1000_bus_width_64,

	e1000_bus_width_reserved

	e1000_bus_width_reserved

drivers/net/ethernet/intel/e1000e/ich8lan.c

+700 −70

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE