nfp: report link speed from NSP

On the PF prefer the link speed value provided by the NSP.
Refresh port table if needed.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
index d3cec0d4a978e913170c8ac12a92252d24f19d9d..0fdc14e7b5768c55327ca9487369ec2128bf8d93 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -49,6 +49,7 @@
 #include <linux/ethtool.h>
 
 #include "nfpcore/nfp.h"
+#include "nfpcore/nfp_nsp_eth.h"
 #include "nfp_net_ctrl.h"
 #include "nfp_net.h"
 
@@ -205,6 +206,16 @@ nfp_net_get_link_ksettings(struct net_device *netdev,
        if (!netif_carrier_ok(netdev))
                return 0;
 
+       /* Use link speed from ETH table if available, otherwise try the BAR */
+       if (nn->eth_port && nfp_net_link_changed_read_clear(nn))
+               nfp_net_refresh_port_config(nn);
+       /* Separate if - on FW error the port could've disappeared from table */
+       if (nn->eth_port) {
+               cmd->base.speed = nn->eth_port->speed;
+               cmd->base.duplex = DUPLEX_FULL;
+               return 0;
+       }
+
        sts = nn_readl(nn, NFP_NET_CFG_STS);
 
        ls = FIELD_GET(NFP_NET_CFG_STS_LINK_RATE, sts);