Commit 345be204 authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: add SFP+ LX module support 



This patch adds LX support to 82599 devices. This is an alternate patch to
the one suggested by Stefan Behte <s.behte@babiel.com>

In addition this patch includes some cleanups such as:
- removed parenthesis around "x == y ||" lines inside an if statement for
consistency.
- grouped the sx/lx sfp types along with srlr in ixgbe_get_settings() since
they all have the same supported, advertised and port values.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Reported-by: default avatarStefan Behte <s.behte@babiel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 6b92b0ba

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+2 −0
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw, 
	/* Determine 1G link capabilities off of SFP+ type */

	if (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) {

		*speed = IXGBE_LINK_SPEED_1GB_FULL;

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+4 −6
Original line number Diff line number Diff line
@@ -231,6 +231,10 @@ static int ixgbe_get_settings(struct net_device *netdev, 
		case ixgbe_sfp_type_lr:

		case ixgbe_sfp_type_srlr_core0:

		case ixgbe_sfp_type_srlr_core1:

		case ixgbe_sfp_type_1g_sx_core0:

		case ixgbe_sfp_type_1g_sx_core1:

		case ixgbe_sfp_type_1g_lx_core0:

		case ixgbe_sfp_type_1g_lx_core1:

			ecmd->supported |= SUPPORTED_FIBRE;

			ecmd->advertising |= ADVERTISED_FIBRE;

			ecmd->port = PORT_FIBRE;
@@ -246,12 +250,6 @@ static int ixgbe_get_settings(struct net_device *netdev, 
			ecmd->advertising |= ADVERTISED_TP;

			ecmd->port = PORT_TP;

			break;

		case ixgbe_sfp_type_1g_sx_core0:

		case ixgbe_sfp_type_1g_sx_core1:

			ecmd->supported |= SUPPORTED_FIBRE;

			ecmd->advertising |= ADVERTISED_FIBRE;

			ecmd->port = PORT_FIBRE;

			break;

		case ixgbe_sfp_type_unknown:

		default:

			ecmd->supported |= SUPPORTED_FIBRE;

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+17 −4
Original line number Diff line number Diff line
@@ -956,6 +956,13 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
				else

					hw->phy.sfp_type =

						ixgbe_sfp_type_1g_sx_core1;

			} else if (comp_codes_1g & IXGBE_SFF_1GBASELX_CAPABLE) {

				if (hw->bus.lan_id == 0)

					hw->phy.sfp_type =

						ixgbe_sfp_type_1g_lx_core0;

				else

					hw->phy.sfp_type =

						ixgbe_sfp_type_1g_lx_core1;

			} else {

				hw->phy.sfp_type = ixgbe_sfp_type_unknown;

			}
@@ -1043,6 +1050,8 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
		if (comp_codes_10g == 0 &&

		    !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||

		      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||

		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||

		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||

		      hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||

		      hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1)) {

			hw->phy.type = ixgbe_phy_sfp_unsupported;
@@ -1058,10 +1067,12 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 


		hw->mac.ops.get_device_caps(hw, &enforce_sfp);

		if (!(enforce_sfp & IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP) &&

		    !((hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0) ||

		      (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1) ||

		      (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0) ||

		      (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1))) {

		    !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||

		      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||

		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||

		      hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||

		      hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||

		      hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1)) {

			/* Make sure we're a supported PHY type */

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

				status = 0;
@@ -1125,10 +1136,12 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw, 
	 * SR modules

	 */

	if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 ||

	    sfp_type == ixgbe_sfp_type_1g_lx_core0 ||

	    sfp_type == ixgbe_sfp_type_1g_cu_core0 ||

	    sfp_type == ixgbe_sfp_type_1g_sx_core0)

		sfp_type = ixgbe_sfp_type_srlr_core0;

	else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 ||

		 sfp_type == ixgbe_sfp_type_1g_lx_core1 ||

		 sfp_type == ixgbe_sfp_type_1g_cu_core1 ||

		 sfp_type == ixgbe_sfp_type_1g_sx_core1)

		sfp_type = ixgbe_sfp_type_srlr_core1;

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+2 −0
Original line number Diff line number Diff line
@@ -2611,6 +2611,8 @@ enum ixgbe_sfp_type { 
	ixgbe_sfp_type_1g_cu_core1 = 10,

	ixgbe_sfp_type_1g_sx_core0 = 11,

	ixgbe_sfp_type_1g_sx_core1 = 12,

	ixgbe_sfp_type_1g_lx_core0 = 13,

	ixgbe_sfp_type_1g_lx_core1 = 14,

	ixgbe_sfp_type_not_present = 0xFFFE,

	ixgbe_sfp_type_unknown = 0xFFFF

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE