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

Commit 553b4497 authored by PJ Waskiewicz's avatar PJ Waskiewicz Committed by David S. Miller
Browse files

ixgbe: Remove unnecessary PHY reset, properly identify multispeed fiber modules 



This patch does two things:
1) On 82599, the PHY is emedded in the MAC.  On 82598, the SFP+ NIC has an external PHY.  The reset in the SFP+ setup patch for 82598 is unnecessary on 82599, and adds extra dead time to device initialization.  This removes that PHY reset for 82599 only.

2) On 82599, the SFP+ modules are multispeed fiber modules (10G/1G).  We need to make sure to identify them properly for the remaining init sections to properly set them up.

Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 04f165ef

drivers/net/ixgbe/ixgbe_82599.c

+16 −8
Original line number Original line Diff line number Diff line
@@ -102,6 +102,9 @@ s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw) 




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

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

		ixgbe_init_mac_link_ops_82599(hw);

		ixgbe_init_mac_link_ops_82599(hw);



		hw->phy.ops.reset = NULL;



		ret_val = ixgbe_get_sfp_init_sequence_offsets(hw, &list_offset,

		ret_val = ixgbe_get_sfp_init_sequence_offsets(hw, &list_offset,

		                                              &data_offset);

		                                              &data_offset);
@@ -716,8 +719,6 @@ s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw) 
	/* Call adapter stop to disable tx/rx and clear interrupts */

	/* Call adapter stop to disable tx/rx and clear interrupts */

	hw->mac.ops.stop_adapter(hw);

	hw->mac.ops.stop_adapter(hw);





	/* Reset PHY */

	if (hw->phy.reset_disable == false) {

	/* PHY ops must be identified and initialized prior to reset */

	/* PHY ops must be identified and initialized prior to reset */





	/* Init PHY and function pointers, perform SFP setup */

	/* Init PHY and function pointers, perform SFP setup */
@@ -726,9 +727,16 @@ s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw) 
	if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)

	if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)

		goto reset_hw_out;

		goto reset_hw_out;





		hw->phy.ops.reset(hw);

	/* Setup SFP module if there is one present. */

	if (hw->phy.sfp_setup_needed) {

		status = hw->mac.ops.setup_sfp(hw);

		hw->phy.sfp_setup_needed = false;

	}

	}





	/* Reset PHY */

	if (hw->phy.reset_disable == false && hw->phy.ops.reset != NULL)

		hw->phy.ops.reset(hw);



	/*

	/*

	 * Prevent the PCI-E bus from from hanging by disabling PCI-E master

	 * Prevent the PCI-E bus from from hanging by disabling PCI-E master

	 * access and verify no pending requests before reset

	 * access and verify no pending requests before reset

drivers/net/ixgbe/ixgbe_phy.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -552,6 +552,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
{

{

	s32 status = IXGBE_ERR_PHY_ADDR_INVALID;

	s32 status = IXGBE_ERR_PHY_ADDR_INVALID;

	u32 vendor_oui = 0;

	u32 vendor_oui = 0;

	enum ixgbe_sfp_type stored_sfp_type = hw->phy.sfp_type;

	u8 identifier = 0;

	u8 identifier = 0;

	u8 comp_codes_1g = 0;

	u8 comp_codes_1g = 0;

	u8 comp_codes_10g = 0;

	u8 comp_codes_10g = 0;
@@ -620,6 +621,16 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
				hw->phy.sfp_type = ixgbe_sfp_type_unknown;

				hw->phy.sfp_type = ixgbe_sfp_type_unknown;

		}

		}





		if (hw->phy.sfp_type != stored_sfp_type)

			hw->phy.sfp_setup_needed = true;



		/* Determine if the SFP+ PHY is dual speed or not. */

		if (((comp_codes_1g & IXGBE_SFF_1GBASESX_CAPABLE) &&

		   (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)) ||

		   ((comp_codes_1g & IXGBE_SFF_1GBASELX_CAPABLE) &&

		   (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)))

			hw->phy.multispeed_fiber = true;



		/* Determine PHY vendor */

		/* Determine PHY vendor */

		if (hw->phy.type == ixgbe_phy_unknown) {

		if (hw->phy.type == ixgbe_phy_unknown) {

			hw->phy.id = identifier;

			hw->phy.id = identifier;

drivers/net/ixgbe/ixgbe_phy.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ 
/* Bitmasks */

/* Bitmasks */

#define IXGBE_SFF_TWIN_AX_CAPABLE            0x80

#define IXGBE_SFF_TWIN_AX_CAPABLE            0x80

#define IXGBE_SFF_1GBASESX_CAPABLE           0x1

#define IXGBE_SFF_1GBASESX_CAPABLE           0x1

#define IXGBE_SFF_1GBASELX_CAPABLE           0x2

#define IXGBE_SFF_10GBASESR_CAPABLE          0x10

#define IXGBE_SFF_10GBASESR_CAPABLE          0x10

#define IXGBE_SFF_10GBASELR_CAPABLE          0x20

#define IXGBE_SFF_10GBASELR_CAPABLE          0x20

#define IXGBE_I2C_EEPROM_READ_MASK           0x100

#define IXGBE_I2C_EEPROM_READ_MASK           0x100

drivers/net/ixgbe/ixgbe_type.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -2198,6 +2198,7 @@ struct ixgbe_phy_info { 
	u32                             addr;

	u32                             addr;

	u32                             id;

	u32                             id;

	enum ixgbe_sfp_type             sfp_type;

	enum ixgbe_sfp_type             sfp_type;

	bool                            sfp_setup_needed;

	u32                             revision;

	u32                             revision;

	enum ixgbe_media_type           media_type;

	enum ixgbe_media_type           media_type;

	bool                            reset_disable;

	bool                            reset_disable;