From eb20d04f49eb236b35381de27bc8b65ffbf60234 Mon Sep 17 00:00:00 2001 From: Zhu Yanjun Date: Wed, 17 May 2017 23:44:12 -0400 Subject: [PATCH] IB/ipoib: add get_settings in ethtool MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In order to let the bonding driver report the correct speed of the underlaying interfaces, when they are IPoIB, the ethtool function get_settings() in the IPoIB driver is implemented. Orabug: 25048521 Cc: Joe Jin Cc: Junxiao Bi Reviewed-by: HÃ¥kon Bugge Reviewed-by: Yuval Shaia --- drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 50 ++++++++++++++++++++ include/uapi/linux/ethtool.h | 3 ++ 2 files changed, 53 insertions(+) diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c index 503439c7dc0e..69eadd1aebf1 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c @@ -164,7 +164,57 @@ static int ipoib_get_sset_count(struct net_device __always_unused *dev, return -EOPNOTSUPP; } +/* Return lane speed in unit of 1e6 bit/sec */ +static inline int ib_speed_enum_to_int(int speed) +{ + switch (speed) { + case IB_SPEED_SDR: + return SPEED_2500; + case IB_SPEED_DDR: + return SPEED_5000; + case IB_SPEED_QDR: + case IB_SPEED_FDR10: + return SPEED_10000; + case IB_SPEED_FDR: + return SPEED_14000; + case IB_SPEED_EDR: + return SPEED_25000; + } + + return SPEED_UNKNOWN; +} + +static int ipoib_get_settings(struct net_device *netdev, + struct ethtool_cmd *ecmd) +{ + struct ipoib_dev_priv *priv = netdev_priv(netdev); + struct ib_port_attr attr; + int ret, speed, width; + + if (!netif_carrier_ok(netdev)) { + ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN); + ecmd->duplex = DUPLEX_UNKNOWN; + return 0; + } + + ret = ib_query_port(priv->ca, priv->port, &attr); + if (ret < 0) + return -EINVAL; + + speed = ib_speed_enum_to_int(attr.active_speed); + width = ib_width_enum_to_int(attr.active_width); + + if (speed < 0 || width < 0) + return -EINVAL; + + ethtool_cmd_speed_set(ecmd, speed * width); + ecmd->duplex = DUPLEX_FULL; + + return 0; +} + static const struct ethtool_ops ipoib_ethtool_ops = { + .get_settings = ipoib_get_settings, .get_drvinfo = ipoib_get_drvinfo, .get_coalesce = ipoib_get_coalesce, .set_coalesce = ipoib_set_coalesce, diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index e367dfe86189..6abba572ca20 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -1294,8 +1294,11 @@ enum ethtool_sfeatures_retval_bits { #define SPEED_100 100 #define SPEED_1000 1000 #define SPEED_2500 2500 +#define SPEED_5000 5000 #define SPEED_10000 10000 +#define SPEED_14000 14000 #define SPEED_20000 20000 +#define SPEED_25000 25000 #define SPEED_40000 40000 #define SPEED_56000 56000 -- 2.50.1