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

Commit 88a268c1 authored by Nick Nunley's avatar Nick Nunley Committed by David S. Miller
Browse files

igb: Power down link when interface is down 



This changes the behavior of the driver to power down the link
when the associated interface is down, unless management is enabled.

Signed-off-by: default avatarNicholas Nunley <nicholasx.d.nunley@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53c992fa

drivers/net/igb/e1000_82575.c

+44 −0
Original line number Diff line number Diff line
@@ -726,6 +726,34 @@ static s32 igb_check_for_link_82575(struct e1000_hw *hw) 
	return ret_val;

}



/**

 *  igb_power_up_serdes_link_82575 - Power up the serdes link after shutdown

 *  @hw: pointer to the HW structure

 **/

void igb_power_up_serdes_link_82575(struct e1000_hw *hw)

{

	u32 reg;





	if ((hw->phy.media_type != e1000_media_type_internal_serdes) &&

	    !igb_sgmii_active_82575(hw))

		return;



	/* Enable PCS to turn on link */

	reg = rd32(E1000_PCS_CFG0);

	reg |= E1000_PCS_CFG_PCS_EN;

	wr32(E1000_PCS_CFG0, reg);



	/* Power up the laser */

	reg = rd32(E1000_CTRL_EXT);

	reg &= ~E1000_CTRL_EXT_SDP3_DATA;

	wr32(E1000_CTRL_EXT, reg);



	/* flush the write to verify completion */

	wrfl();

	msleep(1);

}



/**

 *  igb_get_pcs_speed_and_duplex_82575 - Retrieve current speed/duplex

 *  @hw: pointer to the HW structure
@@ -1165,6 +1193,22 @@ static s32 igb_read_mac_addr_82575(struct e1000_hw *hw) 
	return ret_val;

}



/**

 * igb_power_down_phy_copper_82575 - 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.

 **/

void igb_power_down_phy_copper_82575(struct e1000_hw *hw)

{

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

	if (!(igb_enable_mng_pass_thru(hw) || igb_check_reset_block(hw)))

		igb_power_down_phy_copper(hw);



	return;

}



/**

 *  igb_clear_hw_cntrs_82575 - Clear device specific hardware counters

 *  @hw: pointer to the HW structure

drivers/net/igb/e1000_82575.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#define _E1000_82575_H_



extern void igb_shutdown_serdes_link_82575(struct e1000_hw *hw);

extern void igb_power_up_serdes_link_82575(struct e1000_hw *hw);

extern void igb_power_down_phy_copper_82575(struct e1000_hw *hw);

extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);



#define ID_LED_DEFAULT_82575_SERDES ((ID_LED_DEF1_DEF2 << 12) | \

drivers/net/igb/e1000_defines.h

+1 −0
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ 
/* PHY Control Register */

#define MII_CR_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */

#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */

#define MII_CR_POWER_DOWN       0x0800  /* Power down */

#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */

#define MII_CR_LOOPBACK         0x4000  /* 0 = normal, 1 = loopback */

#define MII_CR_RESET            0x8000  /* 0 = normal, 1 = PHY reset */

drivers/net/igb/e1000_phy.c

+35 −0
Original line number Diff line number Diff line
@@ -1930,6 +1930,41 @@ s32 igb_phy_init_script_igp3(struct e1000_hw *hw) 
	return 0;

}



/**

 * igb_power_up_phy_copper - Restore copper link in case of 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, restore the link to previous settings.

 **/

void igb_power_up_phy_copper(struct e1000_hw *hw)

{

	u16 mii_reg = 0;



	/* The PHY will retain its settings across a power down/up cycle */

	hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);

	mii_reg &= ~MII_CR_POWER_DOWN;

	hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);

}



/**

 * igb_power_down_phy_copper - Power down copper PHY

 * @hw: pointer to the HW structure

 *

 * Power down PHY to save power when interface is down and wake on lan

 * is not enabled.

 **/

void igb_power_down_phy_copper(struct e1000_hw *hw)

{

	u16 mii_reg = 0;



	/* The PHY will retain its settings across a power down/up cycle */

	hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);

	mii_reg |= MII_CR_POWER_DOWN;

	hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);

	msleep(1);

}



/**

 *  igb_check_polarity_82580 - Checks the polarity.

 *  @hw: pointer to the HW structure

drivers/net/igb/e1000_phy.h

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ s32 igb_setup_copper_link(struct e1000_hw *hw); 
s32  igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);

s32  igb_phy_has_link(struct e1000_hw *hw, u32 iterations,

				u32 usec_interval, bool *success);

void igb_power_up_phy_copper(struct e1000_hw *hw);

void igb_power_down_phy_copper(struct e1000_hw *hw);

s32  igb_phy_init_script_igp3(struct e1000_hw *hw);

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

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