Commit 15395ec4 authored by Mateusz Palczewski's avatar Mateusz Palczewski Committed by Tony Nguyen
Browse files

i40e: Fix PHY type identifiers for 2.5G and 5G adapters 



Unlike other supported adapters, 2.5G and 5G use different
PHY type identifiers for reading/writing PHY settings
and for reading link status. This commit introduces
separate PHY identifiers for these two operation types.

Fixes: 2e45d3f4 ("i40e: Add support for X710 B/P & SFP+ cards")
Signed-off-by: default avatarDawid Lukwinski <dawid.lukwinski@intel.com>
Signed-off-by: default avatarMateusz Palczewski <mateusz.palczewski@intel.com>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: default avatarDave Switzer <david.switzer@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 61343e6d

drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h

+4 −2
Original line number Diff line number Diff line
@@ -1566,8 +1566,10 @@ enum i40e_aq_phy_type { 
	I40E_PHY_TYPE_25GBASE_LR		= 0x22,

	I40E_PHY_TYPE_25GBASE_AOC		= 0x23,

	I40E_PHY_TYPE_25GBASE_ACC		= 0x24,

	I40E_PHY_TYPE_2_5GBASE_T		= 0x30,

	I40E_PHY_TYPE_5GBASE_T			= 0x31,

	I40E_PHY_TYPE_2_5GBASE_T		= 0x26,

	I40E_PHY_TYPE_5GBASE_T			= 0x27,

	I40E_PHY_TYPE_2_5GBASE_T_LINK_STATUS	= 0x30,

	I40E_PHY_TYPE_5GBASE_T_LINK_STATUS	= 0x31,

	I40E_PHY_TYPE_MAX,

	I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP	= 0xFD,

	I40E_PHY_TYPE_EMPTY			= 0xFE,

drivers/net/ethernet/intel/i40e/i40e_common.c

+2 −2
Original line number Diff line number Diff line
@@ -1154,8 +1154,8 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) 
		break;

	case I40E_PHY_TYPE_100BASE_TX:

	case I40E_PHY_TYPE_1000BASE_T:

	case I40E_PHY_TYPE_2_5GBASE_T:

	case I40E_PHY_TYPE_5GBASE_T:

	case I40E_PHY_TYPE_2_5GBASE_T_LINK_STATUS:

	case I40E_PHY_TYPE_5GBASE_T_LINK_STATUS:

	case I40E_PHY_TYPE_10GBASE_T:

		media = I40E_MEDIA_TYPE_BASET;

		break;

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -841,8 +841,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
							     10000baseT_Full);

		break;

	case I40E_PHY_TYPE_10GBASE_T:

	case I40E_PHY_TYPE_5GBASE_T:

	case I40E_PHY_TYPE_2_5GBASE_T:

	case I40E_PHY_TYPE_5GBASE_T_LINK_STATUS:

	case I40E_PHY_TYPE_2_5GBASE_T_LINK_STATUS:

	case I40E_PHY_TYPE_1000BASE_T:

	case I40E_PHY_TYPE_100BASE_TX:

		ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);

drivers/net/ethernet/intel/i40e/i40e_type.h

+2 −5
Original line number Diff line number Diff line
@@ -239,11 +239,8 @@ struct i40e_phy_info { 
#define I40E_CAP_PHY_TYPE_25GBASE_ACC BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC + \

					     I40E_PHY_TYPE_OFFSET)

/* Offset for 2.5G/5G PHY Types value to bit number conversion */

#define I40E_PHY_TYPE_OFFSET2 (-10)

#define I40E_CAP_PHY_TYPE_2_5GBASE_T BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T + \

					     I40E_PHY_TYPE_OFFSET2)

#define I40E_CAP_PHY_TYPE_5GBASE_T BIT_ULL(I40E_PHY_TYPE_5GBASE_T + \

					     I40E_PHY_TYPE_OFFSET2)

#define I40E_CAP_PHY_TYPE_2_5GBASE_T BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T)

#define I40E_CAP_PHY_TYPE_5GBASE_T BIT_ULL(I40E_PHY_TYPE_5GBASE_T)

#define I40E_HW_CAP_MAX_GPIO			30

/* Capabilities of a PF or a VF or the whole device */

struct i40e_hw_capabilities {