From: Simon Horman <simon.horman@corigine.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, oss-drivers@corigine.com,
Yu Xiao <yu.xiao@corigine.com>,
Yinjun Zhang <yinjun.zhang@corigine.com>,
Louis Peens <louis.peens@corigine.com>,
Simon Horman <simon.horman@corigine.com>
Subject: [PATCH net] nfp: correct the output of `ethtool --show-fec <intf>`
Date: Mon, 30 May 2022 10:48:42 +0200 [thread overview]
Message-ID: <20220530084842.21258-1-simon.horman@corigine.com> (raw)
From: Yu Xiao <yu.xiao@corigine.com>
The output of `Configured FEC encodings` should display user
configured/requested value, rather than the NIC supported modes
list.
Before this patch, the output is:
# ethtool --show-fec <intf>
FEC parameters for <intf>:
Configured FEC encodings: Auto Off RS BaseR
Active FEC encoding: None
With this patch, the corrected output is:
# ethtool --show-fec <intf>
FEC parameters for <intf>:
Configured FEC encodings: Auto
Active FEC encoding: None
Fixes: 0d0870938337 ("nfp: implement ethtool FEC mode settings")
Signed-off-by: Yu Xiao <yu.xiao@corigine.com>
Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
---
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 4 +++-
drivers/net/ethernet/netronome/nfp/nfp_port.c | 1 +
drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
index df0afd271a21..115acd4b963b 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -842,8 +842,8 @@ nfp_port_get_fecparam(struct net_device *netdev,
if (!nfp_eth_can_support_fec(eth_port))
return 0;
- param->fec = nfp_port_fec_nsp_to_ethtool(eth_port->fec_modes_supported);
param->active_fec = nfp_port_fec_nsp_to_ethtool(eth_port->fec);
+ param->fec = port->fec_configured;
return 0;
}
@@ -873,6 +873,8 @@ nfp_port_set_fecparam(struct net_device *netdev,
/* Only refresh if we did something */
nfp_net_refresh_port_table(port);
+ port->fec_configured = param->fec;
+
return err < 0 ? err : 0;
}
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.c b/drivers/net/ethernet/netronome/nfp/nfp_port.c
index 4f2308570dcf..73f7bc8add7f 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.c
@@ -189,6 +189,7 @@ int nfp_port_init_phy_port(struct nfp_pf *pf, struct nfp_app *app,
port->eth_port = &pf->eth_tbl->ports[id];
port->eth_id = pf->eth_tbl->ports[id].index;
+ port->fec_configured = ETHTOOL_FEC_NONE;
if (pf->mac_stats_mem)
port->eth_stats =
pf->mac_stats_mem + port->eth_id * NFP_MAC_STATS_SIZE;
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.h b/drivers/net/ethernet/netronome/nfp/nfp_port.h
index d1ebe6c72f7f..fc2dfd2d01be 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.h
@@ -50,6 +50,7 @@ enum nfp_port_flags {
* @eth_id: for %NFP_PORT_PHYS_PORT port ID in NFP enumeration scheme
* @eth_forced: for %NFP_PORT_PHYS_PORT port is forced UP or DOWN, don't change
* @eth_port: for %NFP_PORT_PHYS_PORT translated ETH Table port entry
+ * @fec_configured: for %NFP_PORT_PHYS_PORT configured FEC encodings
* @eth_stats: for %NFP_PORT_PHYS_PORT MAC stats if available
* @pf_id: for %NFP_PORT_PF_PORT, %NFP_PORT_VF_PORT ID of the PCI PF (0-3)
* @vf_id: for %NFP_PORT_VF_PORT ID of the PCI VF within @pf_id
@@ -75,6 +76,7 @@ struct nfp_port {
unsigned int eth_id;
bool eth_forced;
struct nfp_eth_table_port *eth_port;
+ u32 fec_configured;
u8 __iomem *eth_stats;
};
/* NFP_PORT_PF_PORT, NFP_PORT_VF_PORT */
--
2.30.2
next reply other threads:[~2022-05-30 8:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-30 8:48 Simon Horman [this message]
2022-05-31 4:32 ` [PATCH net] nfp: correct the output of `ethtool --show-fec <intf>` Jakub Kicinski
2022-06-01 1:48 ` Yinjun Zhang
2022-06-01 2:46 ` Jakub Kicinski
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=20220530084842.21258-1-simon.horman@corigine.com \
--to=simon.horman@corigine.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=louis.peens@corigine.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@corigine.com \
--cc=yinjun.zhang@corigine.com \
--cc=yu.xiao@corigine.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).