From: Alejandro Lucero <alejandro.lucero@netronome.com>
To: Ferruh Yigit <ferruh.yigit@intel.com>
Cc: dev <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH v2] nfp: report link speed using hardware info
Date: Mon, 21 Nov 2016 14:47:30 +0000 [thread overview]
Message-ID: <CAD+H9905ErNiROQxLK9oBqVUz=B77H9ahbzRKUp04tD0mUQ2-g@mail.gmail.com> (raw)
In-Reply-To: <c50c9f50-5391-6d02-34c6-17abe1e2fb51@intel.com>
On Mon, Nov 21, 2016 at 11:18 AM, Ferruh Yigit <ferruh.yigit@intel.com>
wrote:
> On 11/18/2016 4:06 PM, Alejandro Lucero wrote:
> > Previous reported speed was hardcoded.
> >
> > Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
> > ---
> > 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
>
>
This is for checking any wrong value from firmware/hardware.
> > + 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.
>
>
Thanks. I think I can remove it.
> > +#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
> >
>
>
prev parent reply other threads:[~2016-11-21 14:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-18 16:06 Alejandro Lucero
2016-11-18 16:29 ` Thomas Monjalon
2016-11-18 16:50 ` Alejandro Lucero
2016-11-21 9:22 ` Thomas Monjalon
2016-11-21 10:57 ` Ferruh Yigit
2016-11-21 11:18 ` Ferruh Yigit
2016-11-21 14:47 ` Alejandro Lucero [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAD+H9905ErNiROQxLK9oBqVUz=B77H9ahbzRKUp04tD0mUQ2-g@mail.gmail.com' \
--to=alejandro.lucero@netronome.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).