ixgbe:add support for a new 82599 10G Base-T device
Subsystems (2)
PATCH v2 1/1 ixgbe:add support for a new 82599 10G Base-T device
From: Mallikarjuna R Chilakala <[email protected]>
This adds support for a new copper device for 82599, device id 0x151c. This 82599 10GBase-T device uses the PHY's internal temperature sensor to guard against over-temp conditions. In this scenario the PHY will be put in a low power mode and link will no longer be able to transmit or receive any data. When this occurs, the over-temp interrupt is latched and driver logs this error message. A HW reset or power cycle is required to clear this status.
---
drivers/net/ixgbe/ixgbe.h | 3 ++ drivers/net/ixgbe/ixgbe_82598.c | 1 + drivers/net/ixgbe/ixgbe_82599.c | 1 + drivers/net/ixgbe/ixgbe_main.c | 69 +++++++++++++++++++++++++++++++++++++++ drivers/net/ixgbe/ixgbe_phy.c | 31 ++++++++++++++++++ drivers/net/ixgbe/ixgbe_phy.h | 3 ++ drivers/net/ixgbe/ixgbe_type.h | 4 ++ 7 files changed, 112 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe.h +3 -0
@@ -360,6 +360,7 @@ struct ixgbe_adapter {u32 flags2;#define IXGBE_FLAG2_RSC_CAPABLE (u32)(1)#define IXGBE_FLAG2_RSC_ENABLED (u32)(1 << 1) +#define IXGBE_FLAG2_TEMP_SENSOR_CAPABLE (u32)(1 << 2)/* default to trying for four seconds */ #define IXGBE_TRY_LINK_TIMEOUT (4 * HZ)
@@ -407,6 +408,8 @@ struct ixgbe_adapter {u16 eeprom_version;int node; +struct work_struct check_overtemp_task; +u32 interrupt_event;/* SR-IOV */ DECLARE_BITMAP (active_vfs,IXGBE_MAX_VF_FUNCTIONS );
drivers/net/ixgbe/ixgbe_82598.c +1 -0
@@ -1236,6 +1236,7 @@ static struct ixgbe_phy_operations phy_ops_82598 = { .setup_link = &ixgbe_setup_phy_link_generic, .setup_link_speed = &ixgbe_setup_phy_link_speed_generic, .read_i2c_eeprom = &ixgbe_read_i2c_eeprom_82598, + .check_overtemp = &ixgbe_tn_check_overtemp, };struct ixgbe_info ixgbe_82598_info = {
drivers/net/ixgbe/ixgbe_82599.c +1 -0
@@ -2395,6 +2395,7 @@ static struct ixgbe_phy_operations phy_ops_82599 = { .write_i2c_byte = &ixgbe_write_i2c_byte_generic, .read_i2c_eeprom = &ixgbe_read_i2c_eeprom_generic, .write_i2c_eeprom = &ixgbe_write_i2c_eeprom_generic, + .check_overtemp = &ixgbe_tn_check_overtemp, };struct ixgbe_info ixgbe_82599_info = {
drivers/net/ixgbe/ixgbe_main.c +69 -0
130 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_phy.c +31 -0
@@ -135,6 +135,11 @@ static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id)**/ s32 ixgbe_reset_phy_generic (struct ixgbe_hw *hw) { +/* Don't reset PHY if it's shut down due to overtemp. */ +if (!hw->phy.reset_if_overtemp && + (IXGBE_ERR_OVERTEMP == hw->phy.ops.check_overtemp (hw))) +return 0 ; +/* * Perform soft PHY reset to the PHY_XS. * This will cause a soft reset to the PHY
@@ -1345,3 +1350,29 @@ s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw,return status; } +/** +* ixgbe_tn_check_overtemp - Checks if an overtemp occured. +* @hw: pointer to hardware structure +* +* Checks if the LASI temp alarm status was triggered due to overtemp +**/ +s32 ixgbe_tn_check_overtemp (struct ixgbe_hw *hw) +{ +s32 status =0 ; +u16 phy_data =0 ; + +if (hw->device_id !=IXGBE_DEV_ID_82599_T3_LOM ) + goto out; + +/* Check that the LASI temp alarm status was triggered */ + hw->phy.ops.read_reg (hw,IXGBE_TN_LASI_STATUS_REG , +MDIO_MMD_PMAPMD , &phy_data); + +if (!(phy_data &IXGBE_TN_LASI_STATUS_TEMP_ALARM )) + goto out; + + status =IXGBE_ERR_OVERTEMP ; +out: +return status; +} +
drivers/net/ixgbe/ixgbe_phy.h +3 -0
@@ -80,6 +80,8 @@#define IXGBE_I2C_T_SU_STO 4#define IXGBE_I2C_T_BUF 5 +#define IXGBE_TN_LASI_STATUS_REG 0x9005 +#define IXGBE_TN_LASI_STATUS_TEMP_ALARM 0x0008s32 ixgbe_init_phy_ops_generic (struct ixgbe_hw *hw);s32 ixgbe_identify_phy_generic (struct ixgbe_hw *hw);
@@ -106,6 +108,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw);s32 ixgbe_get_sfp_init_sequence_offsets (struct ixgbe_hw *hw,u16 *list_offset,u16 *data_offset); +s32 ixgbe_tn_check_overtemp (struct ixgbe_hw *hw);s32 ixgbe_read_i2c_byte_generic (struct ixgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 *data); s32 ixgbe_write_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
drivers/net/ixgbe/ixgbe_type.h +4 -0
@@ -51,6 +51,7 @@#define IXGBE_DEV_ID_82599_KX4 0x10F7#define IXGBE_DEV_ID_82599_KX4_MEZZ 0x1514#define IXGBE_DEV_ID_82599_KR 0x1517 +#define IXGBE_DEV_ID_82599_T3_LOM 0x151C#define IXGBE_DEV_ID_82599_CX4 0x10F9#define IXGBE_DEV_ID_82599_SFP 0x10FB#define IXGBE_DEV_ID_82599_SFP_EM 0x1507
@@ -2470,6 +2471,7 @@ struct ixgbe_phy_operations {s32 (*write_i2c_byte)(struct ixgbe_hw *,u8 ,u8 ,u8 );s32 (*read_i2c_eeprom)(struct ixgbe_hw *,u8 ,u8 *);s32 (*write_i2c_eeprom)(struct ixgbe_hw *,u8 ,u8 ); +s32 (*check_overtemp)(struct ixgbe_hw *); };struct ixgbe_eeprom_info {
@@ -2518,6 +2520,7 @@ struct ixgbe_phy_info {enum ixgbe_smart_speed smart_speed;bool smart_speed_active;bool multispeed_fiber; +bool reset_if_overtemp; };#include "ixgbe_mbx.h"
@@ -2605,6 +2608,7 @@ struct ixgbe_info {#define IXGBE_ERR_FDIR_REINIT_FAILED -23#define IXGBE_ERR_EEPROM_VERSION -24#define IXGBE_ERR_NO_SPACE -25 +#define IXGBE_ERR_OVERTEMP -26#define IXGBE_NOT_IMPLEMENTED 0x7FFFFFFF#endif /* _IXGBE_TYPE_H_ */
From: Jeff Kirsher <[email protected]>
Date: Wed, 19 May 2010 15:46:09 -0700
Quoted 10 lines
From: Mallikarjuna R Chilakala <[email protected]>
This adds support for a new copper device for 82599, device id
0x151c. This 82599 10GBase-T device uses the PHY's internal temperature sensor to guard against over-temp conditions. In this scenario the PHY will be put in a low power mode and link will no longer be able to transmit or receive any data. When this occurs, the over-temp interrupt is latched and driver logs this error message. A HW reset or power cycle is required to clear this status.
Quoted 2 lines
Signed-off-by Mallikarjuna R Chilakala <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied, thanks.