From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id E044EDE3 for ; Tue, 31 Jan 2017 16:42:09 +0100 (CET) Received: by mail-wm0-f47.google.com with SMTP id c85so266308803wmi.1 for ; Tue, 31 Jan 2017 07:42:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=g4AtgY8dARJ9EORW0qutkmddTnqesmN/SprD6a+Cjac=; b=wz7iDsfXZ5aEPaCQqbLRjXbaF68gN9y5KyZVVrd0lK8U2DEJnZOUb0qu09OX+mvSBE FRv7dSewxmDswigMue/WC9lLJ+W4oKWV/cLw9byaYXwWkfzRthSkxMgQ2X6ILuvBGDvc wH1b84J0/bhnSywD8cfAgBaJLlO9kcJnC2AihBjJgAUt3uWTlhcI6TWPUHBvOcQqCbD/ MWEDhcZGcOD6Fv+o9QxK5OhKtlRDyXt2NTGPSouTGVAiO8g/GLUCt5TM17wTRABwKeDn 0FnqHBDgvZg4Rx9/cLmHEajlXS7xU9j0lb4PfcEgpUEBhnSStocRqqsGN/vYZpxNz1/1 vTIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=g4AtgY8dARJ9EORW0qutkmddTnqesmN/SprD6a+Cjac=; b=nIaRE3xDEKukYd/++hyypdb56p2IGtGFMIEtlJGCO7i3dV2p89T8pfo/N85nadZilf jc8ptzmdUDIr25rmcgHVtCZ6w5gqFNaazT6U8yG5JfF4uYSt0mxhjCr1aCjGrHhMPt+9 vdPnFoM71uWC1pllryEAHwjdR7zl/AcrPnLhewGePYXWQuIkONOBXIXHYw3wW+9UC5QQ 2pwzCr9emivlMcJUY10kyYuljxWuy9KhZNw+7eGoeeAGAIAxd9wj2kWhS1z6x3e7Iuuw 3fK+6/6h/3ZJTCY81ofCeMJWEwWOYnMKdYyYUOaGQTT2XUvrV9UtDMVmpWzB2sMK8auL yCiQ== X-Gm-Message-State: AIkVDXIFf0htCvQlL/1neg3OcNC8ZqDDESU0RtAgkYQ0rBXF6L6SHK99fqjM5HW8iD97uHQq X-Received: by 10.28.30.79 with SMTP id e76mr18239449wme.96.1485877329420; Tue, 31 Jan 2017 07:42:09 -0800 (PST) Received: from autoinstall.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id e74sm24523191wmd.2.2017.01.31.07.42.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 07:42:08 -0800 (PST) Date: Tue, 31 Jan 2017 16:42:01 +0100 From: =?iso-8859-1?Q?N=E9lio?= Laranjeiro To: Shahaf Shuler Cc: guillaume.gaudonville@6wind.com, adrien.mazarguil@6wind.com, dev@dpdk.org, stable@dpdk.org Message-ID: <20170131154201.GC16389@autoinstall.dev.6wind.com> References: <1485348178-43771-1-git-send-email-shahafs@mellanox.com> <1485863129-6326-1-git-send-email-shahafs@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1485863129-6326-1-git-send-email-shahafs@mellanox.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [dpdk-dev] [PATCH v2] net/mlx5: fix link status query X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2017 15:42:10 -0000 On Tue, Jan 31, 2017 at 01:45:29PM +0200, Shahaf Shuler wrote: > Trying to query the link status through new kernel ioctl API > ETHTOOL_GLINKSETTINGS was always failing due to kernel bug. > The bug was fixed on version 4.9 > this patch uses the legacy ioctl API for lower kernels. > > Fixes: 188408719888 ("net/mlx5: fix support for newer link speeds") > CC: stable@dpdk.org > > Signed-off-by: Shahaf Shuler > --- > on v2: > * remove HAVE_ETHTOOL_LINK_MODE_* > > --- > drivers/net/mlx5/Makefile | 15 --------------- > drivers/net/mlx5/mlx5_ethdev.c | 12 +++--------- > 2 files changed, 3 insertions(+), 24 deletions(-) > > diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile > index 671089c..0b8f7ba 100644 > --- a/drivers/net/mlx5/Makefile > +++ b/drivers/net/mlx5/Makefile > @@ -122,21 +122,6 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh > infiniband/mlx5_hw.h \ > enum MLX5_OPCODE_TSO \ > $(AUTOCONF_OUTPUT) > - $Q sh -- '$<' '$@' \ > - HAVE_ETHTOOL_LINK_MODE_25G \ > - /usr/include/linux/ethtool.h \ > - enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ > - $(AUTOCONF_OUTPUT) > - $Q sh -- '$<' '$@' \ > - HAVE_ETHTOOL_LINK_MODE_50G \ > - /usr/include/linux/ethtool.h \ > - enum ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT \ > - $(AUTOCONF_OUTPUT) > - $Q sh -- '$<' '$@' \ > - HAVE_ETHTOOL_LINK_MODE_100G \ > - /usr/include/linux/ethtool.h \ > - enum ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT \ > - $(AUTOCONF_OUTPUT) > > # Create mlx5_autoconf.h or update it in case it differs from the new one. > > diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c > index 8efdff7..53599fa 100644 > --- a/drivers/net/mlx5/mlx5_ethdev.c > +++ b/drivers/net/mlx5/mlx5_ethdev.c > @@ -46,6 +46,7 @@ > #include > #include > #include > +#include > #include > > /* DPDK headers don't like -pedantic. */ > @@ -697,7 +698,7 @@ struct priv * > > /** > * Retrieve physical link information (unlocked version using new ioctl from > - * Linux 4.5). > + * Linux 4.9). > * > * @param dev > * Pointer to Ethernet device structure. > @@ -707,7 +708,7 @@ struct priv * > static int > mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) > { > -#ifdef ETHTOOL_GLINKSETTINGS > +#if KERNEL_VERSION(4, 9, 0) <= LINUX_VERSION_CODE > struct priv *priv = mlx5_get_priv(dev); > struct ethtool_link_settings edata = { > .cmd = ETHTOOL_GLINKSETTINGS, > @@ -757,25 +758,18 @@ struct priv * > ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT | > ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT)) > priv->link_speed_capa |= ETH_LINK_SPEED_56G; > - /* Link speeds available in kernel v4.6. */ > -#ifdef HAVE_ETHTOOL_LINK_MODE_25G > if (sc & (ETHTOOL_LINK_MODE_25000baseCR_Full_BIT | > ETHTOOL_LINK_MODE_25000baseKR_Full_BIT | > ETHTOOL_LINK_MODE_25000baseSR_Full_BIT)) > priv->link_speed_capa |= ETH_LINK_SPEED_25G; > -#endif > -#ifdef HAVE_ETHTOOL_LINK_MODE_50G > if (sc & (ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT | > ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT)) > priv->link_speed_capa |= ETH_LINK_SPEED_50G; > -#endif > -#ifdef HAVE_ETHTOOL_LINK_MODE_100G > if (sc & (ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT | > ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT | > ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT | > ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT)) > priv->link_speed_capa |= ETH_LINK_SPEED_100G; > -#endif > dev_link.link_duplex = ((edata.duplex == DUPLEX_HALF) ? > ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX); > dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds & > -- > 1.8.3.1 Acked-by: Nelio Laranjeiro -- Nélio Laranjeiro 6WIND