ixgbe: Add support for X550EM devices with SFPs
Subsystems (2)
v4 cover ixgbe: Add support for X550EM devices with SFPs
The following patches add remaining bits of support for X550EM devices with SFPs. The last patch adds the device ID.
---
Changes in V2:
- Added more changes that had been missed (9 more patches!)
- Added latest CS4227 reset process
Changes in V3:
- Added a missed patch to permit SFP+ on more than just 82598 and 82599 Changes in V4:
- Added omitted NULL check for flap_tx_laser method calls
---
Mark D Rustad (13):
ixgbe: Accept SFP not present errors on all devices
ixgbe: Add X550EM support for SFP insertion interrupt
ixgbe: Provide I2C combined on X550EM
ixgbe: Provide unlocked I2C methods
ixgbe: Set lan_id before first I2C eeprom access
ixgbe: Enable bit-banging mode on X550
ixgbe: Clear I2C destination location
ixgbe: Allow reduced delays during sfp detection
ixgbe: Add X550EM_x dual-speed SFP+ support
ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+
ixgbe: Add logic to reset CS4227 when needed
ixgbe: Allow SFP+ on more than 82598 and 82599
ixgbe: Add new X550EM SFP+ device ID
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 193 +--------- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 208 +++++++++++ drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 5 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 286 +++++++++++++-- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 35 ++ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 6 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 425 +++++++++++++++++++++-- 8 files changed, 910 insertions(+), 254 deletions(-)
Signature · 1 line
Mark Rustad, Network Division, Intel Corporation
PATCH v4 1/13 ixgbe: Accept SFP not present errors on all devices
When an SFP not present error is returned by the reset_hw method, accept it and go on, since an SFP can still be inserted. Previously it was only accepted for 82598 devices.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1 -2
@@ -8711,8 +8711,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) hw->phy.reset_if_overtemp = true; err = hw->mac.ops.reset_hw (hw); hw->phy.reset_if_overtemp = false; -if (err ==IXGBE_ERR_SFP_NOT_PRESENT && - hw->mac.type == ixgbe_mac_82598EB) { +if (err ==IXGBE_ERR_SFP_NOT_PRESENT ) { err =0 ; }else if (err ==IXGBE_ERR_SFP_NOT_SUPPORTED ) {e_dev_err ("failed to load because an unsupported SFP+ or QSFP module type was detected.\n" );
PATCH v4 2/13 ixgbe: Add X550EM support for SFP insertion interrupt
In reply to Mark D RustadAdd support for the SFP insertion interrupt on X550EM devices with SFPs.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -0
@@ -2631,6 +2631,8 @@ static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter, bool queues,case ixgbe_mac_X540:case ixgbe_mac_X550:case ixgbe_mac_X550EM_x: +if (adapter->hw.device_id ==IXGBE_DEV_ID_X550EM_X_SFP ) + mask |=IXGBE_EIMS_GPI_SDP0 (&adapter->hw);if (adapter->hw.phy.type == ixgbe_phy_x550em_ext_t) mask |=IXGBE_EICR_GPI_SDP0_X540 ; mask |=IXGBE_EIMS_ECC ;
PATCH v4 3/13 ixgbe: Provide I2C combined on X550EM
In reply to Mark D RustadProvide I2C combined operations on X550EM, not X550 devices.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +2 -2
@@ -2039,14 +2039,14 @@ static struct ixgbe_phy_operations phy_ops_X550 = {X550_COMMON_PHY .init = NULL, .identify = &ixgbe_identify_phy_generic, - .read_i2c_combined = &ixgbe_read_i2c_combined_generic, - .write_i2c_combined = &ixgbe_write_i2c_combined_generic, };static struct ixgbe_phy_operations phy_ops_X550EM_x = {X550_COMMON_PHY .init = &ixgbe_init_phy_ops_X550em, .identify = &ixgbe_identify_phy_x550em, + .read_i2c_combined = &ixgbe_read_i2c_combined_generic, + .write_i2c_combined = &ixgbe_write_i2c_combined_generic, };static const u32 ixgbe_mvals_X550[IXGBE_MVALS_IDX_LIMIT ] = {
PATCH v4 4/13 ixgbe: Provide unlocked I2C methods
In reply to Mark D RustadMost I2C accesses take and release semaphores for each access. Now there is a reason to perform multiple I2C operations under the same holding of the semaphore, so provide unlocked I2C methods for that purpose.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 195 +++++++++++++++++++++---- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 8 + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 4 files changed, 178 insertions(+), 32 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +163 -32
@@ -99,17 +99,17 @@ static u8 ixgbe_ones_comp_byte_add(u8 add1, u8 add2)return sum &0xFF ; } -/** -* ixgbe_read_i2c_combined_generic - Perform I2C read combined operation +/** ixgbe_read_i2c_combined_generic_int - Perform I2C read combined operation * @hw: pointer to the hardware structure * @addr: I2C bus address to read from * @reg: I2C device register to read from * @val: pointer to location to receive read value +* @lock: true if to take and release semaphore * * Returns an error code on error. -**/ -s32 ixgbe_read_i2c_combined_generic (struct ixgbe_hw *hw,u8 addr, -u16 reg,u16 *val) +*/ +static s32 ixgbe_read_i2c_combined_generic_int (struct ixgbe_hw *hw,u8 addr, +u16 reg,u16 *val,bool lock) {u32 swfw_mask = hw->phy.phy_semaphore_mask;int max_retry =10 ;
@@ -124,7 +124,7 @@ s32 ixgbe_read_i2c_combined_generic(struct ixgbe_hw *hw, u8 addr, csum =ixgbe_ones_comp_byte_add (reg_high, reg &0xFF ); csum = ~csum; do { - if (hw->mac.ops.acquire_swfw_sync(hw, swfw_mask)) + if (lock && hw->mac.ops.acquire_swfw_sync(hw, swfw_mask)) return IXGBE_ERR_SWFW_SYNC; ixgbe_i2c_start(hw); /* Device Address and write indication */
@@ -157,13 +157,15 @@ s32 ixgbe_read_i2c_combined_generic(struct ixgbe_hw *hw, u8 addr,if (ixgbe_clock_out_i2c_bit (hw, false)) goto fail;ixgbe_i2c_stop (hw); - hw->mac.ops.release_swfw_sync (hw, swfw_mask); +if (lock) + hw->mac.ops.release_swfw_sync (hw, swfw_mask); *val = (high_bits <<8 ) | low_bits;return 0 ; fail:ixgbe_i2c_bus_clear (hw); - hw->mac.ops.release_swfw_sync (hw, swfw_mask); +if (lock) + hw->mac.ops.release_swfw_sync (hw, swfw_mask); retry++;if (retry < max_retry)hw_dbg (hw,"I2C byte read combined error - Retry.\n" );
@@ -174,18 +176,47 @@ fail:return IXGBE_ERR_I2C ; } -/** -* ixgbe_write_i2c_combined_generic - Perform I2C write combined operation +/** ixgbe_read_i2c_combined_generic - Perform I2C read combined operation +* @hw: pointer to the hardware structure +* @addr: I2C bus address to read from +* @reg: I2C device register to read from +* @val: pointer to location to receive read value +* +* Returns an error code on error. +*/ +s32 ixgbe_read_i2c_combined_generic (struct ixgbe_hw *hw,u8 addr, +u16 reg,u16 *val) +{ +return ixgbe_read_i2c_combined_generic_int (hw, addr, reg, val, true); +} + +/** ixgbe_read_i2c_combined_generic_unlocked - Unlocked I2C read combined +* @hw: pointer to the hardware structure +* @addr: I2C bus address to read from +* @reg: I2C device register to read from +* @val: pointer to location to receive read value +* +* Returns an error code on error. +*/ +s32 ixgbe_read_i2c_combined_generic_unlocked (struct ixgbe_hw *hw,u8 addr, +u16 reg,u16 *val) +{ +return ixgbe_read_i2c_combined_generic_int (hw, addr, reg, val, false); +} + +/** ixgbe_write_i2c_combined_generic_int - Perform I2C write combined operation * @hw: pointer to the hardware structure * @addr: I2C bus address to write to * @reg: I2C device register to write to * @val: value to write +* @lock: true if to take and release semaphore * * Returns an error code on error. -**/ -s32 ixgbe_write_i2c_combined_generic (struct ixgbe_hw *hw, -u8 addr,u16 reg,u16 val) +*/ +static s32 ixgbe_write_i2c_combined_generic_int (struct ixgbe_hw *hw,u8 addr, +u16 reg,u16 val,bool lock) { +u32 swfw_mask = hw->phy.phy_semaphore_mask;int max_retry =1 ;int retry =0 ;u8 reg_high;
@@ -197,6 +228,8 @@ s32 ixgbe_write_i2c_combined_generic(struct ixgbe_hw *hw, csum =ixgbe_ones_comp_byte_add (csum, val &0xFF ); csum = ~csum; do { + if (lock && hw->mac.ops.acquire_swfw_sync(hw, swfw_mask)) + return IXGBE_ERR_SWFW_SYNC; ixgbe_i2c_start(hw); /* Device Address and write indication */ if (ixgbe_out_i2c_byte_ack(hw, addr))
@@ -217,10 +250,14 @@ s32 ixgbe_write_i2c_combined_generic(struct ixgbe_hw *hw,if (ixgbe_out_i2c_byte_ack (hw, csum)) goto fail;ixgbe_i2c_stop (hw); +if (lock) + hw->mac.ops.release_swfw_sync (hw, swfw_mask);return 0 ; fail:ixgbe_i2c_bus_clear (hw); +if (lock) + hw->mac.ops.release_swfw_sync (hw, swfw_mask); retry++;if (retry < max_retry)hw_dbg (hw,"I2C byte write combined error - Retry.\n" );
@@ -231,6 +268,34 @@ fail:return IXGBE_ERR_I2C ; } +/** ixgbe_write_i2c_combined_generic - Perform I2C write combined operation +* @hw: pointer to the hardware structure +* @addr: I2C bus address to write to +* @reg: I2C device register to write to +* @val: value to write +* +* Returns an error code on error. +*/ +s32 ixgbe_write_i2c_combined_generic (struct ixgbe_hw *hw, +u8 addr,u16 reg,u16 val) +{ +return ixgbe_write_i2c_combined_generic_int (hw, addr, reg, val, true); +} + +/** ixgbe_write_i2c_combined_generic_unlocked - Unlocked I2C write combined +* @hw: pointer to the hardware structure +* @addr: I2C bus address to write to +* @reg: I2C device register to write to +* @val: value to write +* +* Returns an error code on error. +*/ +s32 ixgbe_write_i2c_combined_generic_unlocked (struct ixgbe_hw *hw, +u8 addr,u16 reg,u16 val) +{ +return ixgbe_write_i2c_combined_generic_int (hw, addr, reg, val, false); +} +/** * ixgbe_identify_phy_generic - Get physical layer module * @hw: pointer to hardware structure
@@ -1659,27 +1724,28 @@ s32 ixgbe_write_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset, eeprom_data); } -/** -* ixgbe_read_i2c_byte_generic - Reads 8 bit word over I2C +/** ixgbe_read_i2c_byte_generic_int - Reads 8 bit word over I2C * @hw: pointer to hardware structure * @byte_offset: byte offset to read * @data: value read +* @lock: true if to take and release semaphore * * Performs byte read operation to SFP module's EEPROM over I2C interface at * a specified device address. -**/ -s32 ixgbe_read_i2c_byte_generic (struct ixgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 *data) +*/ +static s32 ixgbe_read_i2c_byte_generic_int (struct ixgbe_hw *hw,u8 byte_offset, +u8 dev_addr,u8 *data,bool lock) {s32 status;u32 max_retry =10 ;u32 retry =0 ;u32 swfw_mask = hw->phy.phy_semaphore_mask;bool nack = true; + *data =0 ; do { - if (hw->mac.ops.acquire_swfw_sync(hw, swfw_mask)) + if (lock && hw->mac.ops.acquire_swfw_sync(hw, swfw_mask)) return IXGBE_ERR_SWFW_SYNC; ixgbe_i2c_start(hw);
@@ -1721,12 +1787,16 @@ s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset, goto fail;ixgbe_i2c_stop (hw); -break ; +if (lock) + hw->mac.ops.release_swfw_sync (hw, swfw_mask); +return 0 ; fail:ixgbe_i2c_bus_clear (hw); - hw->mac.ops.release_swfw_sync (hw, swfw_mask); -msleep (100 ); +if (lock) { + hw->mac.ops.release_swfw_sync (hw, swfw_mask); +msleep (100 ); + } retry++;if (retry < max_retry)hw_dbg (hw,"I2C byte read error - Retrying.\n" );
@@ -1735,29 +1805,57 @@ fail: }while (retry < max_retry); - hw->mac.ops.release_swfw_sync (hw, swfw_mask); -return status; } -/** -* ixgbe_write_i2c_byte_generic - Writes 8 bit word over I2C +/** ixgbe_read_i2c_byte_generic - Reads 8 bit word over I2C +* @hw: pointer to hardware structure +* @byte_offset: byte offset to read +* @data: value read +* +* Performs byte read operation to SFP module's EEPROM over I2C interface at +* a specified device address. +*/ +s32 ixgbe_read_i2c_byte_generic (struct ixgbe_hw *hw,u8 byte_offset, +u8 dev_addr,u8 *data) +{ +return ixgbe_read_i2c_byte_generic_int (hw, byte_offset, dev_addr, + data, true); +} + +/** ixgbe_read_i2c_byte_generic_unlocked - Reads 8 bit word over I2C +* @hw: pointer to hardware structure +* @byte_offset: byte offset to read +* @data: value read +* +* Performs byte read operation to SFP module's EEPROM over I2C interface at +* a specified device address. +*/ +s32 ixgbe_read_i2c_byte_generic_unlocked (struct ixgbe_hw *hw,u8 byte_offset, +u8 dev_addr,u8 *data) +{ +return ixgbe_read_i2c_byte_generic_int (hw, byte_offset, dev_addr, + data, false); +} + +/** ixgbe_write_i2c_byte_generic_int - Writes 8 bit word over I2C * @hw: pointer to hardware structure * @byte_offset: byte offset to write * @data: value to write +* @lock: true if to take and release semaphore * * Performs byte write operation to SFP module's EEPROM over I2C interface at * a specified device address. -**/ -s32 ixgbe_write_i2c_byte_generic (struct ixgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 data) +*/ +static s32 ixgbe_write_i2c_byte_generic_int (struct ixgbe_hw *hw,u8 byte_offset, +u8 dev_addr,u8 data,bool lock) {s32 status;u32 max_retry =1 ;u32 retry =0 ;u32 swfw_mask = hw->phy.phy_semaphore_mask; -if (hw->mac.ops.acquire_swfw_sync (hw, swfw_mask)) +if (lock && hw->mac.ops.acquire_swfw_sync (hw, swfw_mask))return IXGBE_ERR_SWFW_SYNC ; do {
@@ -1788,7 +1886,9 @@ s32 ixgbe_write_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset, goto fail;ixgbe_i2c_stop (hw); -break ; +if (lock) + hw->mac.ops.release_swfw_sync (hw, swfw_mask); +return 0 ; fail:ixgbe_i2c_bus_clear (hw);
@@ -1799,11 +1899,42 @@ fail:hw_dbg (hw,"I2C byte write error.\n" ); }while (retry < max_retry); - hw->mac.ops.release_swfw_sync (hw, swfw_mask); +if (lock) + hw->mac.ops.release_swfw_sync (hw, swfw_mask);return status; } +/** ixgbe_write_i2c_byte_generic - Writes 8 bit word over I2C +* @hw: pointer to hardware structure +* @byte_offset: byte offset to write +* @data: value to write +* +* Performs byte write operation to SFP module's EEPROM over I2C interface at +* a specified device address. +*/ +s32 ixgbe_write_i2c_byte_generic (struct ixgbe_hw *hw,u8 byte_offset, +u8 dev_addr,u8 data) +{ +return ixgbe_write_i2c_byte_generic_int (hw, byte_offset, dev_addr, + data, true); +} + +/** ixgbe_write_i2c_byte_generic_unlocked - Writes 8 bit word over I2C +* @hw: pointer to hardware structure +* @byte_offset: byte offset to write +* @data: value to write +* +* Performs byte write operation to SFP module's EEPROM over I2C interface at +* a specified device address. +*/ +s32 ixgbe_write_i2c_byte_generic_unlocked (struct ixgbe_hw *hw,u8 byte_offset, +u8 dev_addr,u8 data) +{ +return ixgbe_write_i2c_byte_generic_int (hw, byte_offset, dev_addr, + data, false); +} +/** * ixgbe_i2c_start - Sets I2C start condition * @hw: pointer to hardware structure
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +8 -0
@@ -154,8 +154,12 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,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_read_i2c_byte_generic_unlocked (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,u8 dev_addr,u8 data); +s32 ixgbe_write_i2c_byte_generic_unlocked (struct ixgbe_hw *hw,u8 byte_offset, +u8 dev_addr,u8 data);s32 ixgbe_read_i2c_eeprom_generic (struct ixgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 ixgbe_read_i2c_sff8472_generic(struct ixgbe_hw *hw, u8 byte_offset,
@@ -164,6 +168,10 @@ s32 ixgbe_write_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset, u8 eeprom_data);s32 ixgbe_read_i2c_combined_generic (struct ixgbe_hw *hw,u8 addr,u16 reg,u16 *val); +s32 ixgbe_read_i2c_combined_generic_unlocked (struct ixgbe_hw *hw,u8 addr, +u16 reg,u16 *val);s32 ixgbe_write_i2c_combined_generic (struct ixgbe_hw *hw,u8 addr,u16 reg,u16 val); +s32 ixgbe_write_i2c_combined_generic_unlocked (struct ixgbe_hw *hw,u8 addr, +u16 reg,u16 val);#endif /* _IXGBE_PHY_H_ */
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +4 -0
@@ -3329,6 +3329,10 @@ struct ixgbe_phy_operations {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, +u16 value); };struct ixgbe_eeprom_info {
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +3 -0
@@ -2047,6 +2047,9 @@ static struct ixgbe_phy_operations phy_ops_X550EM_x = { .identify = &ixgbe_identify_phy_x550em, .read_i2c_combined = &ixgbe_read_i2c_combined_generic, .write_i2c_combined = &ixgbe_write_i2c_combined_generic, + .read_i2c_combined_unlocked = &ixgbe_read_i2c_combined_generic_unlocked, + .write_i2c_combined_unlocked = + &ixgbe_write_i2c_combined_generic_unlocked, };static const u32 ixgbe_mvals_X550[IXGBE_MVALS_IDX_LIMIT ] = {
PATCH v4 5/13 ixgbe: Set lan_id before first I2C eeprom access
In reply to Mark D RustadThe lan_id is being set after a previous I2C eeprom access which makes no sense because it needs to be set before any access. Move the setting to before the access.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +3 -3
@@ -1165,6 +1165,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)return IXGBE_ERR_SFP_NOT_PRESENT ; } +/* LAN ID is needed for sfp_type determination */ + hw->mac.ops.set_lan_id (hw); + status = hw->phy.ops.read_i2c_eeprom (hw,IXGBE_SFF_IDENTIFIER , &identifier);
@@ -1172,9 +1175,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)if (status) goto err_read_i2c_eeprom; -/* LAN ID is needed for sfp_type determination */ - hw->mac.ops.set_lan_id (hw); -if (identifier !=IXGBE_SFF_IDENTIFIER_SFP ) { hw->phy.type = ixgbe_phy_sfp_unsupported;return IXGBE_ERR_SFP_NOT_SUPPORTED ;
PATCH v4 6/13 ixgbe: Enable bit-banging mode on X550
In reply to Mark D RustadSet the bit banging mode in the hardware when performing bit banging I2C operations on X550. Also control the output enable on both the clock and data lines.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 65 +++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +63 -2
@@ -1940,11 +1940,14 @@ s32 ixgbe_write_i2c_byte_generic_unlocked(struct ixgbe_hw *hw, u8 byte_offset,* @hw: pointer to hardware structure * * Sets I2C start condition (High -> Low on SDA while SCL is High) +* Set bit-bang mode on X550 hardware. **/ static void ixgbe_i2c_start (struct ixgbe_hw *hw) {u32 i2cctl =IXGBE_READ_REG (hw,IXGBE_I2CCTL (hw)); + i2cctl |=IXGBE_I2C_BB_EN (hw); +/* Start condition must begin with data and clock high */ ixgbe_set_i2c_data (hw, &i2cctl,1 );ixgbe_raise_i2c_clk (hw, &i2cctl);
@@ -1969,10 +1972,15 @@ static void ixgbe_i2c_start(struct ixgbe_hw *hw)* @hw: pointer to hardware structure * * Sets I2C stop condition (Low -> High on SDA while SCL is High) +* Disables bit-bang mode and negates data output enable on X550 +* hardware. **/ static void ixgbe_i2c_stop (struct ixgbe_hw *hw) {u32 i2cctl =IXGBE_READ_REG (hw,IXGBE_I2CCTL (hw)); +u32 data_oe_bit =IXGBE_I2C_DATA_OE_N_EN (hw); +u32 clk_oe_bit =IXGBE_I2C_CLK_OE_N_EN (hw); +u32 bb_en_bit =IXGBE_I2C_BB_EN (hw);/* Stop condition must begin with data low and clock high */ ixgbe_set_i2c_data (hw, &i2cctl,0 );
@@ -1985,6 +1993,13 @@ static void ixgbe_i2c_stop(struct ixgbe_hw *hw)/* bus free time between stop and start (4.7us)*/ udelay (IXGBE_I2C_T_BUF ); + +if (bb_en_bit || data_oe_bit || clk_oe_bit) { + i2cctl &= ~bb_en_bit; + i2cctl |= data_oe_bit | clk_oe_bit; +IXGBE_WRITE_REG (hw,IXGBE_I2CCTL (hw), i2cctl); +IXGBE_WRITE_FLUSH (hw); + } }/**
@@ -2032,6 +2047,7 @@ static s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data)/* Release SDA line (set high) */ i2cctl =IXGBE_READ_REG (hw,IXGBE_I2CCTL (hw)); i2cctl |=IXGBE_I2C_DATA_OUT (hw); + i2cctl |=IXGBE_I2C_DATA_OE_N_EN (hw);IXGBE_WRITE_REG (hw,IXGBE_I2CCTL (hw), i2cctl);IXGBE_WRITE_FLUSH (hw);
@@ -2046,15 +2062,21 @@ static s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data)**/ static s32 ixgbe_get_i2c_ack (struct ixgbe_hw *hw) { +u32 data_oe_bit =IXGBE_I2C_DATA_OE_N_EN (hw);s32 status =0 ;u32 i =0 ;u32 i2cctl =IXGBE_READ_REG (hw,IXGBE_I2CCTL (hw));u32 timeout =10 ;bool ack = true; +if (data_oe_bit) { + i2cctl |=IXGBE_I2C_DATA_OUT (hw); + i2cctl |= data_oe_bit; +IXGBE_WRITE_REG (hw,IXGBE_I2CCTL (hw), i2cctl); +IXGBE_WRITE_FLUSH (hw); + }ixgbe_raise_i2c_clk (hw, &i2cctl); -/* Minimum high period of clock is 4us */ udelay (IXGBE_I2C_T_HIGH );
@@ -2092,7 +2114,14 @@ static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw)static s32 ixgbe_clock_in_i2c_bit (struct ixgbe_hw *hw,bool *data) {u32 i2cctl =IXGBE_READ_REG (hw,IXGBE_I2CCTL (hw)); +u32 data_oe_bit =IXGBE_I2C_DATA_OE_N_EN (hw); +if (data_oe_bit) { + i2cctl |=IXGBE_I2C_DATA_OUT (hw); + i2cctl |= data_oe_bit; +IXGBE_WRITE_REG (hw,IXGBE_I2CCTL (hw), i2cctl); +IXGBE_WRITE_FLUSH (hw); + }ixgbe_raise_i2c_clk (hw, &i2cctl);/* Minimum high period of clock is 4us */
@@ -2147,13 +2176,20 @@ static s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data)* @i2cctl: Current value of I2CCTL register * * Raises the I2C clock line '0'->'1' +* Negates the I2C clock output enable on X550 hardware. **/ static void ixgbe_raise_i2c_clk (struct ixgbe_hw *hw,u32 *i2cctl) { +u32 clk_oe_bit =IXGBE_I2C_CLK_OE_N_EN (hw);u32 i =0 ;u32 timeout =IXGBE_I2C_CLOCK_STRETCHING_TIMEOUT ;u32 i2cctl_r =0 ; +if (clk_oe_bit) { + *i2cctl |= clk_oe_bit; +IXGBE_WRITE_REG (hw,IXGBE_I2CCTL (hw), *i2cctl); + } +for (i =0 ; i < timeout; i++) { *i2cctl |=IXGBE_I2C_CLK_OUT (hw);IXGBE_WRITE_REG (hw,IXGBE_I2CCTL (hw), *i2cctl);
@@ -2173,11 +2209,13 @@ static void ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl)* @i2cctl: Current value of I2CCTL register * * Lowers the I2C clock line '1'->'0' +* Asserts the I2C clock output enable on X550 hardware. **/ static void ixgbe_lower_i2c_clk (struct ixgbe_hw *hw,u32 *i2cctl) { *i2cctl &= ~IXGBE_I2C_CLK_OUT (hw); + *i2cctl &= ~IXGBE_I2C_CLK_OE_N_EN (hw);IXGBE_WRITE_REG (hw,IXGBE_I2CCTL (hw), *i2cctl);IXGBE_WRITE_FLUSH (hw);
@@ -2193,13 +2231,17 @@ static void ixgbe_lower_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl)* @data: I2C data value (0 or 1) to set * * Sets the I2C data bit +* Asserts the I2C data output enable on X550 hardware. **/ static s32 ixgbe_set_i2c_data (struct ixgbe_hw *hw,u32 *i2cctl,bool data) { +u32 data_oe_bit =IXGBE_I2C_DATA_OE_N_EN (hw); +if (data) *i2cctl |=IXGBE_I2C_DATA_OUT (hw);else *i2cctl &= ~IXGBE_I2C_DATA_OUT (hw); + *i2cctl &= ~data_oe_bit;IXGBE_WRITE_REG (hw,IXGBE_I2CCTL (hw), *i2cctl);IXGBE_WRITE_FLUSH (hw);
@@ -2207,6 +2249,14 @@ static s32 ixgbe_set_i2c_data(struct ixgbe_hw *hw, u32 *i2cctl, bool data)/* Data rise/fall (1000ns/300ns) and set-up time (250ns) */ udelay (IXGBE_I2C_T_RISE +IXGBE_I2C_T_FALL +IXGBE_I2C_T_SU_DATA ); +if (!data)/* Can't verify data in this case */ +return 0 ; +if (data_oe_bit) { + *i2cctl |= data_oe_bit; +IXGBE_WRITE_REG (hw,IXGBE_I2CCTL (hw), *i2cctl); +IXGBE_WRITE_FLUSH (hw); + } +/* Verify data was set correctly */ *i2cctl =IXGBE_READ_REG (hw,IXGBE_I2CCTL (hw));if (data !=ixgbe_get_i2c_data (hw, i2cctl)) {
@@ -2223,9 +2273,19 @@ static s32 ixgbe_set_i2c_data(struct ixgbe_hw *hw, u32 *i2cctl, bool data)* @i2cctl: Current value of I2CCTL register * * Returns the I2C data bit value +* Negates the I2C data output enable on X550 hardware. **/ static bool ixgbe_get_i2c_data (struct ixgbe_hw *hw,u32 *i2cctl) { +u32 data_oe_bit =IXGBE_I2C_DATA_OE_N_EN (hw); + +if (data_oe_bit) { + *i2cctl |= data_oe_bit; +IXGBE_WRITE_REG (hw,IXGBE_I2CCTL (hw), *i2cctl); +IXGBE_WRITE_FLUSH (hw); +udelay (IXGBE_I2C_T_FALL ); + } +if (*i2cctl &IXGBE_I2C_DATA_IN (hw))return true;return false;
@@ -2240,10 +2300,11 @@ static bool ixgbe_get_i2c_data(struct ixgbe_hw *hw, u32 *i2cctl)**/ static void ixgbe_i2c_bus_clear (struct ixgbe_hw *hw) { -u32 i2cctl =IXGBE_READ_REG (hw,IXGBE_I2CCTL (hw)); +u32 i2cctl;u32 i;ixgbe_i2c_start (hw); + i2cctl =IXGBE_READ_REG (hw,IXGBE_I2CCTL (hw));ixgbe_set_i2c_data (hw, &i2cctl,1 );
PATCH v4 7/13 ixgbe: Clear I2C destination location
In reply to Mark D RustadClear the destination location for I2C data initially so that the received data will not be affected by previous attempts. This could have returned wrong data in certain retry sequences.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +1 -0
@@ -2014,6 +2014,7 @@ static s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data)s32 i;bool bit = false; + *data =0 ;for (i =7 ; i >=0 ; i--) {ixgbe_clock_in_i2c_bit (hw, &bit); *data |= bit << i;
PATCH v4 8/13 ixgbe: Allow reduced delays during sfp detection
In reply to Mark D RustadReduce the number of retries during phy detection. This reduces pauses when no SFP is present. Once an SFP is detected, the normal retry count will be used.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 17 +++++++++++++++++ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 2 ++ 2 files changed, 19 insertions(+)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +17 -0
@@ -1724,6 +1724,20 @@ s32 ixgbe_write_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset, eeprom_data); } +/** ixgbe_is_sfp_probe - Returns true if SFP is being detected +* @hw: pointer to hardware structure +* @offset: eeprom offset to be read +* @addr: I2C address to be read +*/ +static bool ixgbe_is_sfp_probe (struct ixgbe_hw *hw,u8 offset,u8 addr) +{ +if (addr ==IXGBE_I2C_EEPROM_DEV_ADDR && + offset ==IXGBE_SFF_IDENTIFIER && + hw->phy.sfp_type == ixgbe_sfp_type_not_present) +return true; +return false; +} +/** ixgbe_read_i2c_byte_generic_int - Reads 8 bit word over I2C * @hw: pointer to hardware structure * @byte_offset: byte offset to read
@@ -1742,6 +1756,9 @@ static s32 ixgbe_read_i2c_byte_generic_int(struct ixgbe_hw *hw, u8 byte_offset,u32 swfw_mask = hw->phy.phy_semaphore_mask;bool nack = true; +if (ixgbe_is_sfp_probe (hw, byte_offset, dev_addr)) + max_retry =IXGBE_SFP_DETECT_RETRIES ; + *data =0 ; do {
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +2 -0
@@ -109,6 +109,8 @@#define IXGBE_I2C_T_SU_STO 4#define IXGBE_I2C_T_BUF 5 +#define IXGBE_SFP_DETECT_RETRIES 2 +#define IXGBE_TN_LASI_STATUS_REG 0x9005#define IXGBE_TN_LASI_STATUS_TEMP_ALARM 0x0008
PATCH v4 9/13 ixgbe: Add X550EM_x dual-speed SFP+ support
In reply to Mark D RustadThis patch adds X550EM_x SFP+ dual-speed support. 82599 fiber link code was moved from ixgbe_82599.c to ixgbe_common.c for use by X550EM. SFP MAC link code is added to x550EM.
---
Changes in V4:
- Added omitted NULL check on flap_tx_laser method calls
--- drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 193 +++------------------ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 208 +++++++++++++++++++++++ drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 5 + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 3 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 17 ++ 6 files changed, 260 insertions(+), 168 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c +25 -168
@@ -44,9 +44,8 @@static void ixgbe_disable_tx_laser_multispeed_fiber (struct ixgbe_hw *hw);static void ixgbe_enable_tx_laser_multispeed_fiber (struct ixgbe_hw *hw);static void ixgbe_flap_tx_laser_multispeed_fiber (struct ixgbe_hw *hw); -static s32 ixgbe_setup_mac_link_multispeed_fiber (struct ixgbe_hw *hw, -ixgbe_link_speed speed, -bool autoneg_wait_to_complete); +static void +ixgbe_set_hard_rate_select_speed (struct ixgbe_hw *,ixgbe_link_speed );static s32 ixgbe_setup_mac_link_smartspeed (struct ixgbe_hw *hw,ixgbe_link_speed speed,bool autoneg_wait_to_complete);
@@ -109,6 +108,9 @@ static void ixgbe_init_mac_link_ops_82599(struct ixgbe_hw *hw)if (hw->phy.multispeed_fiber) {/* Set up dual speed SFP+ support */ mac->ops.setup_link = &ixgbe_setup_mac_link_multispeed_fiber; + mac->ops.setup_mac_link = ixgbe_setup_mac_link_82599; + mac->ops.set_rate_select_speed = + ixgbe_set_hard_rate_select_speed; }else { if ((mac->ops.get_media_type(hw) == ixgbe_media_type_backplane) &&
@@ -645,177 +647,32 @@ static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) } } -/** -* ixgbe_setup_mac_link_multispeed_fiber - Set MAC link speed -* @hw: pointer to hardware structure -* @speed: new link speed -* @autoneg_wait_to_complete: true when waiting for completion is needed +/** ixgbe_set_hard_rate_select_speed - Set module link speed +* @hw: pointer to hardware structure +* @speed: link speed to set * -* Set the link speed in the AUTOC register and restarts link. -**/ -static s32 ixgbe_setup_mac_link_multispeed_fiber (struct ixgbe_hw *hw, -ixgbe_link_speed speed, -bool autoneg_wait_to_complete) +* Set module link speed via RS0/RS1 rate select pins. +*/ +static void +ixgbe_set_hard_rate_select_speed (struct ixgbe_hw *hw,ixgbe_link_speed speed) { -s32 status =0 ; -ixgbe_link_speed link_speed =IXGBE_LINK_SPEED_UNKNOWN ; -ixgbe_link_speed highest_link_speed =IXGBE_LINK_SPEED_UNKNOWN ; -u32 speedcnt =0 ;u32 esdp_reg =IXGBE_READ_REG (hw,IXGBE_ESDP ); -u32 i =0 ; -bool link_up = false; -bool autoneg = false; - -/* Mask off requested but non-supported speeds */ - status = hw->mac.ops.get_link_capabilities (hw, &link_speed, - &autoneg); -if (status !=0 ) -return status; - - speed &= link_speed; - -/* -* Try each speed one by one, highest priority first. We do this in -* software because 10gb fiber doesn't support speed autonegotiation. -*/ -if (speed &IXGBE_LINK_SPEED_10GB_FULL ) { - speedcnt++; - highest_link_speed =IXGBE_LINK_SPEED_10GB_FULL ; - -/* If we already have link at this speed, just jump out */ - status = hw->mac.ops.check_link (hw, &link_speed, &link_up, - false); -if (status !=0 ) -return status; - -if ((link_speed ==IXGBE_LINK_SPEED_10GB_FULL ) && link_up) - goto out; - -/* Set the module link speed */ -switch (hw->phy.media_type) { -case ixgbe_media_type_fiber: - esdp_reg |= (IXGBE_ESDP_SDP5_DIR |IXGBE_ESDP_SDP5 ); -IXGBE_WRITE_REG (hw,IXGBE_ESDP , esdp_reg); -IXGBE_WRITE_FLUSH (hw); -break ; -case ixgbe_media_type_fiber_qsfp: -/* QSFP module automatically detects MAC link speed */ -break ; -default : -hw_dbg (hw,"Unexpected media type.\n" ); -break ; - } - -/* Allow module to change analog characteristics (1G->10G) */ -msleep (40 ); - - status =ixgbe_setup_mac_link_82599 (hw, -IXGBE_LINK_SPEED_10GB_FULL , - autoneg_wait_to_complete); -if (status !=0 ) -return status; - -/* Flap the tx laser if it has not already been done */ -if (hw->mac.ops.flap_tx_laser) - hw->mac.ops.flap_tx_laser (hw); - -/* -* Wait for the controller to acquire link. Per IEEE 802.3ap, -* Section 73.10.2, we may have to wait up to 500ms if KR is -* attempted. 82599 uses the same timing for 10g SFI. -*/ -for (i =0 ; i <5 ; i++) { -/* Wait for the link partner to also set speed */ -msleep (100 ); - -/* If we have link, just jump out */ - status = hw->mac.ops.check_link (hw, &link_speed, - &link_up, false); -if (status !=0 ) -return status; -if (link_up) - goto out; - } - } - -if (speed &IXGBE_LINK_SPEED_1GB_FULL ) { - speedcnt++; -if (highest_link_speed ==IXGBE_LINK_SPEED_UNKNOWN ) - highest_link_speed =IXGBE_LINK_SPEED_1GB_FULL ; - -/* If we already have link at this speed, just jump out */ - status = hw->mac.ops.check_link (hw, &link_speed, &link_up, - false); -if (status !=0 ) -return status; - -if ((link_speed ==IXGBE_LINK_SPEED_1GB_FULL ) && link_up) - goto out; - -/* Set the module link speed */ -switch (hw->phy.media_type) { -case ixgbe_media_type_fiber: - esdp_reg &= ~IXGBE_ESDP_SDP5 ; - esdp_reg |=IXGBE_ESDP_SDP5_DIR ; -IXGBE_WRITE_REG (hw,IXGBE_ESDP , esdp_reg); -IXGBE_WRITE_FLUSH (hw); -break ; -case ixgbe_media_type_fiber_qsfp: -/* QSFP module automatically detects MAC link speed */ -break ; -default : -hw_dbg (hw,"Unexpected media type.\n" ); -break ; - } - -/* Allow module to change analog characteristics (10G->1G) */ -msleep (40 ); - - status =ixgbe_setup_mac_link_82599 (hw, -IXGBE_LINK_SPEED_1GB_FULL , - autoneg_wait_to_complete); -if (status !=0 ) -return status; - -/* Flap the tx laser if it has not already been done */ -if (hw->mac.ops.flap_tx_laser) - hw->mac.ops.flap_tx_laser (hw); - -/* Wait for the link partner to also set speed */ -msleep (100 ); - -/* If we have link, just jump out */ - status = hw->mac.ops.check_link (hw, &link_speed, &link_up, - false); -if (status !=0 ) -return status; - -if (link_up) - goto out; +switch (speed) { +case IXGBE_LINK_SPEED_10GB_FULL : + esdp_reg |= (IXGBE_ESDP_SDP5_DIR |IXGBE_ESDP_SDP5 ); +break ; +case IXGBE_LINK_SPEED_1GB_FULL : + esdp_reg &= ~IXGBE_ESDP_SDP5 ; + esdp_reg |=IXGBE_ESDP_SDP5_DIR ; +break ; +default : +hw_dbg (hw,"Invalid fixed module speed\n" ); +return ; } -/* -* We didn't get link. Configure back to the highest speed we tried, -* (if there was more than one). We call ourselves back with just the -* single highest speed that the user requested. -*/ -if (speedcnt >1 ) - status =ixgbe_setup_mac_link_multispeed_fiber (hw, - highest_link_speed, - autoneg_wait_to_complete); - -out: -/* Set autoneg_advertised value based on input link speed */ - hw->phy.autoneg_advertised =0 ; - -if (speed &IXGBE_LINK_SPEED_10GB_FULL ) - hw->phy.autoneg_advertised |=IXGBE_LINK_SPEED_10GB_FULL ; - -if (speed &IXGBE_LINK_SPEED_1GB_FULL ) - hw->phy.autoneg_advertised |=IXGBE_LINK_SPEED_1GB_FULL ; - -return status; +IXGBE_WRITE_REG (hw,IXGBE_ESDP , esdp_reg); +IXGBE_WRITE_FLUSH (hw); }/**
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +208 -0
211 lines not on this page · raw message
drivers/net/ethernet/intel/ixgbe/ixgbe_common.h +5 -0
@@ -135,6 +135,11 @@ s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw);s32 ixgbe_init_thermal_sensor_thresh_generic (struct ixgbe_hw *hw);void ixgbe_disable_rx_generic (struct ixgbe_hw *hw);void ixgbe_enable_rx_generic (struct ixgbe_hw *hw); +s32 ixgbe_setup_mac_link_multispeed_fiber (struct ixgbe_hw *hw, +ixgbe_link_speed speed, +bool autoneg_wait_to_complete); +void ixgbe_set_soft_rate_select_speed (struct ixgbe_hw *hw, +ixgbe_link_speed speed);#define IXGBE_FAILED_READ_REG 0xffffffffU#define IXGBE_FAILED_READ_CFG_DWORD 0xffffffffU
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +3 -0
@@ -66,6 +66,9 @@#define IXGBE_SFF_1GBASET_CAPABLE 0x8#define IXGBE_SFF_10GBASESR_CAPABLE 0x10#define IXGBE_SFF_10GBASELR_CAPABLE 0x20 +#define IXGBE_SFF_SOFT_RS_SELECT_MASK 0x8 +#define IXGBE_SFF_SOFT_RS_SELECT_10G 0x8 +#define IXGBE_SFF_SOFT_RS_SELECT_1G 0x0#define IXGBE_SFF_ADDRESSING_MODE 0x4#define IXGBE_SFF_QSFP_DA_ACTIVE_CABLE 0x1#define IXGBE_SFF_QSFP_DA_PASSIVE_CABLE 0x8
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +2 -0
@@ -3256,9 +3256,11 @@ struct ixgbe_mac_operations {void (*flap_tx_laser)(struct ixgbe_hw *);void (*stop_link_on_d3)(struct ixgbe_hw *);s32 (*setup_link)(struct ixgbe_hw *,ixgbe_link_speed ,bool ); +s32 (*setup_mac_link)(struct ixgbe_hw *,ixgbe_link_speed ,bool );s32 (*check_link)(struct ixgbe_hw *,ixgbe_link_speed *,bool *,bool );s32 (*get_link_capabilities)(struct ixgbe_hw *,ixgbe_link_speed *,bool *); +void (*set_rate_select_speed)(struct ixgbe_hw *,ixgbe_link_speed );/* Packet Buffer Manipulation */ void (*set_rxpba)(struct ixgbe_hw *,int ,u32 ,int );
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +17 -0
@@ -908,6 +908,19 @@ static s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed)return status; } +/** ixgbe_setup_mac_link_sfp_x550em - Configure the KR PHY for SFP. +* @hw: pointer to hardware structure +* +* Configures the extern PHY and the integrated KR PHY for SFP support. +*/ +static s32 +ixgbe_setup_mac_link_sfp_x550em (struct ixgbe_hw *hw, +ixgbe_link_speed speed, +__always_unused bool autoneg_wait_to_complete) +{ +return ixgbe_setup_ixfi_x550em (hw, &speed); +} +/** * ixgbe_setup_mac_link_t_X550em - Sets the auto advertised link speed * @hw: pointer to hardware structure
@@ -1002,6 +1015,10 @@ static void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw) mac->ops.disable_tx_laser =NULL ; mac->ops.enable_tx_laser =NULL ; mac->ops.flap_tx_laser =NULL ; + mac->ops.setup_link = ixgbe_setup_mac_link_multispeed_fiber; + 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;
PATCH v4 10/13 ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+
In reply to Mark D RustadConfigures the CS4227 correctly for both 1G and 10G operation, by moving the code to ixgbe_setup_mac_link_sfp_x550em(). It needs to be in this function because we need both the module type and the speed, and this is the only function in the init flow that knows the speed. In contrast, ixgbe_setup_sfp_modules_X550em() does not know the speed, so we can't do anything useful here. This is a fundamental difference from the previous flow, and is due to the way the CS4227 is implemented.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 7 + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 126 ++++++++++++++++--------- 2 files changed, 89 insertions(+), 44 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +6 -1
@@ -81,7 +81,12 @@#define IXGBE_I2C_EEPROM_STATUS_FAIL 0x2#define IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS 0x3#define IXGBE_CS4227 0xBE/* CS4227 address */ -#define IXGBE_CS4227_SPARE24_LSB 0x12B0/* Reg to program EDC */ +#define IXGBE_CS4227_LINE_SPARE22_MSB 0x12AD/* Reg to set speed */ +#define IXGBE_CS4227_LINE_SPARE24_LSB 0x12B0/* Reg to set EDC */ +#define IXGBE_CS4227_HOST_SPARE22_MSB 0x1AAD/* Reg to set speed */ +#define IXGBE_CS4227_HOST_SPARE24_LSB 0x1AB0/* Reg to program EDC */ +#define IXGBE_CS4227_SPEED_1G 0x8000 +#define IXGBE_CS4227_SPEED_10G 0#define IXGBE_CS4227_EDC_MODE_CX1 0x0002#define IXGBE_CS4227_EDC_MODE_SR 0x0004
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +83 -43
149 lines not on this page · raw message
PATCH v4 11/13 ixgbe: Add logic to reset CS4227 when needed
In reply to Mark D RustadOn some hardware platforms, the CS4227 does not initialize properly. Detect those cases and reset it appropriately.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 15 + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 277 +++++++++++++++++++++++++ 2 files changed, 291 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +15 -0
@@ -81,14 +81,29 @@#define IXGBE_I2C_EEPROM_STATUS_FAIL 0x2#define IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS 0x3#define IXGBE_CS4227 0xBE/* CS4227 address */ +#define IXGBE_CS4227_SCRATCH 2 +#define IXGBE_CS4227_RESET_PENDING 0x1357 +#define IXGBE_CS4227_RESET_COMPLETE 0x5AA5 +#define IXGBE_CS4227_RETRIES 15 +#define IXGBE_CS4227_EFUSE_STATUS 0x0181#define IXGBE_CS4227_LINE_SPARE22_MSB 0x12AD/* Reg to set speed */ #define IXGBE_CS4227_LINE_SPARE24_LSB 0x12B0/* Reg to set EDC */ #define IXGBE_CS4227_HOST_SPARE22_MSB 0x1AAD/* Reg to set speed */ #define IXGBE_CS4227_HOST_SPARE24_LSB 0x1AB0/* Reg to program EDC */ +#define IXGBE_CS4227_EEPROM_STATUS 0x5001 +#define IXGBE_CS4227_EEPROM_LOAD_OK 0x0001#define IXGBE_CS4227_SPEED_1G 0x8000#define IXGBE_CS4227_SPEED_10G 0#define IXGBE_CS4227_EDC_MODE_CX1 0x0002#define IXGBE_CS4227_EDC_MODE_SR 0x0004 +#define IXGBE_CS4227_EDC_MODE_DIAG 0x0008 +#define IXGBE_CS4227_RESET_HOLD 500/* microseconds */ +#define IXGBE_CS4227_RESET_DELAY 500/* milliseconds */ +#define IXGBE_CS4227_CHECK_DELAY 30/* milliseconds */ +#define IXGBE_PE 0xE0/* Port expander addr */ +#define IXGBE_PE_OUTPUT 1/* Output reg offset */ +#define IXGBE_PE_CONFIG 3/* Config reg offset */ +#define IXGBE_PE_BIT1 (1 << 1)/* Flow control defines */ #define IXGBE_TAF_SYM_PAUSE 0x400
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +276 -1
289 lines not on this page · raw message
PATCH v4 12/13 ixgbe: Allow SFP+ on more than 82598 and 82599
In reply to Mark D RustadSince SFP+ can be used with some X550 devices, permit them to be detected.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +1 -1
@@ -1224,7 +1224,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) hw->phy.sfp_type = ixgbe_sfp_type_lr; else hw->phy.sfp_type = ixgbe_sfp_type_unknown; - }else if (hw->mac.type == ixgbe_mac_82599EB) { + }else {if (cable_tech &IXGBE_SFF_DA_PASSIVE_CABLE ) {if (hw->bus.lan_id ==0 ) hw->phy.sfp_type =
PATCH v4 13/13 ixgbe: Add new X550EM SFP+ device ID
In reply to Mark D RustadAdd new device ID for X550EM device with SFPs.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1 -0
@@ -137,6 +137,7 @@ static const struct pci_device_id ixgbe_pci_tbl[] = { {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KX4), board_X550EM_x}, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KR), board_X550EM_x}, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_10G_T), board_X550EM_x}, + {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_SFP), board_X550EM_x},/* required last entry */ {0, } };