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

Commit 8a67b05d 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:

====================
This series contains updates to e1000e, ixgbevf, igb and igbvf.
Majority of the patches are code cleanups of e1000e where code
is removed (Yeah!).  The other two e1000e patches are fixes.  The
first is to fix the maximum frame size for 82579 devices.  The second
fix is to resolve an issue with devices other than 82579 that suffer
from dropped transactions on platforms with deep C-states when
jumbo frames are enabled.

The ixgbevf patch is to ensure that the driver fetches the correct,
refreshed value for link status and speed when the values have changed.

The igb and igbvf patches are a solution to an issue Stefan Assmann
reported, where when the PF is up and igbvf is loaded, the MAC address
is not generated using eth_hw_addr_random().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2bf3440d 8d56b6d5

drivers/net/ethernet/intel/e1000e/80003es2lan.c

+1 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw) 
		return ret_val;



	/* SW Reset the PHY so all changes take effect */

	ret_val = e1000e_commit_phy(hw);

	ret_val = hw->phy.ops.commit(hw);

	if (ret_val) {

		e_dbg("Error Resetting the PHY\n");

		return ret_val;

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

+2 −2
Original line number Diff line number Diff line
@@ -1940,7 +1940,7 @@ static const struct e1000_phy_operations e82_phy_ops_m88 = { 
	.check_reset_block	= e1000e_check_reset_block_generic,

	.commit			= e1000e_phy_sw_reset,

	.force_speed_duplex	= e1000e_phy_force_speed_duplex_m88,

	.get_cfg_done		= e1000e_get_cfg_done,

	.get_cfg_done		= e1000e_get_cfg_done_generic,

	.get_cable_length	= e1000e_get_cable_length_m88,

	.get_info		= e1000e_get_phy_info_m88,

	.read_reg		= e1000e_read_phy_reg_m88,
@@ -1958,7 +1958,7 @@ static const struct e1000_phy_operations e82_phy_ops_bm = { 
	.check_reset_block	= e1000e_check_reset_block_generic,

	.commit			= e1000e_phy_sw_reset,

	.force_speed_duplex	= e1000e_phy_force_speed_duplex_m88,

	.get_cfg_done		= e1000e_get_cfg_done,

	.get_cfg_done		= e1000e_get_cfg_done_generic,

	.get_cable_length	= e1000e_get_cable_length_m88,

	.get_info		= e1000e_get_phy_info_m88,

	.read_reg		= e1000e_read_phy_reg_bm2,

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

+2 −7
Original line number Diff line number Diff line
@@ -261,8 +261,6 @@ 
#define E1000_STATUS_PHYRA      0x00000400      /* PHY Reset Asserted */

#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Status of Master requests. */



/* Constants used to interpret the masked PCI-X bus speed. */



#define HALF_DUPLEX 1

#define FULL_DUPLEX 2
@@ -330,8 +328,6 @@ 
#define E1000_TCTL_RTLC   0x01000000    /* Re-transmit on late collision */

#define E1000_TCTL_MULR   0x10000000    /* Multiple request support */



/* Transmit Arbitration Count */



/* SerDes Control */

#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
@@ -393,6 +389,8 @@ 
#define E1000_PBA_8K  0x0008    /* 8KB */

#define E1000_PBA_16K 0x0010    /* 16KB */



#define E1000_PBA_RXA_MASK	0xFFFF



#define E1000_PBS_16K E1000_PBA_16K



/* Uncorrectable/correctable ECC Error counts and enable bits */
@@ -798,9 +796,6 @@ 
#define M88E1000_PSCR_AUTO_X_1000T     0x0040

/* Auto crossover enabled all speeds */

#define M88E1000_PSCR_AUTO_X_MODE      0x0060

/* 1=Enable Extended 10BASE-T distance (Lower 10BASE-T Rx Threshold)

 * 0=Normal 10BASE-T Rx Threshold

 */

#define M88E1000_PSCR_ASSERT_CRS_ON_TX 0x0800 /* 1=Assert CRS on Transmit */



/* M88E1000 PHY Specific Status Register */

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

+1 −11
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ struct e1000_info; 
#define E1000_MIN_ITR_USECS		10 /* 100000 irq/sec */

#define E1000_MAX_ITR_USECS		10000 /* 100    irq/sec */



/* Early Receive defines */

#define E1000_ERT_2048			0x100



#define E1000_FC_PAUSE_TIME		0x0680 /* 858 usec */



/* How many Tx Descriptors do we need to call netif_wake_queue ? */
@@ -579,8 +576,6 @@ extern const struct e1000_info e1000_es2_info; 
extern s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,

					 u32 pba_num_size);



extern s32  e1000e_commit_phy(struct e1000_hw *hw);



extern bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw);



extern bool e1000e_get_laa_state_82571(struct e1000_hw *hw);
@@ -654,7 +649,7 @@ extern s32 e1000e_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, 
                                           u16 data);

extern s32 e1000e_phy_sw_reset(struct e1000_hw *hw);

extern s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw);

extern s32 e1000e_get_cfg_done(struct e1000_hw *hw);

extern s32 e1000e_get_cfg_done_generic(struct e1000_hw *hw);

extern s32 e1000e_get_cable_length_m88(struct e1000_hw *hw);

extern s32 e1000e_get_phy_info_m88(struct e1000_hw *hw);

extern s32 e1000e_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);
@@ -737,11 +732,6 @@ static inline s32 e1e_wphy_locked(struct e1000_hw *hw, u32 offset, u16 data) 
	return hw->phy.ops.write_reg_locked(hw, offset, data);

}



static inline s32 e1000_get_cable_length(struct e1000_hw *hw)

{

	return hw->phy.ops.get_cable_length(hw);

}



extern s32 e1000e_acquire_nvm(struct e1000_hw *hw);

extern s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

extern s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);

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

+3 −2
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter) 
		phy_reg |= 0x006;

		e1e_wphy(hw, PHY_REG(2, 21), phy_reg);

		/* Assert SW reset for above settings to take effect */

		e1000e_commit_phy(hw);

		hw->phy.ops.commit(hw);

		mdelay(1);

		/* Force Full Duplex */

		e1e_rphy(hw, PHY_REG(769, 16), &phy_reg);
@@ -1542,7 +1542,8 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter) 
		if (phy_reg & MII_CR_LOOPBACK) {

			phy_reg &= ~MII_CR_LOOPBACK;

			e1e_wphy(hw, PHY_CONTROL, phy_reg);

			e1000e_commit_phy(hw);

			if (hw->phy.ops.commit)

				hw->phy.ops.commit(hw);

		}

		break;

	}