diff mbox series

[net-next,18/19] net: usb: aqc111: Implement get/set_link_ksettings callbacks

Message ID 694b148fa9e79d42fe8a815821ae5b0bc12c4aea.1538734658.git.igor.russkikh@aquantia.com (mailing list archive)
State Superseded
Headers show
Series Add support for Aquantia AQtion USB to 5/2.5GbE devices | expand

Commit Message

Igor Russkikh Oct. 5, 2018, 10:25 a.m. UTC 
From: Dmitry Bezrukov <dmitry.bezrukov@aquantia.com>

Signed-off-by: Dmitry Bezrukov <dmitry.bezrukov@aquantia.com>
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
---
 drivers/net/usb/aqc111.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

Comments

Andrew Lunn Oct. 6, 2018, 5:38 p.m. UTC | #1 
> +static int aqc111_set_link_ksettings(struct net_device *net,
> +				     const struct ethtool_link_ksettings *elk)
> +{
> +	struct usbnet *dev = netdev_priv(net);
> +	enum usb_device_speed usb_speed = dev->udev->speed;
> +	struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0];
> +	u32 speed = elk->base.speed;
> +	u8 autoneg = elk->base.autoneg;
> +
> +	if (autoneg == AUTONEG_ENABLE) {
> +		if (aqc111_data->autoneg != AUTONEG_ENABLE) {
> +			aqc111_data->autoneg = AUTONEG_ENABLE;
> +			aqc111_data->advertised_speed =
> +					(usb_speed == USB_SPEED_SUPER) ?
> +					 SPEED_5000 : SPEED_1000;
> +			aqc111_set_phy_speed(dev, aqc111_data->autoneg,
> +					     aqc111_data->advertised_speed);
> +		}
> +	} else {
> +		if (speed != SPEED_100 &&
> +		    speed != SPEED_1000 &&
> +		    speed != SPEED_2500 &&
> +		    speed != SPEED_5000 &&
> +		    speed != SPEED_UNKNOWN)
> +			return -EINVAL;
> +
> +		if (usb_speed != USB_SPEED_SUPER && speed > SPEED_1000)
> +			return -EINVAL;
> +

Hi Igor

Maybe you are missing a check for duplex here?

> +		aqc111_data->autoneg = AUTONEG_DISABLE;
> +		if (speed != SPEED_UNKNOWN)
> +			aqc111_data->advertised_speed = speed;
> +
> +		aqc111_set_phy_speed(dev, aqc111_data->autoneg,
> +				     aqc111_data->advertised_speed);
> +	}
> +
> +	return 0;
> +}
> +
Oliver Neukum Oct. 8, 2018, 2:18 p.m. UTC | #2 
On Fr, 2018-10-05 at 10:25 +0000, Igor Russkikh wrote:
> From: Dmitry Bezrukov <dmitry.bezrukov@aquantia.com>
> 
> +static int aqc111_get_link_ksettings(struct net_device *net,
> +				     struct ethtool_link_ksettings *elk)
> +{
> +	struct usbnet *dev = netdev_priv(net);
> +	enum usb_device_speed usb_speed = dev->udev->speed;
> +	struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0];
> +	u32 speed = SPEED_UNKNOWN;
> +
> +	ethtool_link_ksettings_zero_link_mode(elk, supported);
> +	ethtool_link_ksettings_add_link_mode(elk, supported,
> +					     100baseT_Full);
> +	ethtool_link_ksettings_add_link_mode(elk, supported,
> +					     1000baseT_Full);
> +	if (usb_speed == USB_SPEED_SUPER) {

And SUPER_PLUS?

	Regards
		Oliver
diff mbox series

Patch

diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c
index ade2b60b4811..20d4347ea3ad 100644
--- a/drivers/net/usb/aqc111.c
+++ b/drivers/net/usb/aqc111.c
@@ -192,6 +192,97 @@  static void aqc111_get_drvinfo(struct net_device *net,
 	info->regdump_len = 0x00;
 }
 
+static void aqc111_speed_to_link_mode(u32 speed,
+				      struct ethtool_link_ksettings *elk)
+{
+	switch (speed) {
+	case SPEED_5000: {
+		ethtool_link_ksettings_add_link_mode(elk, advertising,
+						     5000baseT_Full);
+		break;
+	}
+	case SPEED_2500: {
+		ethtool_link_ksettings_add_link_mode(elk, advertising,
+						     2500baseT_Full);
+		break;
+	}
+	case SPEED_1000: {
+		ethtool_link_ksettings_add_link_mode(elk, advertising,
+						     1000baseT_Full);
+		break;
+	}
+	case SPEED_100: {
+		ethtool_link_ksettings_add_link_mode(elk, advertising,
+						     100baseT_Full);
+		break;
+	}
+	}
+}
+
+static int aqc111_get_link_ksettings(struct net_device *net,
+				     struct ethtool_link_ksettings *elk)
+{
+	struct usbnet *dev = netdev_priv(net);
+	enum usb_device_speed usb_speed = dev->udev->speed;
+	struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0];
+	u32 speed = SPEED_UNKNOWN;
+
+	ethtool_link_ksettings_zero_link_mode(elk, supported);
+	ethtool_link_ksettings_add_link_mode(elk, supported,
+					     100baseT_Full);
+	ethtool_link_ksettings_add_link_mode(elk, supported,
+					     1000baseT_Full);
+	if (usb_speed == USB_SPEED_SUPER) {
+		ethtool_link_ksettings_add_link_mode(elk, supported,
+						     2500baseT_Full);
+		ethtool_link_ksettings_add_link_mode(elk, supported,
+						     5000baseT_Full);
+	}
+	ethtool_link_ksettings_add_link_mode(elk, supported, TP);
+	ethtool_link_ksettings_add_link_mode(elk, supported, Autoneg);
+
+	elk->base.port = PORT_TP;
+	elk->base.transceiver = XCVR_INTERNAL;
+
+	elk->base.mdio_support = 0x00; /*Not supported*/
+
+	if (aqc111_data->autoneg)
+		bitmap_copy(elk->link_modes.advertising,
+			    elk->link_modes.supported,
+			    __ETHTOOL_LINK_MODE_MASK_NBITS);
+	else
+		aqc111_speed_to_link_mode(aqc111_data->advertised_speed, elk);
+
+	elk->base.autoneg = aqc111_data->autoneg;
+
+	switch (aqc111_data->link_speed) {
+	case AQ_INT_SPEED_5G:
+	{
+		speed = SPEED_5000;
+		break;
+	}
+	case AQ_INT_SPEED_2_5G:
+	{
+		speed = SPEED_2500;
+		break;
+	}
+	case AQ_INT_SPEED_1G:
+	{
+		speed = SPEED_1000;
+		break;
+	}
+	case AQ_INT_SPEED_100M:
+	{
+		speed = SPEED_100;
+		break;
+	}
+	}
+	elk->base.duplex = DUPLEX_FULL;
+	elk->base.speed = speed;
+
+	return 0;
+}
+
 static void aqc111_set_phy_speed_fw_iface(struct usbnet *dev,
 					  struct aqc111_data *aqc111_data)
 {
@@ -308,11 +399,53 @@  static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed)
 		aqc111_set_phy_speed_fw_iface(dev, aqc111_data);
 }
 
+static int aqc111_set_link_ksettings(struct net_device *net,
+				     const struct ethtool_link_ksettings *elk)
+{
+	struct usbnet *dev = netdev_priv(net);
+	enum usb_device_speed usb_speed = dev->udev->speed;
+	struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0];
+	u32 speed = elk->base.speed;
+	u8 autoneg = elk->base.autoneg;
+
+	if (autoneg == AUTONEG_ENABLE) {
+		if (aqc111_data->autoneg != AUTONEG_ENABLE) {
+			aqc111_data->autoneg = AUTONEG_ENABLE;
+			aqc111_data->advertised_speed =
+					(usb_speed == USB_SPEED_SUPER) ?
+					 SPEED_5000 : SPEED_1000;
+			aqc111_set_phy_speed(dev, aqc111_data->autoneg,
+					     aqc111_data->advertised_speed);
+		}
+	} else {
+		if (speed != SPEED_100 &&
+		    speed != SPEED_1000 &&
+		    speed != SPEED_2500 &&
+		    speed != SPEED_5000 &&
+		    speed != SPEED_UNKNOWN)
+			return -EINVAL;
+
+		if (usb_speed != USB_SPEED_SUPER && speed > SPEED_1000)
+			return -EINVAL;
+
+		aqc111_data->autoneg = AUTONEG_DISABLE;
+		if (speed != SPEED_UNKNOWN)
+			aqc111_data->advertised_speed = speed;
+
+		aqc111_set_phy_speed(dev, aqc111_data->autoneg,
+				     aqc111_data->advertised_speed);
+	}
+
+	return 0;
+}
+
 static const struct ethtool_ops aqc111_ethtool_ops = {
 	.get_drvinfo = aqc111_get_drvinfo,
 	.get_msglevel = usbnet_get_msglevel,
 	.set_msglevel = usbnet_set_msglevel,
 	.get_link = ethtool_op_get_link,
+	.get_link_ksettings = aqc111_get_link_ksettings,
+	.set_link_ksettings = aqc111_set_link_ksettings
 };
 
 static int aqc111_change_mtu(struct net_device *net, int new_mtu)