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

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

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



Jeff Kirsher says:

====================
1GbE Intel Wired LAN Driver Updates 2017-08-08

This series contains updates to e1000e and igb/igbvf.

Gangfeng Huang fixes an issue with receive network flow classification,
where igb_nfc_filter_exit() was not being called in igb_down() which
would cause the filter tables to "fill up" if a user where to change
the adapter settings (such as speed) which requires a reset of the
adapter.

Cliff Spradlin fixes a timestamping issue, where igb was allowing requests
for hardware timestamping even if it was not configured for hardware
transmit timestamping.

Corinna Vinschen removes the error message that there was an "unexpected
SYS WRAP", when it is actually expected.  So remove the message to not
confuse users.

Greg Edwards provides several patches for the mailbox interface between
the PF and VF drivers.  Added a mailbox unlock method to be used to unlock
the PF/VF mailbox by the PF.  Added a lock around the VF mailbox ops to
prevent the VF from sending another message while the PF is still
processing the previous message.  Fixed a "scheduling while atomic" issue
by changing msleep() to mdelay().

Sasha adds support for the next LOM generations i219 (v8 & v9) which
will be available in the next Intel client platform IceLake.

John Linville adds support for a Broadcom PHY to the igb driver, since
there are designs out in the world which use the igb MAC and a third
party PHY.  This allows the driver to load and function as expected on
these designs.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3118e6e1 eeb01496

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

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ struct e1000_hw; 
#define E1000_DEV_ID_PCH_CNP_I219_V6		0x15BE

#define E1000_DEV_ID_PCH_CNP_I219_LM7		0x15BB

#define E1000_DEV_ID_PCH_CNP_I219_V7		0x15BC

#define E1000_DEV_ID_PCH_ICP_I219_LM8		0x15DF

#define E1000_DEV_ID_PCH_ICP_I219_V8		0x15E0

#define E1000_DEV_ID_PCH_ICP_I219_LM9		0x15E1

#define E1000_DEV_ID_PCH_ICP_I219_V9		0x15E2



#define E1000_REVISION_4	4

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

+2 −0
Original line number Diff line number Diff line
@@ -2437,6 +2437,8 @@ static s32 e1000_hv_phy_workarounds_ich8lan(struct e1000_hw *hw) 
		if (hw->phy.revision < 2) {

			e1000e_phy_sw_reset(hw);

			ret_val = e1e_wphy(hw, MII_BMCR, 0x3140);

			if (ret_val)

				return ret_val;

		}

	}

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

+4 −0
Original line number Diff line number Diff line
@@ -7544,6 +7544,10 @@ static const struct pci_device_id e1000_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_V6), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_LM7), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_V7), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_LM8), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_V8), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_LM9), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_V9), board_pch_cnp },



	{ 0, 0, 0, 0, 0, 0, 0 }	/* terminate list */

};

drivers/net/ethernet/intel/igb/e1000_82575.c

+6 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ static s32 igb_init_phy_params_82575(struct e1000_hw *hw) 
		phy->ops.set_d3_lplu_state = igb_set_d3_lplu_state_82580;

		phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;

		break;

	case BCM54616_E_PHY_ID:

		phy->type = e1000_phy_bcm54616;

		break;

	default:

		ret_val = -E1000_ERR_PHY;

		goto out;
@@ -1659,6 +1662,9 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) 
	case e1000_phy_82580:

		ret_val = igb_copper_link_setup_82580(hw);

		break;

	case e1000_phy_bcm54616:

		ret_val = 0;

		break;

	default:

		ret_val = -E1000_ERR_PHY;

		break;

drivers/net/ethernet/intel/igb/e1000_defines.h

+1 −0
Original line number Diff line number Diff line
@@ -889,6 +889,7 @@ 
#define I210_I_PHY_ID        0x01410C00

#define M88E1543_E_PHY_ID    0x01410EA0

#define M88E1512_E_PHY_ID    0x01410DD0

#define BCM54616_E_PHY_ID    0x03625D10



/* M88E1000 Specific Registers */

#define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */