d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/ixgbe/base: refactor EEE setup for X550

Browse Source 
Break ixgbe_setup_eee_X550 down to better handle a change from if
statements to switch statements needed to add X550em_a KR support.

Signed-off-by: Beilei Xing <beilei.xing@intel.com>
This commit is contained in:
Beilei Xing 2016-06-23 15:22:14 +08:00 committed by Bruce Richardson
parent 928d240123
commit a05454ba5f
1 changed files with 105 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
drivers/net/ixgbe/base/ixgbe_x550.c
View File

@ -751,46 +751,29 @@ s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)
}
/**
* ixgbe_setup_eee_X550 - Enable/disable EEE support
* @hw: pointer to the HW structure
* @enable_eee: boolean flag to enable EEE
*
* Enable/disable EEE based on enable_eee flag.
* Auto-negotiation must be started after BASE-T EEE bits in PHY register 7.3C
* are modified.
*
**/
s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)
* ixgbe_enable_eee_x550 - Enable EEE support
* @hw: pointer to hardware structure
*/
static s32 ixgbe_enable_eee_x550(struct ixgbe_hw *hw)
{
u32 eeer;
u16 autoneg_eee_reg;
u32 link_reg;
s32 status;
DEBUGFUNC("ixgbe_setup_eee_X550");
eeer = IXGBE_READ_REG(hw, IXGBE_EEER);
/* Enable or disable EEE per flag */
if (enable_eee) {
eeer |= (IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
if (hw->mac.type == ixgbe_mac_X550) {
/* Advertise EEE capability */
hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &autoneg_eee_reg);
IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
&autoneg_eee_reg);
autoneg_eee_reg |= (IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |
IXGBE_AUTO_NEG_1000BASE_EEE_ADVT |
IXGBE_AUTO_NEG_100BASE_EEE_ADVT);
hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
IXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_eee_reg);
IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
autoneg_eee_reg);
} else if (hw->device_id == IXGBE_DEV_ID_X550EM_X_KR) {
/* Not supported on first revision of X550EM_x. */
if ((hw->mac.type == ixgbe_mac_X550EM_x) &&
!(IXGBE_FUSES0_REV_MASK &
IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0))))
return IXGBE_SUCCESS;
status = ixgbe_read_iosf_sb_reg_x550(hw,
IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
@ -810,20 +793,33 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)
if (status != IXGBE_SUCCESS)
return status;
}
} else {
eeer &= ~(IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
return IXGBE_SUCCESS;
}
/**
* ixgbe_disable_eee_x550 - Disable EEE support
* @hw: pointer to hardware structure
*/
static s32 ixgbe_disable_eee_x550(struct ixgbe_hw *hw)
{
u16 autoneg_eee_reg;
u32 link_reg;
s32 status;
if (hw->mac.type == ixgbe_mac_X550) {
/* Disable advertised EEE capability */
hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &autoneg_eee_reg);
IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
&autoneg_eee_reg);
autoneg_eee_reg &= ~(IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |
IXGBE_AUTO_NEG_1000BASE_EEE_ADVT |
IXGBE_AUTO_NEG_100BASE_EEE_ADVT);
hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
IXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_eee_reg);
IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
autoneg_eee_reg);
} else if (hw->device_id == IXGBE_DEV_ID_X550EM_X_KR) {
status = ixgbe_read_iosf_sb_reg_x550(hw,
IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
@ -843,6 +839,46 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)
if (status != IXGBE_SUCCESS)
return status;
}
return IXGBE_SUCCESS;
}
/**
* ixgbe_setup_eee_X550 - Enable/disable EEE support
* @hw: pointer to the HW structure
* @enable_eee: boolean flag to enable EEE
*
* Enable/disable EEE based on enable_eee flag.
* Auto-negotiation must be started after BASE-T EEE bits in PHY register 7.3C
* are modified.
*
**/
s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)
{
s32 status;
u32 eeer;
DEBUGFUNC("ixgbe_setup_eee_X550");
eeer = IXGBE_READ_REG(hw, IXGBE_EEER);
/* Enable or disable EEE per flag */
if (enable_eee) {
eeer |= (IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
/* Not supported on first revision of X550EM_x. */
if ((hw->mac.type == ixgbe_mac_X550EM_x) &&
!(IXGBE_FUSES0_REV_MASK &
IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0))))
return IXGBE_SUCCESS;
status = ixgbe_enable_eee_x550(hw);
if (status)
return status;
} else {
eeer &= ~(IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
status = ixgbe_disable_eee_x550(hw);
if (status)
return status;
}
IXGBE_WRITE_REG(hw, IXGBE_EEER, eeer);