Commit 48e316bc 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

parents 946a720c e85e3639

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

+7 −5
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) 
	e1000_initialize_hw_bits_80003es2lan(hw);



	/* Initialize identification LED */

	ret_val = e1000e_id_led_init(hw);

	ret_val = mac->ops.id_led_init(hw);

	if (ret_val)

		e_dbg("Error initializing identification LED\n");

		/* This is not fatal and we should not stop init due to this */
@@ -838,7 +838,7 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) 
		E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);



	/* Setup link and flow control */

	ret_val = e1000e_setup_link(hw);

	ret_val = mac->ops.setup_link(hw);



	/* Disable IBIST slave mode (far-end loopback) */

	e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
@@ -1056,7 +1056,7 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw) 
	 * firmware will have already initialized them.  We only initialize

	 * them if the HW is not in IAMT mode.

	 */

	if (!e1000e_check_mng_mode(hw)) {

	if (!hw->mac.ops.check_mng_mode(hw)) {

		/* Enable Electrical Idle on the PHY */

		data |= GG82563_PMCR_ENABLE_ELECTRICAL_IDLE;

		ret_val = e1e_wphy(hw, GG82563_PHY_PWR_MGMT_CTRL, data);
@@ -1413,7 +1413,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw) 


static const struct e1000_mac_operations es2_mac_ops = {

	.read_mac_addr		= e1000_read_mac_addr_80003es2lan,

	.id_led_init		= e1000e_id_led_init,

	.id_led_init		= e1000e_id_led_init_generic,

	.blink_led		= e1000e_blink_led_generic,

	.check_mng_mode		= e1000e_check_mng_mode_generic,

	/* check_for_link dependent on media type */
@@ -1429,9 +1429,10 @@ static const struct e1000_mac_operations es2_mac_ops = { 
	.clear_vfta		= e1000_clear_vfta_generic,

	.reset_hw		= e1000_reset_hw_80003es2lan,

	.init_hw		= e1000_init_hw_80003es2lan,

	.setup_link		= e1000e_setup_link,

	.setup_link		= e1000e_setup_link_generic,

	/* setup_physical_interface dependent on media type */

	.setup_led		= e1000e_setup_led_generic,

	.config_collision_dist	= e1000e_config_collision_dist_generic,

};



static const struct e1000_phy_operations es2_phy_ops = {
@@ -1456,6 +1457,7 @@ static const struct e1000_nvm_operations es2_nvm_ops = { 
	.acquire		= e1000_acquire_nvm_80003es2lan,

	.read			= e1000e_read_nvm_eerd,

	.release		= e1000_release_nvm_80003es2lan,

	.reload			= e1000e_reload_nvm_generic,

	.update			= e1000e_update_nvm_checksum_generic,

	.valid_led_default	= e1000e_valid_led_default,

	.validate		= e1000e_validate_nvm_checksum_generic,

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

+6 −4
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) 
	e1000_initialize_hw_bits_82571(hw);



	/* Initialize identification LED */

	ret_val = e1000e_id_led_init(hw);

	ret_val = mac->ops.id_led_init(hw);

	if (ret_val)

		e_dbg("Error initializing identification LED\n");

		/* This is not fatal and we should not stop init due to this */
@@ -1143,7 +1143,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) 
		E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);



	/* Setup link and flow control */

	ret_val = e1000_setup_link_82571(hw);

	ret_val = mac->ops.setup_link(hw);



	/* Set the transmit descriptor write-back policy */

	reg_data = er32(TXDCTL(0));
@@ -1455,7 +1455,7 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw) 
		break;

	}



	return e1000e_setup_link(hw);

	return e1000e_setup_link_generic(hw);

}



/**
@@ -1911,7 +1911,7 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw) 
static const struct e1000_mac_operations e82571_mac_ops = {

	/* .check_mng_mode: mac type dependent */

	/* .check_for_link: media type dependent */

	.id_led_init		= e1000e_id_led_init,

	.id_led_init		= e1000e_id_led_init_generic,

	.cleanup_led		= e1000e_cleanup_led_generic,

	.clear_hw_cntrs		= e1000_clear_hw_cntrs_82571,

	.get_bus_info		= e1000e_get_bus_info_pcie,
@@ -1927,6 +1927,7 @@ static const struct e1000_mac_operations e82571_mac_ops = { 
	.setup_link		= e1000_setup_link_82571,

	/* .setup_physical_interface: media type dependent */

	.setup_led		= e1000e_setup_led_generic,

	.config_collision_dist	= e1000e_config_collision_dist_generic,

	.read_mac_addr		= e1000_read_mac_addr_82571,

};
@@ -1988,6 +1989,7 @@ static const struct e1000_nvm_operations e82571_nvm_ops = { 
	.acquire		= e1000_acquire_nvm_82571,

	.read			= e1000e_read_nvm_eerd,

	.release		= e1000_release_nvm_82571,

	.reload			= e1000e_reload_nvm_generic,

	.update			= e1000_update_nvm_checksum_82571,

	.valid_led_default	= e1000_valid_led_default_82571,

	.validate		= e1000_validate_nvm_checksum_82571,

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

+4 −14
Original line number Diff line number Diff line
@@ -559,12 +559,12 @@ extern s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, u 
extern s32 e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw *hw, u16 *speed, u16 *duplex);

extern s32 e1000e_disable_pcie_master(struct e1000_hw *hw);

extern s32 e1000e_get_auto_rd_done(struct e1000_hw *hw);

extern s32 e1000e_id_led_init(struct e1000_hw *hw);

extern s32 e1000e_id_led_init_generic(struct e1000_hw *hw);

extern void e1000e_clear_hw_cntrs_base(struct e1000_hw *hw);

extern s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw);

extern s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw);

extern s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw);

extern s32 e1000e_setup_link(struct e1000_hw *hw);

extern s32 e1000e_setup_link_generic(struct e1000_hw *hw);

extern void e1000_clear_vfta_generic(struct e1000_hw *hw);

extern void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);

extern void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
@@ -575,7 +575,7 @@ extern s32 e1000e_set_fc_watermarks(struct e1000_hw *hw); 
extern void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);

extern s32 e1000e_get_hw_semaphore(struct e1000_hw *hw);

extern s32 e1000e_valid_led_default(struct e1000_hw *hw, u16 *data);

extern void e1000e_config_collision_dist(struct e1000_hw *hw);

extern void e1000e_config_collision_dist_generic(struct e1000_hw *hw);

extern s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw);

extern s32 e1000e_force_mac_fc(struct e1000_hw *hw);

extern s32 e1000e_blink_led_generic(struct e1000_hw *hw);
@@ -662,11 +662,6 @@ static inline s32 e1000_phy_hw_reset(struct e1000_hw *hw) 
	return hw->phy.ops.reset(hw);

}



static inline s32 e1000_check_reset_block(struct e1000_hw *hw)

{

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

}



static inline s32 e1e_rphy(struct e1000_hw *hw, u32 offset, u16 *data)

{

	return hw->phy.ops.read_reg(hw, offset, data);
@@ -689,7 +684,7 @@ extern s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg); 
extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);

extern void e1000e_release_nvm(struct e1000_hw *hw);

extern void e1000e_reload_nvm(struct e1000_hw *hw);

extern void e1000e_reload_nvm_generic(struct e1000_hw *hw);

extern s32 e1000_read_mac_addr_generic(struct e1000_hw *hw);



static inline s32 e1000e_read_mac_addr(struct e1000_hw *hw)
@@ -725,11 +720,6 @@ static inline s32 e1000_get_phy_info(struct e1000_hw *hw) 
	return hw->phy.ops.get_info(hw);

}



static inline s32 e1000e_check_mng_mode(struct e1000_hw *hw)

{

	return hw->mac.ops.check_mng_mode(hw);

}



extern bool e1000e_check_mng_mode_generic(struct e1000_hw *hw);

extern bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);

extern s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);

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

+4 −2
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int e1000_set_settings(struct net_device *netdev, 
	 * When SoL/IDER sessions are active, autoneg/speed/duplex

	 * cannot be changed

	 */

	if (e1000_check_reset_block(hw)) {

	if (hw->phy.ops.check_reset_block(hw)) {

		e_err("Cannot change link characteristics when SoL/IDER is "

		      "active.\n");

		return -EINVAL;
@@ -1598,11 +1598,13 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter) 


static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)

{

	struct e1000_hw *hw = &adapter->hw;



	/*

	 * PHY loopback cannot be performed if SoL/IDER

	 * sessions are active

	 */

	if (e1000_check_reset_block(&adapter->hw)) {

	if (hw->phy.ops.check_reset_block(hw)) {

		e_err("Cannot do PHY loopback test when SoL/IDER is active.\n");

		*data = 0;

		goto out;

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

+2 −0
Original line number Diff line number Diff line
@@ -781,6 +781,7 @@ struct e1000_mac_operations { 
	s32  (*setup_physical_interface)(struct e1000_hw *);

	s32  (*setup_led)(struct e1000_hw *);

	void (*write_vfta)(struct e1000_hw *, u32, u32);

	void (*config_collision_dist)(struct e1000_hw *);

	s32  (*read_mac_addr)(struct e1000_hw *);

};
@@ -829,6 +830,7 @@ struct e1000_nvm_operations { 
	s32  (*acquire)(struct e1000_hw *);

	s32  (*read)(struct e1000_hw *, u16, u16, u16 *);

	void (*release)(struct e1000_hw *);

	void (*reload)(struct e1000_hw *);

	s32  (*update)(struct e1000_hw *);

	s32  (*valid_led_default)(struct e1000_hw *, u16 *);

	s32  (*validate)(struct e1000_hw *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE