OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net:ethernet:aquantia: Add 2500/5000 mbit link modes support. 

Using new link mode indices instead deprecated SUPPORTED_/ADVERTISED_
macro.

Added indication for 2500 and 5000mbit link modes (AQtion adapter already
supports these speeds).

Signed-off-by: Pavel Belous <pavel.belous@aquantia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Belous 2017-02-09 23:53:10 +03:00 committed by David S. Miller
parent caa137eea6
commit 8f9000a565
1 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
drivers/net/ethernet/aquantia/atlantic/aq_nic.c
View File

@ -737,48 +737,70 @@ err_exit:;
void aq_nic_get_link_ksettings(struct aq_nic_s *self, void aq_nic_get_link_ksettings(struct aq_nic_s *self,
struct ethtool_link_ksettings *cmd) struct ethtool_link_ksettings *cmd)
{ {
u32 supported, advertising;
cmd->base.port = PORT_TP; cmd->base.port = PORT_TP;
/* This driver supports only 10G capable adapters, so DUPLEX_FULL */ /* This driver supports only 10G capable adapters, so DUPLEX_FULL */
cmd->base.duplex = DUPLEX_FULL; cmd->base.duplex = DUPLEX_FULL;
cmd->base.autoneg = self->aq_nic_cfg.is_autoneg; cmd->base.autoneg = self->aq_nic_cfg.is_autoneg;
ethtool_convert_link_mode_to_legacy_u32(&supported, ethtool_link_ksettings_zero_link_mode(cmd, supported);
cmd->link_modes.supported);
ethtool_convert_link_mode_to_legacy_u32(&advertising,
cmd->link_modes.advertising);
supported |= (self->aq_hw_caps.link_speed_msk & AQ_NIC_RATE_10G) ? if (self->aq_hw_caps.link_speed_msk & AQ_NIC_RATE_10G)
ADVERTISED_10000baseT_Full : 0U; ethtool_link_ksettings_add_link_mode(cmd, supported,
supported |= (self->aq_hw_caps.link_speed_msk & AQ_NIC_RATE_1G) ? 10000baseT_Full);
ADVERTISED_1000baseT_Full : 0U;
supported |= (self->aq_hw_caps.link_speed_msk & AQ_NIC_RATE_100M) ?
ADVERTISED_100baseT_Full : 0U;
supported |= self->aq_hw_caps.flow_control ? SUPPORTED_Pause : 0;
supported |= SUPPORTED_Autoneg;
supported |= SUPPORTED_TP;
advertising = (self->aq_nic_cfg.is_autoneg) ? if (self->aq_hw_caps.link_speed_msk & AQ_NIC_RATE_5G)
ADVERTISED_Autoneg : 0U; ethtool_link_ksettings_add_link_mode(cmd, supported,
advertising |= 5000baseT_Full);
(self->aq_nic_cfg.link_speed_msk & AQ_NIC_RATE_10G) ?
ADVERTISED_10000baseT_Full : 0U;
advertising |=
(self->aq_nic_cfg.link_speed_msk & AQ_NIC_RATE_1G) ?
ADVERTISED_1000baseT_Full : 0U;
advertising |= if (self->aq_hw_caps.link_speed_msk & AQ_NIC_RATE_2GS)
(self->aq_nic_cfg.link_speed_msk & AQ_NIC_RATE_100M) ? ethtool_link_ksettings_add_link_mode(cmd, supported,
ADVERTISED_100baseT_Full : 0U; 2500baseT_Full);
advertising |= (self->aq_nic_cfg.flow_control) ?
ADVERTISED_Pause : 0U;
advertising |= ADVERTISED_TP;
ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported, if (self->aq_hw_caps.link_speed_msk & AQ_NIC_RATE_1G)
supported); ethtool_link_ksettings_add_link_mode(cmd, supported,
ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising, 1000baseT_Full);
advertising);
if (self->aq_hw_caps.link_speed_msk & AQ_NIC_RATE_100M)
ethtool_link_ksettings_add_link_mode(cmd, supported,
100baseT_Full);
if (self->aq_hw_caps.flow_control)
ethtool_link_ksettings_add_link_mode(cmd, supported,
Pause);
ethtool_link_ksettings_add_link_mode(cmd, supported, Autoneg);
ethtool_link_ksettings_add_link_mode(cmd, supported, TP);
ethtool_link_ksettings_zero_link_mode(cmd, advertising);
if (self->aq_nic_cfg.is_autoneg)
ethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg);
if (self->aq_nic_cfg.link_speed_msk & AQ_NIC_RATE_10G)
ethtool_link_ksettings_add_link_mode(cmd, advertising,
10000baseT_Full);
if (self->aq_nic_cfg.link_speed_msk & AQ_NIC_RATE_5G)
ethtool_link_ksettings_add_link_mode(cmd, advertising,
5000baseT_Full);
if (self->aq_nic_cfg.link_speed_msk & AQ_NIC_RATE_2GS)
ethtool_link_ksettings_add_link_mode(cmd, advertising,
2500baseT_Full);
if (self->aq_nic_cfg.link_speed_msk & AQ_NIC_RATE_1G)
ethtool_link_ksettings_add_link_mode(cmd, advertising,
1000baseT_Full);
if (self->aq_nic_cfg.link_speed_msk & AQ_NIC_RATE_100M)
ethtool_link_ksettings_add_link_mode(cmd, advertising,
100baseT_Full);
if (self->aq_nic_cfg.flow_control)
ethtool_link_ksettings_add_link_mode(cmd, advertising,
Pause);
ethtool_link_ksettings_add_link_mode(cmd, advertising, TP);
} }
int aq_nic_set_link_ksettings(struct aq_nic_s *self, int aq_nic_set_link_ksettings(struct aq_nic_s *self,