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

Commit a7f5a5fc authored by Don Skidmore's avatar Don Skidmore Committed by David S. Miller
Browse files

ixgbe: fix for link failure on SFP+ DA cables 



This patch helps prevent FW/SW semaphore collision from leading
to link establishment failure.  The collision might mess up the
PHY registers so we reset the PHY.  However there are SFI/KR areas
in the PHY that are not reset with a Reset_AN so we need to change
LMS to reset it.  Also wait until AN state machine is AN_GOOD

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8917a3c0

drivers/net/ixgbe/ixgbe_82599.c

+25 −3
Original line number Original line Diff line number Diff line
@@ -96,6 +96,8 @@ static void ixgbe_init_mac_link_ops_82599(struct ixgbe_hw *hw) 
static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw)

static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw)

{

{

	s32 ret_val = 0;

	s32 ret_val = 0;

	u32 reg_anlp1 = 0;

	u32 i = 0;

	u16 list_offset, data_offset, data_value;

	u16 list_offset, data_offset, data_value;





	if (hw->phy.sfp_type != ixgbe_sfp_type_unknown) {

	if (hw->phy.sfp_type != ixgbe_sfp_type_unknown) {
@@ -122,14 +124,34 @@ static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw) 
			IXGBE_WRITE_FLUSH(hw);

			IXGBE_WRITE_FLUSH(hw);

			hw->eeprom.ops.read(hw, ++data_offset, &data_value);

			hw->eeprom.ops.read(hw, ++data_offset, &data_value);

		}

		}

		/* Now restart DSP by setting Restart_AN */

		IXGBE_WRITE_REG(hw, IXGBE_AUTOC,

		    (IXGBE_READ_REG(hw, IXGBE_AUTOC) | IXGBE_AUTOC_AN_RESTART));





		/* Release the semaphore */

		/* Release the semaphore */

		ixgbe_release_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);

		ixgbe_release_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);

		/* Delay obtaining semaphore again to allow FW access */

		/* Delay obtaining semaphore again to allow FW access */

		msleep(hw->eeprom.semaphore_delay);

		msleep(hw->eeprom.semaphore_delay);



		/* Now restart DSP by setting Restart_AN and clearing LMS */

		IXGBE_WRITE_REG(hw, IXGBE_AUTOC, ((IXGBE_READ_REG(hw,

		                IXGBE_AUTOC) & ~IXGBE_AUTOC_LMS_MASK) |

		                IXGBE_AUTOC_AN_RESTART));



		/* Wait for AN to leave state 0 */

		for (i = 0; i < 10; i++) {

			msleep(4);

			reg_anlp1 = IXGBE_READ_REG(hw, IXGBE_ANLP1);

			if (reg_anlp1 & IXGBE_ANLP1_AN_STATE_MASK)

				break;

		}

		if (!(reg_anlp1 & IXGBE_ANLP1_AN_STATE_MASK)) {

			hw_dbg(hw, "sfp module setup not complete\n");

			ret_val = IXGBE_ERR_SFP_SETUP_NOT_COMPLETE;

			goto setup_sfp_out;

		}



		/* Restart DSP by setting Restart_AN and return to SFI mode */

		IXGBE_WRITE_REG(hw, IXGBE_AUTOC, (IXGBE_READ_REG(hw,

		                IXGBE_AUTOC) | IXGBE_AUTOC_LMS_10G_SERIAL |

		                IXGBE_AUTOC_AN_RESTART));

	}

	}





setup_sfp_out:

setup_sfp_out:

drivers/net/ixgbe/ixgbe_type.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -1470,6 +1470,8 @@ 
#define IXGBE_ANLP1_PAUSE               0x0C00

#define IXGBE_ANLP1_PAUSE               0x0C00

#define IXGBE_ANLP1_SYM_PAUSE           0x0400

#define IXGBE_ANLP1_SYM_PAUSE           0x0400

#define IXGBE_ANLP1_ASM_PAUSE           0x0800

#define IXGBE_ANLP1_ASM_PAUSE           0x0800

#define IXGBE_ANLP1_AN_STATE_MASK       0x000f0000







/* SW Semaphore Register bitmasks */

/* SW Semaphore Register bitmasks */

#define IXGBE_SWSM_SMBI 0x00000001 /* Driver Semaphore bit */

#define IXGBE_SWSM_SMBI 0x00000001 /* Driver Semaphore bit */
@@ -2641,6 +2643,7 @@ struct ixgbe_info { 
#define IXGBE_ERR_NO_SPACE                      -25

#define IXGBE_ERR_NO_SPACE                      -25

#define IXGBE_ERR_OVERTEMP                      -26

#define IXGBE_ERR_OVERTEMP                      -26

#define IXGBE_ERR_RAR_INDEX                     -27

#define IXGBE_ERR_RAR_INDEX                     -27

#define IXGBE_ERR_SFP_SETUP_NOT_COMPLETE        -30

#define IXGBE_ERR_PBA_SECTION                   -31

#define IXGBE_ERR_PBA_SECTION                   -31

#define IXGBE_ERR_INVALID_ARGUMENT              -32

#define IXGBE_ERR_INVALID_ARGUMENT              -32

#define IXGBE_NOT_IMPLEMENTED                   0x7FFFFFFF

#define IXGBE_NOT_IMPLEMENTED                   0x7FFFFFFF