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

Commit 1339b9e9 authored by PJ Waskiewicz's avatar PJ Waskiewicz Committed by David S. Miller
Browse files

ixgbe: Fix get_supported_physical_layer() due to new 82599 PHY types 



A purely cosmetic change.  Report which physical layer is present, instead
of PHY unknown.  82599 added new PHY types for the SFP+ devices, and this
was missed getting updated.

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 c8ea5ea9

drivers/net/ixgbe/ixgbe_82599.c

+16 −0
Original line number Diff line number Diff line
@@ -1130,6 +1130,7 @@ s32 ixgbe_identify_phy_82599(struct ixgbe_hw *hw) 
u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)

{

	u32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;

	u8 comp_codes_10g = 0;



	switch (hw->device_id) {

	case IXGBE_DEV_ID_82599:
@@ -1143,6 +1144,8 @@ u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw) 


		switch (hw->phy.sfp_type) {

		case ixgbe_sfp_type_da_cu:

		case ixgbe_sfp_type_da_cu_core0:

		case ixgbe_sfp_type_da_cu_core1:

			physical_layer = IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU;

			break;

		case ixgbe_sfp_type_sr:
@@ -1151,6 +1154,19 @@ u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw) 
		case ixgbe_sfp_type_lr:

			physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_LR;

			break;

		case ixgbe_sfp_type_srlr_core0:

		case ixgbe_sfp_type_srlr_core1:

			hw->phy.ops.read_i2c_eeprom(hw,

			                            IXGBE_SFF_10GBE_COMP_CODES,

			                            &comp_codes_10g);

			if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)

				physical_layer =

				                IXGBE_PHYSICAL_LAYER_10GBASE_SR;

			else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)

				physical_layer =

				                IXGBE_PHYSICAL_LAYER_10GBASE_LR;

			else

				physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;

		default:

			physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;

			break;