Commit 3d464aad authored by Igor Russkikh's avatar Igor Russkikh Committed by David S. Miller
Browse files

net: atlantic: add defines for 10M and EEE 100M link mode 



This patch adds defines for 10M and EEE 100M link modes, which are
supported by A2.

10M support is added in this patch series.
EEE is out of scope, but will be added in a follow-up series.

Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarMark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98c4353c

drivers/net/ethernet/aquantia/atlantic/aq_common.h

+12 −10
Original line number Diff line number Diff line
@@ -56,10 +56,12 @@ 
#define AQ_NIC_RATE_2GS		BIT(3)

#define AQ_NIC_RATE_1G		BIT(4)

#define AQ_NIC_RATE_100M	BIT(5)

#define AQ_NIC_RATE_10M		BIT(6)



#define AQ_NIC_RATE_EEE_10G	BIT(6)

#define AQ_NIC_RATE_EEE_5G	BIT(7)

#define AQ_NIC_RATE_EEE_2GS	BIT(8)

#define AQ_NIC_RATE_EEE_1G	BIT(9)

#define AQ_NIC_RATE_EEE_10G	BIT(7)

#define AQ_NIC_RATE_EEE_5G	BIT(8)

#define AQ_NIC_RATE_EEE_2GS	BIT(9)

#define AQ_NIC_RATE_EEE_1G	BIT(10)

#define AQ_NIC_RATE_EEE_100M	BIT(11)



#endif /* AQ_COMMON_H */

drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c

+3 −0
Original line number Diff line number Diff line
@@ -611,6 +611,9 @@ static enum hw_atl_fw2x_rate eee_mask_to_ethtool_mask(u32 speed) 
	if (speed & AQ_NIC_RATE_EEE_1G)

		rate |= SUPPORTED_1000baseT_Full;



	if (speed & AQ_NIC_RATE_EEE_100M)

		rate |= SUPPORTED_100baseT_Full;



	return rate;

}

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+12 −0
Original line number Diff line number Diff line
@@ -885,6 +885,10 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self, 
		ethtool_link_ksettings_add_link_mode(cmd, supported,

						     100baseT_Full);



	if (self->aq_nic_cfg.aq_hw_caps->link_speed_msk & AQ_NIC_RATE_10M)

		ethtool_link_ksettings_add_link_mode(cmd, supported,

						     10baseT_Full);



	if (self->aq_nic_cfg.aq_hw_caps->flow_control) {

		ethtool_link_ksettings_add_link_mode(cmd, supported,

						     Pause);
@@ -924,6 +928,10 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self, 
		ethtool_link_ksettings_add_link_mode(cmd, advertising,

						     100baseT_Full);



	if (self->aq_nic_cfg.link_speed_msk  & AQ_NIC_RATE_10M)

		ethtool_link_ksettings_add_link_mode(cmd, advertising,

						     10baseT_Full);



	if (self->aq_nic_cfg.fc.cur & AQ_NIC_FC_RX)

		ethtool_link_ksettings_add_link_mode(cmd, advertising,

						     Pause);
@@ -954,6 +962,10 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self, 
		speed = cmd->base.speed;



		switch (speed) {

		case SPEED_10:

			rate = AQ_NIC_RATE_10M;

			break;



		case SPEED_100:

			rate = AQ_NIC_RATE_100M;

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE