nfp: add support for link auto negotiation

Report the auto negotiation capability if it's supported
in management firmware, and advertise it if it's enabled.
Changing port speed is not allowed when autoneg is enabled.

The ethtool <intf> command displays the auto-neg capability:

  # ethtool enp1s0np0
  Settings for enp1s0np0:
          Supported ports: [ FIBRE ]
          Supported link modes:   Not reported
          Supported pause frame use: Symmetric
          Supports auto-negotiation: Yes
          Supported FEC modes: None        RS      BASER
          Advertised link modes:  Not reported
          Advertised pause frame use: Symmetric
          Advertised auto-negotiation: Yes
          Advertised FEC modes: None       RS      BASER
          Speed: 25000Mb/s
          Duplex: Full
          Auto-negotiation: on
          Port: FIBRE
          PHYAD: 0
          Transceiver: internal
          Link detected: yes

Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
index 91063f19c97df00f518aaacd3a9119008002b129..e66e548919d4899fe3f0a089f3cdbb2228815d6e 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
@@ -729,8 +729,15 @@ static int nfp_pf_cfg_hwinfo(struct nfp_pf *pf, bool sp_indiff)
        snprintf(hwinfo, sizeof(hwinfo), "sp_indiff=%d", sp_indiff);
        err = nfp_nsp_hwinfo_set(nsp, hwinfo, sizeof(hwinfo));
        /* Not a fatal error, no need to return error to stop driver from loading */
-       if (err)
+       if (err) {
                nfp_warn(pf->cpp, "HWinfo(sp_indiff=%d) set failed: %d\n", sp_indiff, err);
+       } else {
+               /* Need reinit eth_tbl since the eth table state may change
+                * after sp_indiff is configured.
+                */
+               kfree(pf->eth_tbl);
+               pf->eth_tbl = __nfp_eth_read_ports(pf->cpp, nsp);
+       }
 
        nfp_nsp_close(nsp);
        return 0;

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
index d50af23642a296f14388d705c887c43dfc5c79b6..678cea0fd274c45fc1bc308e7677660dd8301dbf 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -290,8 +290,13 @@ nfp_net_get_link_ksettings(struct net_device *netdev,
        if (eth_port) {
                ethtool_link_ksettings_add_link_mode(cmd, supported, Pause);
                ethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);
-               cmd->base.autoneg = eth_port->aneg != NFP_ANEG_DISABLED ?
-                       AUTONEG_ENABLE : AUTONEG_DISABLE;
+               if (eth_port->supp_aneg) {
+                       ethtool_link_ksettings_add_link_mode(cmd, supported, Autoneg);
+                       if (eth_port->aneg == NFP_ANEG_AUTO) {
+                               ethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg);
+                               cmd->base.autoneg = AUTONEG_ENABLE;
+                       }
+               }
                nfp_net_set_fec_link_mode(eth_port, cmd);
        }
 
@@ -327,6 +332,7 @@ static int
 nfp_net_set_link_ksettings(struct net_device *netdev,
                           const struct ethtool_link_ksettings *cmd)
 {
+       bool req_aneg = (cmd->base.autoneg == AUTONEG_ENABLE);
        struct nfp_eth_table_port *eth_port;
        struct nfp_port *port;
        struct nfp_nsp *nsp;
@@ -346,13 +352,25 @@ nfp_net_set_link_ksettings(struct net_device *netdev,
        if (IS_ERR(nsp))
                return PTR_ERR(nsp);
 
-       err = __nfp_eth_set_aneg(nsp, cmd->base.autoneg == AUTONEG_ENABLE ?
-                                NFP_ANEG_AUTO : NFP_ANEG_DISABLED);
+       if (req_aneg && !eth_port->supp_aneg) {
+               netdev_warn(netdev, "Autoneg is not supported.\n");
+               err = -EOPNOTSUPP;
+               goto err_bad_set;
+       }
+
+       err = __nfp_eth_set_aneg(nsp, req_aneg ? NFP_ANEG_AUTO : NFP_ANEG_DISABLED);
        if (err)
                goto err_bad_set;
+
        if (cmd->base.speed != SPEED_UNKNOWN) {
                u32 speed = cmd->base.speed / eth_port->lanes;
 
+               if (req_aneg) {
+                       netdev_err(netdev, "Speed changing is not allowed when working on autoneg mode.\n");
+                       err = -EINVAL;
+                       goto err_bad_set;
+               }
+
                err = __nfp_eth_set_speed(nsp, speed);
                if (err)
                        goto err_bad_set;

diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h
index 52465670a01e7205f323f96ab89e826d118e99f8..992d72ac98d38926d8e18b66e79b28a3e8bd6153 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h
@@ -174,6 +174,7 @@ struct nfp_eth_table {
                bool enabled;
                bool tx_enabled;
                bool rx_enabled;
+               bool supp_aneg;
 
                bool override_changed;
 

diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c
index 18ba7629cdc23caf8d9c41a261b241adda6ac9c5..bb64efec4c46b336fc0ebb64d7b665cd1bd5aeec 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c
@@ -27,6 +27,7 @@
 #define NSP_ETH_PORT_PHYLABEL          GENMASK_ULL(59, 54)
 #define NSP_ETH_PORT_FEC_SUPP_BASER    BIT_ULL(60)
 #define NSP_ETH_PORT_FEC_SUPP_RS       BIT_ULL(61)
+#define NSP_ETH_PORT_SUPP_ANEG         BIT_ULL(63)
 
 #define NSP_ETH_PORT_LANES_MASK                cpu_to_le64(NSP_ETH_PORT_LANES)
 
@@ -178,6 +179,7 @@ nfp_eth_port_translate(struct nfp_nsp *nsp, const union eth_table_entry *src,
                return;
 
        dst->act_fec = FIELD_GET(NSP_ETH_STATE_ACT_FEC, state);
+       dst->supp_aneg = FIELD_GET(NSP_ETH_PORT_SUPP_ANEG, port);
 }
 
 static void