From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 6689D5681 for ; Mon, 21 Nov 2016 12:19:03 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP; 21 Nov 2016 03:19:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,675,1473145200"; d="scan'208";a="903900531" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.220.57]) ([10.237.220.57]) by orsmga003.jf.intel.com with ESMTP; 21 Nov 2016 03:19:00 -0800 To: Alejandro Lucero , dev@dpdk.org References: <1479485218-11931-1-git-send-email-alejandro.lucero@netronome.com> From: Ferruh Yigit Message-ID: Date: Mon, 21 Nov 2016 11:18:59 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1479485218-11931-1-git-send-email-alejandro.lucero@netronome.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v2] nfp: report link speed using hardware info X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Nov 2016 11:19:04 -0000 On 11/18/2016 4:06 PM, Alejandro Lucero wrote: > Previous reported speed was hardcoded. > > Signed-off-by: Alejandro Lucero > --- > drivers/net/nfp/nfp_net.c | 28 ++++++++++++++++++++++++++-- > drivers/net/nfp/nfp_net_ctrl.h | 13 +++++++++++++ > 2 files changed, 39 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c > index c6b1587..24f3164 100644 > --- a/drivers/net/nfp/nfp_net.c > +++ b/drivers/net/nfp/nfp_net.c > @@ -816,6 +816,17 @@ static void nfp_net_read_mac(struct nfp_net_hw *hw) > struct rte_eth_link link, old; > uint32_t nn_link_status; > > + static const uint32_t ls_to_ethtool[] = { > + [NFP_NET_CFG_STS_LINK_RATE_UNSUPPORTED] = ETH_SPEED_NUM_NONE, > + [NFP_NET_CFG_STS_LINK_RATE_UNKNOWN] = ETH_SPEED_NUM_NONE, > + [NFP_NET_CFG_STS_LINK_RATE_1G] = ETH_SPEED_NUM_1G, > + [NFP_NET_CFG_STS_LINK_RATE_10G] = ETH_SPEED_NUM_10G, > + [NFP_NET_CFG_STS_LINK_RATE_25G] = ETH_SPEED_NUM_25G, > + [NFP_NET_CFG_STS_LINK_RATE_40G] = ETH_SPEED_NUM_40G, > + [NFP_NET_CFG_STS_LINK_RATE_50G] = ETH_SPEED_NUM_50G, > + [NFP_NET_CFG_STS_LINK_RATE_100G] = ETH_SPEED_NUM_100G, > + }; > + > PMD_DRV_LOG(DEBUG, "Link update\n"); > > hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); > @@ -831,8 +842,21 @@ static void nfp_net_read_mac(struct nfp_net_hw *hw) > link.link_status = ETH_LINK_UP; > > link.link_duplex = ETH_LINK_FULL_DUPLEX; > - /* Other cards can limit the tx and rx rate per VF */ > - link.link_speed = ETH_SPEED_NUM_40G; > + > + nn_link_status = (nn_link_status >> NFP_NET_CFG_STS_LINK_RATE_SHIFT) & > + NFP_NET_CFG_STS_LINK_RATE_MASK; > + > + if ((NFD_CFG_MAJOR_VERSION_of(hw->ver) < 4) || > + ((NFD_CFG_MINOR_VERSION_of(hw->ver) == 4) && > + (NFD_CFG_MINOR_VERSION_of(hw->ver) == 0))) > + link.link_speed = ETH_SPEED_NUM_40G; For specific firmware version, speed is still hardcoded to 40G, can you please mention from this and if possible its reason in commit log? > + else { > + if (nn_link_status == NFP_NET_CFG_STS_LINK_RATE_UNKNOWN || This check can be redundant, since ls_to_ethtool[NFP_NET_CFG_STS_LINK_RATE_UNKNOWN] => ETH_SPEED_NUM_NONE > + nn_link_status >= RTE_DIM(ls_to_ethtool)) > + link.link_speed = ETH_SPEED_NUM_NONE; > + else > + link.link_speed = ls_to_ethtool[nn_link_status]; > + } > > if (old.link_status != link.link_status) { > nfp_net_dev_atomic_write_link_status(dev, &link); > diff --git a/drivers/net/nfp/nfp_net_ctrl.h b/drivers/net/nfp/nfp_net_ctrl.h > index fce8251..f9aaba3 100644 > --- a/drivers/net/nfp/nfp_net_ctrl.h > +++ b/drivers/net/nfp/nfp_net_ctrl.h > @@ -157,6 +157,19 @@ > #define NFP_NET_CFG_VERSION_MINOR(x) (((x) & 0xff) << 0) > #define NFP_NET_CFG_STS 0x0034 > #define NFP_NET_CFG_STS_LINK (0x1 << 0) /* Link up or down */ > +/* Link rate */ > +#define NFP_NET_CFG_STS_LINK_RATE_SHIFT 1 > +#define NFP_NET_CFG_STS_LINK_RATE_MASK 0xF > +#define NFP_NET_CFG_STS_LINK_RATE \ > + (NFP_NET_CFG_STS_LINK_RATE_MASK << NFP_NET_CFG_STS_LINK_RATE_SHIFT) This macro is not used at all, just fyi. > +#define NFP_NET_CFG_STS_LINK_RATE_UNSUPPORTED 0 > +#define NFP_NET_CFG_STS_LINK_RATE_UNKNOWN 1 > +#define NFP_NET_CFG_STS_LINK_RATE_1G 2 > +#define NFP_NET_CFG_STS_LINK_RATE_10G 3 > +#define NFP_NET_CFG_STS_LINK_RATE_25G 4 > +#define NFP_NET_CFG_STS_LINK_RATE_40G 5 > +#define NFP_NET_CFG_STS_LINK_RATE_50G 6 > +#define NFP_NET_CFG_STS_LINK_RATE_100G 7 > #define NFP_NET_CFG_CAP 0x0038 > #define NFP_NET_CFG_MAX_TXRINGS 0x003c > #define NFP_NET_CFG_MAX_RXRINGS 0x0040 >