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

Commit 17f208de authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

e1000e: provide family-specific PHY power up/down operations 



The different families (80003es2lan, 8257x, ICHx/PCH) supported by the
driver each have their own conditions when the PHY can be powered down.
This patch rewrites the PHY power up/down code to fit with the family-
specific style used in the driver.  All pre-existing calls to power up or
down the PHY remain untouched.  A new call to power down the PHY when
removing the driver when the interface is down replaces the current call
to reset the PHY in order to reduce power consumption.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb656d45

drivers/net/e1000e/82571.c

+26 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static void e1000_clear_vfta_82571(struct e1000_hw *hw); 
static bool e1000_check_mng_mode_82574(struct e1000_hw *hw);

static s32 e1000_led_on_82574(struct e1000_hw *hw);

static void e1000_put_hw_semaphore_82571(struct e1000_hw *hw);

static void e1000_power_down_phy_copper_82571(struct e1000_hw *hw);



/**

 *  e1000_init_phy_params_82571 - Init PHY func ptrs.
@@ -88,6 +89,9 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw) 
	phy->autoneg_mask		 = AUTONEG_ADVERTISE_SPEED_DEFAULT;

	phy->reset_delay_us		 = 100;



	phy->ops.power_up		 = e1000_power_up_phy_copper;

	phy->ops.power_down		 = e1000_power_down_phy_copper_82571;



	switch (hw->mac.type) {

	case e1000_82571:

	case e1000_82572:
@@ -1600,6 +1604,28 @@ static s32 e1000_fix_nvm_checksum_82571(struct e1000_hw *hw) 
	return 0;

}



/**

 * e1000_power_down_phy_copper_82571 - Remove link during PHY power down

 * @hw: pointer to the HW structure

 *

 * In the case of a PHY power down to save power, or to turn off link during a

 * driver unload, or wake on lan is not enabled, remove the link.

 **/

static void e1000_power_down_phy_copper_82571(struct e1000_hw *hw)

{

	struct e1000_phy_info *phy = &hw->phy;

	struct e1000_mac_info *mac = &hw->mac;



	if (!(phy->ops.check_reset_block))

		return;



	/* If the management interface is not enabled, then power down */

	if (!(mac->ops.check_mng_mode(hw) || phy->ops.check_reset_block(hw)))

		e1000_power_down_phy_copper(hw);



	return;

}



/**

 *  e1000_clear_hw_cntrs_82571 - Clear device specific hardware counters

 *  @hw: pointer to the HW structure

drivers/net/e1000e/e1000.h

+2 −0
Original line number Diff line number Diff line
@@ -568,6 +568,8 @@ extern s32 e1000e_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, 
extern s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,

			       u32 usec_interval, bool *success);

extern s32 e1000e_phy_reset_dsp(struct e1000_hw *hw);

extern void e1000_power_up_phy_copper(struct e1000_hw *hw);

extern void e1000_power_down_phy_copper(struct e1000_hw *hw);

extern s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data);

extern s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data);

extern s32 e1000e_check_downshift(struct e1000_hw *hw);

drivers/net/e1000e/es2lan.c

+21 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, 
                                            u16 *data);

static s32  e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,

                                             u16 data);

static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw);



/**

 *  e1000_init_phy_params_80003es2lan - Init ESB2 PHY func ptrs.
@@ -127,6 +128,9 @@ static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw) 
	if (hw->phy.media_type != e1000_media_type_copper) {

		phy->type	= e1000_phy_none;

		return 0;

	} else {

		phy->ops.power_up = e1000_power_up_phy_copper;

		phy->ops.power_down = e1000_power_down_phy_copper_80003es2lan;

	}



	phy->addr		= 1;
@@ -1302,6 +1306,23 @@ static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, 
	return ret_val;

}



/**

 * e1000_power_down_phy_copper_80003es2lan - Remove link during PHY power down

 * @hw: pointer to the HW structure

 *

 * In the case of a PHY power down to save power, or to turn off link during a

 * driver unload, or wake on lan is not enabled, remove the link.

 **/

static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw)

{

	/* If the management interface is not enabled, then power down */

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

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

		e1000_power_down_phy_copper(hw);



	return;

}



/**

 *  e1000_clear_hw_cntrs_80003es2lan - Clear device specific hardware counters

 *  @hw: pointer to the HW structure

drivers/net/e1000e/hw.h

+2 −0
Original line number Diff line number Diff line
@@ -774,6 +774,8 @@ struct e1000_phy_operations { 
	s32  (*set_d3_lplu_state)(struct e1000_hw *, bool);

	s32  (*write_reg)(struct e1000_hw *, u32, u16);

	s32  (*write_reg_locked)(struct e1000_hw *, u32, u16);

	void (*power_up)(struct e1000_hw *);

	void (*power_down)(struct e1000_hw *);

};



/* Function pointers for the NVM. */

drivers/net/e1000e/ich8lan.c

+23 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ static s32 e1000_cleanup_led_pchlan(struct e1000_hw *hw); 
static s32 e1000_led_on_pchlan(struct e1000_hw *hw);

static s32 e1000_led_off_pchlan(struct e1000_hw *hw);

static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active);

static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw);

static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw);

static s32  e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
@@ -266,6 +267,8 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) 
	phy->ops.set_d3_lplu_state    = e1000_set_lplu_state_pchlan;

	phy->ops.write_reg            = e1000_write_phy_reg_hv;

	phy->ops.write_reg_locked     = e1000_write_phy_reg_hv_locked;

	phy->ops.power_up             = e1000_power_up_phy_copper;

	phy->ops.power_down           = e1000_power_down_phy_copper_ich8lan;

	phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;



	phy->id = e1000_phy_unknown;
@@ -299,6 +302,9 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw) 
	phy->addr			= 1;

	phy->reset_delay_us		= 100;



	phy->ops.power_up               = e1000_power_up_phy_copper;

	phy->ops.power_down             = e1000_power_down_phy_copper_ich8lan;



	/*

	 * We may need to do this twice - once for IGP and if that fails,

	 * we'll set BM func pointers and try again
@@ -3391,6 +3397,23 @@ static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw) 
	return 0;

}



/**

 * e1000_power_down_phy_copper_ich8lan - Remove link during PHY power down

 * @hw: pointer to the HW structure

 *

 * In the case of a PHY power down to save power, or to turn off link during a

 * driver unload, or wake on lan is not enabled, remove the link.

 **/

static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw)

{

	/* If the management interface is not enabled, then power down */

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

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

		e1000_power_down_phy_copper(hw);



	return;

}



/**

 *  e1000_clear_hw_cntrs_ich8lan - Clear statistical counters

 *  @hw: pointer to the HW structure