Skip to content

Commit

Permalink
ixgbe: Add ethtool support to enable 2.5 and 5.0 Gbps support
Browse files Browse the repository at this point in the history 
Update the ixgbe ethtool interface to support 2.5 and 5 GbE support by
updated the getting and setting advertised and supported speed modes.

CC: Arthur F Mclean <arthur.f.mclean@intel.com>
CC: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
@intel-lab-lkp
Jeff Kirsher authored and intel-lab-lkp committed Jun 26, 2020
1 parent e4ea856 commit 6607c38
Show file tree
Hide file tree
Showing 2 changed files with 155 additions and 81 deletions.
234 changes: 153 additions & 81 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
View file
Expand Up @@ -149,84 +149,138 @@ static const char ixgbe_priv_flags_strings[][ETH_GSTRING_LEN] = {

#define ixgbe_isbackplane(type) ((type) == ixgbe_media_type_backplane)

static u32 ixgbe_get_supported_10gtypes(struct ixgbe_hw *hw)
{
if (!ixgbe_isbackplane(hw->phy.media_type))
return SUPPORTED_10000baseT_Full;

switch (hw->device_id) {
case IXGBE_DEV_ID_82598:
case IXGBE_DEV_ID_82599_KX4:
case IXGBE_DEV_ID_82599_KX4_MEZZ:
case IXGBE_DEV_ID_X550EM_X_KX4:
return SUPPORTED_10000baseKX4_Full;
case IXGBE_DEV_ID_82598_BX:
case IXGBE_DEV_ID_82599_KR:
case IXGBE_DEV_ID_X550EM_X_KR:
case IXGBE_DEV_ID_X550EM_X_XFI:
return SUPPORTED_10000baseKR_Full;
default:
return SUPPORTED_10000baseKX4_Full |
SUPPORTED_10000baseKR_Full;
}
}

static int ixgbe_get_link_ksettings(struct net_device *netdev,
struct ethtool_link_ksettings *cmd)
{
struct ixgbe_adapter *adapter = netdev_priv(netdev);
struct ixgbe_hw *hw = &adapter->hw;
ixgbe_link_speed supported_link;
bool autoneg = false;
u32 supported, advertising;

ethtool_convert_link_mode_to_legacy_u32(&supported,
cmd->link_modes.supported);
ethtool_link_ksettings_zero_link_mode(cmd, supported);
ethtool_link_ksettings_zero_link_mode(cmd, advertising);

hw->mac.ops.get_link_capabilities(hw, &supported_link, &autoneg);

/* set the supported link speeds */
if (supported_link & IXGBE_LINK_SPEED_10GB_FULL)
supported |= ixgbe_get_supported_10gtypes(hw);
if (supported_link & IXGBE_LINK_SPEED_1GB_FULL)
supported |= (ixgbe_isbackplane(hw->phy.media_type)) ?
SUPPORTED_1000baseKX_Full :
SUPPORTED_1000baseT_Full;
if (supported_link & IXGBE_LINK_SPEED_100_FULL)
supported |= SUPPORTED_100baseT_Full;
if (supported_link & IXGBE_LINK_SPEED_10_FULL)
supported |= SUPPORTED_10baseT_Full;

/* default advertised speed if phy.autoneg_advertised isn't set */
advertising = supported;
if (supported_link & IXGBE_LINK_SPEED_10GB_FULL) {
if (ixgbe_isbackplane(hw->phy.media_type)) {
switch (hw->device_id) {
case IXGBE_DEV_ID_82598:
case IXGBE_DEV_ID_82599_KX4:
case IXGBE_DEV_ID_82599_KX4_MEZZ:
case IXGBE_DEV_ID_X550EM_X_KX4:
ethtool_link_ksettings_add_link_mode
(cmd, supported, 10000baseKX4_Full);
ethtool_link_ksettings_add_link_mode
(cmd, advertising, 10000baseKX4_Full);
break;
case IXGBE_DEV_ID_82598_BX:
case IXGBE_DEV_ID_82599_KR:
case IXGBE_DEV_ID_X550EM_X_KR:
case IXGBE_DEV_ID_X550EM_X_XFI:
ethtool_link_ksettings_add_link_mode
(cmd, supported, 10000baseKR_Full);
ethtool_link_ksettings_add_link_mode
(cmd, advertising, 10000baseKR_Full);
break;
default:
ethtool_link_ksettings_add_link_mode
(cmd, supported, 10000baseKX4_Full);
ethtool_link_ksettings_add_link_mode
(cmd, advertising, 10000baseKX4_Full);
ethtool_link_ksettings_add_link_mode
(cmd, supported, 10000baseKR_Full);
ethtool_link_ksettings_add_link_mode
(cmd, advertising, 10000baseKR_Full);
break;
}
} else {
ethtool_link_ksettings_add_link_mode(cmd, supported,
10000baseT_Full);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
10000baseT_Full);
}
}
if (supported_link & IXGBE_LINK_SPEED_5GB_FULL)
ethtool_link_ksettings_add_link_mode(cmd, supported,
5000baseT_Full);
if (supported_link & IXGBE_LINK_SPEED_2_5GB_FULL)
ethtool_link_ksettings_add_link_mode(cmd, supported,
2500baseT_Full);
if (supported_link & IXGBE_LINK_SPEED_1GB_FULL) {
if (ixgbe_isbackplane(hw->phy.media_type)) {
ethtool_link_ksettings_add_link_mode(cmd, supported,
1000baseKX_Full);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
1000baseKX_Full);
} else {
ethtool_link_ksettings_add_link_mode(cmd, supported,
1000baseT_Full);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
1000baseT_Full);
}
}
if (supported_link & IXGBE_LINK_SPEED_100_FULL) {
ethtool_link_ksettings_add_link_mode(cmd, supported,
100baseT_Full);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
100baseT_Full);
}
if (supported_link & IXGBE_LINK_SPEED_10_FULL) {
ethtool_link_ksettings_add_link_mode(cmd, supported,
10baseT_Full);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
10baseT_Full);
}

/* set the advertised speeds */
if (hw->phy.autoneg_advertised) {
advertising = 0;
ethtool_link_ksettings_zero_link_mode(cmd, advertising);
if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10_FULL)
advertising |= ADVERTISED_10baseT_Full;
ethtool_link_ksettings_add_link_mode(cmd, advertising,
10baseT_Full);
if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
advertising |= ADVERTISED_100baseT_Full;
ethtool_link_ksettings_add_link_mode(cmd, advertising,
100baseT_Full);
if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
advertising |= supported & ADVRTSD_MSK_10G;
ethtool_link_ksettings_add_link_mode(cmd, advertising,
10000baseT_Full);
if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL) {
if (supported & SUPPORTED_1000baseKX_Full)
advertising |= ADVERTISED_1000baseKX_Full;
if (ethtool_link_ksettings_test_link_mode(cmd,
supported,
1000baseKX_Full))
ethtool_link_ksettings_add_link_mode(cmd,
advertising,
1000baseKX_Full);
else
advertising |= ADVERTISED_1000baseT_Full;
ethtool_link_ksettings_add_link_mode(cmd,
advertising,
1000baseT_Full);
}
if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_5GB_FULL) {
ethtool_link_ksettings_add_link_mode(cmd, advertising,
5000baseT_Full);
}
if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_2_5GB_FULL) {
ethtool_link_ksettings_add_link_mode(cmd, advertising,
2500baseT_Full);
}
} else {
if (hw->phy.multispeed_fiber && !autoneg) {
if (supported_link & IXGBE_LINK_SPEED_10GB_FULL)
advertising = ADVERTISED_10000baseT_Full;
ethtool_link_ksettings_add_link_mode(cmd,
advertising,
10000baseT_Full);
}
}

if (autoneg) {
supported |= SUPPORTED_Autoneg;
advertising |= ADVERTISED_Autoneg;
ethtool_link_ksettings_add_link_mode(cmd, supported, Autoneg);
ethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg);
cmd->base.autoneg = AUTONEG_ENABLE;
} else
} else {
cmd->base.autoneg = AUTONEG_DISABLE;
}

/* Determine the remaining settings based on the PHY type. */
switch (adapter->hw.phy.type) {
Expand All @@ -235,13 +289,13 @@ static int ixgbe_get_link_ksettings(struct net_device *netdev,
case ixgbe_phy_x550em_ext_t:
case ixgbe_phy_fw:
case ixgbe_phy_cu_unknown:
supported |= SUPPORTED_TP;
advertising |= ADVERTISED_TP;
ethtool_link_ksettings_add_link_mode(cmd, supported, TP);
ethtool_link_ksettings_add_link_mode(cmd, advertising, TP);
cmd->base.port = PORT_TP;
break;
case ixgbe_phy_qt:
supported |= SUPPORTED_FIBRE;
advertising |= ADVERTISED_FIBRE;
ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);
ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);
cmd->base.port = PORT_FIBRE;
break;
case ixgbe_phy_nl:
Expand All @@ -255,13 +309,15 @@ static int ixgbe_get_link_ksettings(struct net_device *netdev,
case ixgbe_phy_qsfp_active_unknown:
case ixgbe_phy_qsfp_intel:
case ixgbe_phy_qsfp_unknown:
/* SFP+ devices, further checking needed */
switch (adapter->hw.phy.sfp_type) {
/* SFP+ devices, further checking needed */
case ixgbe_sfp_type_da_cu:
case ixgbe_sfp_type_da_cu_core0:
case ixgbe_sfp_type_da_cu_core1:
supported |= SUPPORTED_FIBRE;
advertising |= ADVERTISED_FIBRE;
ethtool_link_ksettings_add_link_mode(cmd, supported,
FIBRE);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
FIBRE);
cmd->base.port = PORT_DA;
break;
case ixgbe_sfp_type_sr:
Expand All @@ -272,61 +328,72 @@ static int ixgbe_get_link_ksettings(struct net_device *netdev,
case ixgbe_sfp_type_1g_sx_core1:
case ixgbe_sfp_type_1g_lx_core0:
case ixgbe_sfp_type_1g_lx_core1:
supported |= SUPPORTED_FIBRE;
advertising |= ADVERTISED_FIBRE;
ethtool_link_ksettings_add_link_mode(cmd, supported,
FIBRE);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
FIBRE);
cmd->base.port = PORT_FIBRE;
break;
case ixgbe_sfp_type_not_present:
supported |= SUPPORTED_FIBRE;
advertising |= ADVERTISED_FIBRE;
ethtool_link_ksettings_add_link_mode(cmd, supported,
FIBRE);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
FIBRE);
cmd->base.port = PORT_NONE;
break;
case ixgbe_sfp_type_1g_cu_core0:
case ixgbe_sfp_type_1g_cu_core1:
supported |= SUPPORTED_TP;
advertising |= ADVERTISED_TP;
ethtool_link_ksettings_add_link_mode(cmd, supported,
TP);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
TP);
cmd->base.port = PORT_TP;
break;
case ixgbe_sfp_type_unknown:
default:
supported |= SUPPORTED_FIBRE;
advertising |= ADVERTISED_FIBRE;
ethtool_link_ksettings_add_link_mode(cmd, supported,
FIBRE);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
FIBRE);
cmd->base.port = PORT_OTHER;
break;
}
break;
case ixgbe_phy_xaui:
supported |= SUPPORTED_FIBRE;
advertising |= ADVERTISED_FIBRE;
ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);
ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);
cmd->base.port = PORT_NONE;
break;
case ixgbe_phy_unknown:
case ixgbe_phy_generic:
case ixgbe_phy_sfp_unsupported:
default:
supported |= SUPPORTED_FIBRE;
advertising |= ADVERTISED_FIBRE;
ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);
ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);
cmd->base.port = PORT_OTHER;
break;
}

/* Indicate pause support */
supported |= SUPPORTED_Pause;
ethtool_link_ksettings_add_link_mode(cmd, supported, Pause);

switch (hw->fc.requested_mode) {
case ixgbe_fc_full:
advertising |= ADVERTISED_Pause;
ethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);
break;
case ixgbe_fc_rx_pause:
advertising |= ADVERTISED_Pause |
ADVERTISED_Asym_Pause;
ethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);
ethtool_link_ksettings_add_link_mode(cmd, advertising,
Asym_Pause);
break;
case ixgbe_fc_tx_pause:
advertising |= ADVERTISED_Asym_Pause;
ethtool_link_ksettings_add_link_mode(cmd, advertising,
Asym_Pause);
break;
default:
advertising &= ~(ADVERTISED_Pause |
ADVERTISED_Asym_Pause);
ethtool_link_ksettings_del_link_mode(cmd, advertising, Pause);
ethtool_link_ksettings_del_link_mode(cmd, advertising,
Asym_Pause);
}

if (netif_carrier_ok(netdev)) {
Expand Down Expand Up @@ -358,11 +425,6 @@ static int ixgbe_get_link_ksettings(struct net_device *netdev,
cmd->base.duplex = DUPLEX_UNKNOWN;
}

ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,
supported);
ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising,
advertising);

return 0;
}

Expand Down Expand Up @@ -402,6 +464,16 @@ static int ixgbe_set_link_ksettings(struct net_device *netdev,
if (advertising & ADVERTISED_10000baseT_Full)
advertised |= IXGBE_LINK_SPEED_10GB_FULL;

if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
5000baseT_Full))
advertised |= IXGBE_LINK_SPEED_5GB_FULL;

if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
2500baseT_Full))
advertised |= IXGBE_LINK_SPEED_2_5GB_FULL;

if (ethtool_link_ksettings_test_link_mode(cmd, advertising,
1000baseT_Full))
if (advertising & ADVERTISED_1000baseT_Full)
advertised |= IXGBE_LINK_SPEED_1GB_FULL;

Expand Down
2 changes: 2 additions & 0 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View file
Expand Up @@ -5512,6 +5512,8 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)
if (ret)
return ret;

speed &= ~(IXGBE_LINK_SPEED_5GB_FULL | IXGBE_LINK_SPEED_2_5GB_FULL);

if (hw->mac.ops.setup_link)
ret = hw->mac.ops.setup_link(hw, speed, link_up);

Expand Down

0 comments on commit 6607c38

Please sign in to comment.