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

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

ixgbe: add support for active DA cables 



This patch adds support of active DA cables.  This is
renaming and adding some PHY type enumerations.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33c66bd1

drivers/net/ixgbe/ixgbe_82599.c

+6 −2
Original line number Diff line number Diff line
@@ -2155,10 +2155,14 @@ sfp_check: 
		goto out;



	switch (hw->phy.type) {

	case ixgbe_phy_tw_tyco:

	case ixgbe_phy_tw_unknown:

	case ixgbe_phy_sfp_passive_tyco:

	case ixgbe_phy_sfp_passive_unknown:

		physical_layer = IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU;

		break;

	case ixgbe_phy_sfp_ftl_active:

	case ixgbe_phy_sfp_active_unknown:

		physical_layer = IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA;

		break;

	case ixgbe_phy_sfp_avago:

	case ixgbe_phy_sfp_ftl:

	case ixgbe_phy_sfp_intel:

drivers/net/ixgbe/ixgbe_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -212,8 +212,8 @@ static int ixgbe_get_settings(struct net_device *netdev, 
		ecmd->port = PORT_FIBRE;

		break;

	case ixgbe_phy_nl:

	case ixgbe_phy_tw_tyco:

	case ixgbe_phy_tw_unknown:

	case ixgbe_phy_sfp_passive_tyco:

	case ixgbe_phy_sfp_passive_unknown:

	case ixgbe_phy_sfp_ftl:

	case ixgbe_phy_sfp_avago:

	case ixgbe_phy_sfp_intel:

drivers/net/ixgbe/ixgbe_main.c

+4 −2
Original line number Diff line number Diff line
@@ -3118,8 +3118,10 @@ static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw) 
	case ixgbe_phy_sfp_ftl:

	case ixgbe_phy_sfp_intel:

	case ixgbe_phy_sfp_unknown:

	case ixgbe_phy_tw_tyco:

	case ixgbe_phy_tw_unknown:

	case ixgbe_phy_sfp_passive_tyco:

	case ixgbe_phy_sfp_passive_unknown:

	case ixgbe_phy_sfp_active_unknown:

	case ixgbe_phy_sfp_ftl_active:

		return true;

	default:

		return false;

drivers/net/ixgbe/ixgbe_phy.c

+32 −6
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
	u8 comp_codes_10g = 0;

	u8 oui_bytes[3] = {0, 0, 0};

	u8 cable_tech = 0;

	u8 cable_spec = 0;

	u16 enforce_sfp = 0;



	if (hw->mac.ops.get_media_type(hw) != ixgbe_media_type_fiber) {
@@ -580,14 +581,30 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
			else

				hw->phy.sfp_type = ixgbe_sfp_type_unknown;

		} else if (hw->mac.type == ixgbe_mac_82599EB) {

			if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)

			if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE) {

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

					hw->phy.sfp_type =

					             ixgbe_sfp_type_da_cu_core0;

				else

					hw->phy.sfp_type =

					             ixgbe_sfp_type_da_cu_core1;

			else if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)

			} else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE) {

				hw->phy.ops.read_i2c_eeprom(

						hw, IXGBE_SFF_CABLE_SPEC_COMP,

						&cable_spec);

				if (cable_spec &

				    IXGBE_SFF_DA_SPEC_ACTIVE_LIMITING) {

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

						hw->phy.sfp_type =

						ixgbe_sfp_type_da_act_lmt_core0;

					else

						hw->phy.sfp_type =

						ixgbe_sfp_type_da_act_lmt_core1;

				} else {

					hw->phy.sfp_type =

						ixgbe_sfp_type_unknown;

				}

			} else if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)

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

					hw->phy.sfp_type =

					              ixgbe_sfp_type_srlr_core0;
@@ -637,9 +654,13 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
			switch (vendor_oui) {

			case IXGBE_SFF_VENDOR_OUI_TYCO:

				if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)

					hw->phy.type = ixgbe_phy_tw_tyco;

					hw->phy.type =

						ixgbe_phy_sfp_passive_tyco;

				break;

			case IXGBE_SFF_VENDOR_OUI_FTL:

				if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)

					hw->phy.type = ixgbe_phy_sfp_ftl_active;

				else

					hw->phy.type = ixgbe_phy_sfp_ftl;

				break;

			case IXGBE_SFF_VENDOR_OUI_AVAGO:
@@ -650,7 +671,11 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
				break;

			default:

				if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)

					hw->phy.type = ixgbe_phy_tw_unknown;

					hw->phy.type =

						ixgbe_phy_sfp_passive_unknown;

				else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)

					hw->phy.type =

						ixgbe_phy_sfp_active_unknown;

				else

					hw->phy.type = ixgbe_phy_sfp_unknown;

				break;
@@ -658,7 +683,8 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
		}



		/* All passive DA cables are supported */

		if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE) {

		if (cable_tech & (IXGBE_SFF_DA_PASSIVE_CABLE |

		    IXGBE_SFF_DA_ACTIVE_CABLE)) {

			status = 0;

			goto out;

		}

drivers/net/ixgbe/ixgbe_phy.h

+3 −0
Original line number Diff line number Diff line
@@ -40,9 +40,12 @@ 
#define IXGBE_SFF_1GBE_COMP_CODES    0x6

#define IXGBE_SFF_10GBE_COMP_CODES   0x3

#define IXGBE_SFF_CABLE_TECHNOLOGY   0x8

#define IXGBE_SFF_CABLE_SPEC_COMP    0x3C



/* Bitmasks */

#define IXGBE_SFF_DA_PASSIVE_CABLE           0x4

#define IXGBE_SFF_DA_ACTIVE_CABLE            0x8

#define IXGBE_SFF_DA_SPEC_ACTIVE_LIMITING    0x4

#define IXGBE_SFF_1GBASESX_CAPABLE           0x1

#define IXGBE_SFF_1GBASELX_CAPABLE           0x2

#define IXGBE_SFF_10GBASESR_CAPABLE          0x10