ixgbe/base: add X550em PHY interrupt and forced speeds
This patch adds x550em external PHY interrupt and forced 1G/10G support. Support includes enabling and handling Link Status Change and Thermal Sensor interrupt. ixgbe_handle_lasi has been added to the API for handling the interrupts received from x550em PHY. ixgbe_enable_lasi_ext_t_x550em and ixgbe_get_lasi_ext_t_x550em have been added to X550em to enable mask and check interrupt flags for x550em PHY. Forced 1G/10G link speed is handled via ixgbe_setup_mac_link_t_X550em. ixgbe_setup_mac_link_t_X550em sets up the internal PHY and external PHY link to either 10G or 1G based on the user selected auto advertised link speed setting. Then sets up the external PHY auto advertised link speed. Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com> Acked-by: Helin Zhang <helin.zhang@intel.com>
This commit is contained in:
Wenzhuo Lu
Thomas Monjalon
parent
9c7b19c17b
commit
842247cac5
@ -1292,6 +1292,23 @@ s32 ixgbe_enter_lplu(struct ixgbe_hw *hw)
|
||||
IXGBE_NOT_IMPLEMENTED);
|
||||
}
|
||||
|
||||
/**
|
||||
* ixgbe_handle_lasi - Handle external Base T PHY interrupt
|
||||
* @hw: pointer to hardware structure
|
||||
*
|
||||
* Handle external Base T PHY interrupt. If high temperature
|
||||
* failure alarm then return error, else if link status change
|
||||
* then setup internal/external PHY link
|
||||
*
|
||||
* Return IXGBE_ERR_OVERTEMP if interrupt is high temperature
|
||||
* failure alarm, else return PHY access status.
|
||||
*/
|
||||
s32 ixgbe_handle_lasi(struct ixgbe_hw *hw)
|
||||
{
|
||||
return ixgbe_call_func(hw, hw->phy.ops.handle_lasi, (hw),
|
||||
IXGBE_NOT_IMPLEMENTED);
|
||||
}
|
||||
|
||||
/**
|
||||
* ixgbe_read_analog_reg8 - Reads 8 bit analog register
|
||||
* @hw: pointer to hardware structure
|
||||
|
||||
@ -212,6 +212,7 @@ void ixgbe_enable_mdd(struct ixgbe_hw *hw);
|
||||
void ixgbe_mdd_event(struct ixgbe_hw *hw, u32 *vf_bitmap);
|
||||
void ixgbe_restore_mdd_vf(struct ixgbe_hw *hw, u32 vf);
|
||||
s32 ixgbe_enter_lplu(struct ixgbe_hw *hw);
|
||||
s32 ixgbe_handle_lasi(struct ixgbe_hw *hw);
|
||||
void ixgbe_set_rate_select_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed);
|
||||
void ixgbe_disable_rx(struct ixgbe_hw *hw);
|
||||
void ixgbe_enable_rx(struct ixgbe_hw *hw);
|
||||
|
||||
@ -1378,6 +1378,8 @@ struct ixgbe_dmac_config {
|
||||
#define IXGBE_MDIO_AUTO_NEG_STATUS 0x1 /* AUTO_NEG Status Reg */
|
||||
#define IXGBE_MDIO_AUTO_NEG_VENDOR_STAT 0xC800 /* AUTO_NEG Vendor Status Reg */
|
||||
#define IXGBE_MDIO_AUTO_NEG_VENDOR_TX_ALARM 0xCC00 /* AUTO_NEG Vendor TX Reg */
|
||||
#define IXGBE_MDIO_AUTO_NEG_VENDOR_TX_ALARM2 0xCC01 /* AUTO_NEG Vendor Tx Reg */
|
||||
#define IXGBE_MDIO_AUTO_NEG_VEN_LSC 0x1 /* AUTO_NEG Vendor Tx LSC */
|
||||
#define IXGBE_MDIO_AUTO_NEG_ADVT 0x10 /* AUTO_NEG Advt Reg */
|
||||
#define IXGBE_MDIO_AUTO_NEG_LP 0x13 /* AUTO_NEG LP Status Reg */
|
||||
#define IXGBE_MDIO_AUTO_NEG_EEE_ADVT 0x3C /* AUTO_NEG EEE Advt Reg */
|
||||
@ -1406,11 +1408,24 @@ struct ixgbe_dmac_config {
|
||||
#define IXGBE_MDIO_TX_VENDOR_ALARMS_3_RST_MASK 0x3 /* PHY Reset Complete Mask */
|
||||
#define IXGBE_MDIO_GLOBAL_RES_PR_10 0xC479 /* Global Resv Provisioning 10 Reg */
|
||||
#define IXGBE_MDIO_POWER_UP_STALL 0x8000 /* Power Up Stall */
|
||||
|
||||
#define IXGBE_MDIO_GLOBAL_INT_CHIP_STD_MASK 0xFF00 /* int std mask */
|
||||
#define IXGBE_MDIO_GLOBAL_CHIP_STD_INT_FLAG 0xFC00 /* chip std int flag */
|
||||
#define IXGBE_MDIO_GLOBAL_INT_CHIP_VEN_MASK 0xFF01 /* int chip-wide mask */
|
||||
#define IXGBE_MDIO_GLOBAL_INT_CHIP_VEN_FLAG 0xFC01 /* int chip-wide mask */
|
||||
#define IXGBE_MDIO_GLOBAL_ALARM_1 0xCC00 /* Global alarm 1 */
|
||||
#define IXGBE_MDIO_GLOBAL_ALM_1_HI_TMP_FAIL 0x4000 /* high temp failure */
|
||||
#define IXGBE_MDIO_GLOBAL_INT_MASK 0xD400 /* Global int mask */
|
||||
#define IXGBE_MDIO_GLOBAL_AN_VEN_ALM_INT_EN 0x1000 /* autoneg vendor alarm int enable */
|
||||
#define IXGBE_MDIO_GLOBAL_ALARM_1_INT 0x4 /* int in Global alarm 1 */
|
||||
#define IXGBE_MDIO_GLOBAL_VEN_ALM_INT_EN 0x1 /* vendor alarm int enable */
|
||||
#define IXGBE_MDIO_GLOBAL_STD_ALM2_INT 0x200 /* vendor alarm2 int mask */
|
||||
#define IXGBE_MDIO_GLOBAL_INT_HI_TEMP_EN 0x4000 /* int high temp enable */
|
||||
#define IXGBE_MDIO_PMA_PMD_CONTROL_ADDR 0x0000 /* PMA/PMD Control Reg */
|
||||
#define IXGBE_MDIO_PMA_PMD_SDA_SCL_ADDR 0xC30A /* PHY_XS SDA/SCL Addr Reg */
|
||||
#define IXGBE_MDIO_PMA_PMD_SDA_SCL_DATA 0xC30B /* PHY_XS SDA/SCL Data Reg */
|
||||
#define IXGBE_MDIO_PMA_PMD_SDA_SCL_STAT 0xC30C /* PHY_XS SDA/SCL Status Reg */
|
||||
#define IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK 0xD401 /* PHY TX Vendor LASI */
|
||||
#define IXGBE_MDIO_PMA_TX_VEN_LASI_INT_EN 0x1 /* PHY TX Vendor LASI enable */
|
||||
#define IXGBE_MDIO_PMD_STD_TX_DISABLE_CNTR 0x9 /* Standard Transmit Dis Reg */
|
||||
#define IXGBE_MDIO_PMD_GLOBAL_TX_DISABLE 0x0001 /* PMD Global Transmit Dis */
|
||||
|
||||
@ -3642,6 +3657,7 @@ struct ixgbe_phy_operations {
|
||||
s32 (*check_overtemp)(struct ixgbe_hw *);
|
||||
s32 (*set_phy_power)(struct ixgbe_hw *, bool on);
|
||||
s32 (*enter_lplu)(struct ixgbe_hw *);
|
||||
s32 (*handle_lasi)(struct ixgbe_hw *hw);
|
||||
s32 (*read_i2c_combined_unlocked)(struct ixgbe_hw *, u8 addr, u16 reg,
|
||||
u16 *value);
|
||||
s32 (*write_i2c_combined_unlocked)(struct ixgbe_hw *, u8 addr, u16 reg,
|
||||
|
||||
@ -1055,10 +1055,11 @@ void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)
|
||||
|
||||
DEBUGFUNC("ixgbe_init_mac_link_ops_X550em");
|
||||
|
||||
/* CS4227 does not support autoneg, so disable the laser control
|
||||
* functions for SFP+ fiber
|
||||
*/
|
||||
if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) {
|
||||
switch (hw->mac.ops.get_media_type(hw)) {
|
||||
case ixgbe_media_type_fiber:
|
||||
/* CS4227 does not support autoneg, so disable the laser control
|
||||
* functions for SFP+ fiber
|
||||
*/
|
||||
mac->ops.disable_tx_laser = NULL;
|
||||
mac->ops.enable_tx_laser = NULL;
|
||||
mac->ops.flap_tx_laser = NULL;
|
||||
@ -1066,6 +1067,12 @@ void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)
|
||||
mac->ops.setup_mac_link = ixgbe_setup_mac_link_sfp_x550em;
|
||||
mac->ops.set_rate_select_speed =
|
||||
ixgbe_set_soft_rate_select_speed;
|
||||
break;
|
||||
case ixgbe_media_type_copper:
|
||||
mac->ops.setup_link = ixgbe_setup_mac_link_t_X550em;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1111,6 +1118,163 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
|
||||
return IXGBE_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* ixgbe_get_lasi_ext_t_x550em - Determime external Base T PHY interrupt cause
|
||||
* @hw: pointer to hardware structure
|
||||
* @lsc: pointer to boolean flag which indicates whether external Base T
|
||||
* PHY interrupt is lsc
|
||||
*
|
||||
* Determime if external Base T PHY interrupt cause is high temperature
|
||||
* failure alarm or link status change.
|
||||
*
|
||||
* Return IXGBE_ERR_OVERTEMP if interrupt is high temperature
|
||||
* failure alarm, else return PHY access status.
|
||||
*/
|
||||
STATIC s32 ixgbe_get_lasi_ext_t_x550em(struct ixgbe_hw *hw, bool *lsc)
|
||||
{
|
||||
u32 status;
|
||||
u16 reg;
|
||||
|
||||
*lsc = false;
|
||||
|
||||
/* Vendor alarm triggered */
|
||||
status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_GLOBAL_CHIP_STD_INT_FLAG,
|
||||
IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE,
|
||||
®);
|
||||
|
||||
if (status != IXGBE_SUCCESS ||
|
||||
!(reg & IXGBE_MDIO_GLOBAL_VEN_ALM_INT_EN))
|
||||
return status;
|
||||
|
||||
/* Vendor Auto-Neg alarm triggered or Global alarm 1 triggered */
|
||||
status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_GLOBAL_INT_CHIP_VEN_FLAG,
|
||||
IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE,
|
||||
®);
|
||||
|
||||
if (status != IXGBE_SUCCESS ||
|
||||
!(reg & (IXGBE_MDIO_GLOBAL_AN_VEN_ALM_INT_EN |
|
||||
IXGBE_MDIO_GLOBAL_ALARM_1_INT)))
|
||||
return status;
|
||||
|
||||
/* High temperature failure alarm triggered */
|
||||
status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_GLOBAL_ALARM_1,
|
||||
IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE,
|
||||
®);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
/* If high temperature failure, then return over temp error and exit */
|
||||
if (reg & IXGBE_MDIO_GLOBAL_ALM_1_HI_TMP_FAIL)
|
||||
return IXGBE_ERR_OVERTEMP;
|
||||
|
||||
/* Vendor alarm 2 triggered */
|
||||
status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_GLOBAL_CHIP_STD_INT_FLAG,
|
||||
IXGBE_MDIO_AUTO_NEG_DEV_TYPE, ®);
|
||||
|
||||
if (status != IXGBE_SUCCESS ||
|
||||
!(reg & IXGBE_MDIO_GLOBAL_STD_ALM2_INT))
|
||||
return status;
|
||||
|
||||
/* link connect/disconnect event occurred */
|
||||
status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_VENDOR_TX_ALARM2,
|
||||
IXGBE_MDIO_AUTO_NEG_DEV_TYPE, ®);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
/* Indicate LSC */
|
||||
if (reg & IXGBE_MDIO_AUTO_NEG_VEN_LSC)
|
||||
*lsc = true;
|
||||
|
||||
return IXGBE_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* ixgbe_enable_lasi_ext_t_x550em - Enable external Base T PHY interrupts
|
||||
* @hw: pointer to hardware structure
|
||||
*
|
||||
* Enable link status change and temperature failure alarm for the external
|
||||
* Base T PHY
|
||||
*
|
||||
* Returns PHY access status
|
||||
*/
|
||||
STATIC s32 ixgbe_enable_lasi_ext_t_x550em(struct ixgbe_hw *hw)
|
||||
{
|
||||
u32 status;
|
||||
u16 reg;
|
||||
bool lsc;
|
||||
|
||||
/* Clear interrupt flags */
|
||||
status = ixgbe_get_lasi_ext_t_x550em(hw, &lsc);
|
||||
|
||||
/* Enable link status change alarm */
|
||||
status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
|
||||
IXGBE_MDIO_AUTO_NEG_DEV_TYPE, ®);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
reg |= IXGBE_MDIO_PMA_TX_VEN_LASI_INT_EN;
|
||||
|
||||
status = hw->phy.ops.write_reg(hw, IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
|
||||
IXGBE_MDIO_AUTO_NEG_DEV_TYPE, reg);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
/* Enables high temperature failure alarm */
|
||||
status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_GLOBAL_INT_MASK,
|
||||
IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE,
|
||||
®);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
reg |= IXGBE_MDIO_GLOBAL_INT_HI_TEMP_EN;
|
||||
|
||||
status = hw->phy.ops.write_reg(hw, IXGBE_MDIO_GLOBAL_INT_MASK,
|
||||
IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE,
|
||||
reg);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
/* Enable vendor Auto-Neg alarm and Global Interrupt Mask 1 alarm */
|
||||
status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_GLOBAL_INT_CHIP_VEN_MASK,
|
||||
IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE,
|
||||
®);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
reg |= (IXGBE_MDIO_GLOBAL_AN_VEN_ALM_INT_EN |
|
||||
IXGBE_MDIO_GLOBAL_ALARM_1_INT);
|
||||
|
||||
status = hw->phy.ops.write_reg(hw, IXGBE_MDIO_GLOBAL_INT_CHIP_VEN_MASK,
|
||||
IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE,
|
||||
reg);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
/* Enable chip-wide vendor alarm */
|
||||
status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_GLOBAL_INT_CHIP_STD_MASK,
|
||||
IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE,
|
||||
®);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
reg |= IXGBE_MDIO_GLOBAL_VEN_ALM_INT_EN;
|
||||
|
||||
status = hw->phy.ops.write_reg(hw, IXGBE_MDIO_GLOBAL_INT_CHIP_STD_MASK,
|
||||
IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE,
|
||||
reg);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* ixgbe_init_phy_ops_X550em - PHY/SFP specific init
|
||||
* @hw: pointer to hardware structure
|
||||
@ -1136,7 +1300,7 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
|
||||
if (ret_val == IXGBE_ERR_SFP_NOT_SUPPORTED)
|
||||
return ret_val;
|
||||
|
||||
/* Setup function pointers based on detected SFP module and speeds */
|
||||
/* Setup function pointers based on detected hardware */
|
||||
ixgbe_init_mac_link_ops_X550em(hw);
|
||||
if (phy->sfp_type != ixgbe_sfp_type_unknown)
|
||||
phy->ops.reset = NULL;
|
||||
@ -1157,6 +1321,7 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
|
||||
phy->ops.setup_internal_link =
|
||||
ixgbe_setup_internal_phy_t_x550em;
|
||||
phy->ops.enter_lplu = ixgbe_enter_lplu_t_x550em;
|
||||
phy->ops.handle_lasi = ixgbe_handle_lasi_ext_t_x550em;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -1333,6 +1498,9 @@ s32 ixgbe_init_ext_t_x550em(struct ixgbe_hw *hw)
|
||||
return status;
|
||||
}
|
||||
|
||||
/* Configure Link Status Alarm and Temperature Threshold interrupts */
|
||||
status = ixgbe_enable_lasi_ext_t_x550em(hw);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
@ -2607,3 +2775,66 @@ void ixgbe_release_swfw_sync_X550em(struct ixgbe_hw *hw, u32 mask)
|
||||
|
||||
ixgbe_release_swfw_sync_X540(hw, mask);
|
||||
}
|
||||
|
||||
/**
|
||||
* ixgbe_handle_lasi_ext_t_x550em - Handle external Base T PHY interrupt
|
||||
* @hw: pointer to hardware structure
|
||||
*
|
||||
* Handle external Base T PHY interrupt. If high temperature
|
||||
* failure alarm then return error, else if link status change
|
||||
* then setup internal/external PHY link
|
||||
*
|
||||
* Return IXGBE_ERR_OVERTEMP if interrupt is high temperature
|
||||
* failure alarm, else return PHY access status.
|
||||
*/
|
||||
s32 ixgbe_handle_lasi_ext_t_x550em(struct ixgbe_hw *hw)
|
||||
{
|
||||
bool lsc;
|
||||
u32 status;
|
||||
|
||||
status = ixgbe_get_lasi_ext_t_x550em(hw, &lsc);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
if (lsc)
|
||||
return ixgbe_setup_internal_phy_t_x550em(hw);
|
||||
|
||||
return IXGBE_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* ixgbe_setup_mac_link_t_X550em - Sets the auto advertised link speed
|
||||
* @hw: pointer to hardware structure
|
||||
* @speed: new link speed
|
||||
* @autoneg_wait_to_complete: true when waiting for completion is needed
|
||||
*
|
||||
* Setup internal/external PHY link speed based on link speed, then set
|
||||
* external PHY auto advertised link speed.
|
||||
*
|
||||
* Returns error status for any failure
|
||||
**/
|
||||
s32 ixgbe_setup_mac_link_t_X550em(struct ixgbe_hw *hw,
|
||||
ixgbe_link_speed speed,
|
||||
bool autoneg_wait_to_complete)
|
||||
{
|
||||
s32 status;
|
||||
ixgbe_link_speed force_speed;
|
||||
|
||||
DEBUGFUNC("ixgbe_setup_mac_link_t_X550em");
|
||||
|
||||
/* Setup internal/external PHY link speed to iXFI (10G), unless
|
||||
* only 1G is auto advertised then setup KX link.
|
||||
*/
|
||||
if (speed & IXGBE_LINK_SPEED_10GB_FULL)
|
||||
force_speed = IXGBE_LINK_SPEED_10GB_FULL;
|
||||
else
|
||||
force_speed = IXGBE_LINK_SPEED_1GB_FULL;
|
||||
|
||||
status = ixgbe_setup_ixfi_x550em(hw, &force_speed);
|
||||
|
||||
if (status != IXGBE_SUCCESS)
|
||||
return status;
|
||||
|
||||
return hw->phy.ops.setup_link_speed(hw, speed, autoneg_wait_to_complete);
|
||||
}
|
||||
|
||||
@ -95,5 +95,9 @@ s32 ixgbe_setup_fc_X550em(struct ixgbe_hw *hw);
|
||||
s32 ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,
|
||||
ixgbe_link_speed speed,
|
||||
bool autoneg_wait_to_complete);
|
||||
s32 ixgbe_handle_lasi_ext_t_x550em(struct ixgbe_hw *hw);
|
||||
s32 ixgbe_setup_mac_link_t_X550em(struct ixgbe_hw *hw,
|
||||
ixgbe_link_speed speed,
|
||||
bool autoneg_wait_to_complete);
|
||||
#endif /* _IXGBE_X550_H_ */
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user