nfp: abm: force Ethternet port up

Current control firmware does not cater too well to multi-host
applications.  There is no way to check which hosts are up or
otherwise negotiate what the state of the external port (the
Ethernet port) should be.  Make sure the link is up when driver
loads, and don't take it down when Ethernet port netdev is
closed.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/abm/main.c b/drivers/net/ethernet/netronome/nfp/abm/main.c
index d8f1bdac02b8eeac51c5935dab44276a2a43e904..7afd24ce79a558f44589b4ebf34c3d7e4a477653 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/abm/main.c
+++ b/drivers/net/ethernet/netronome/nfp/abm/main.c
@@ -103,6 +103,7 @@ nfp_abm_spawn_repr(struct nfp_app *app, struct nfp_abm_link *alink,
        }
 
        if (ptype == NFP_PORT_PHYS_PORT) {
+               port->eth_forced = true;
                err = nfp_port_init_phy_port(app->pf, app, port, alink->id);
                if (err)
                        goto err_free_port;
@@ -276,8 +277,10 @@ nfp_abm_vnic_set_mac(struct nfp_pf *pf, struct nfp_abm *abm, struct nfp_net *nn,
 static int
 nfp_abm_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, unsigned int id)
 {
+       struct nfp_eth_table_port *eth_port = &app->pf->eth_tbl->ports[id];
        struct nfp_abm *abm = app->priv;
        struct nfp_abm_link *alink;
+       int err;
 
        alink = kzalloc(sizeof(*alink), GFP_KERNEL);
        if (!alink)
@@ -287,12 +290,23 @@ nfp_abm_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, unsigned int id)
        alink->vnic = nn;
        alink->id = id;
 
+       /* This is a multi-host app, make sure MAC/PHY is up, but don't
+        * make the MAC/PHY state follow the state of any of the ports.
+        */
+       err = nfp_eth_set_configured(app->cpp, eth_port->index, true);
+       if (err < 0)
+               goto err_free_alink;
+
        netif_keep_dst(nn->dp.netdev);
 
        nfp_abm_vnic_set_mac(app->pf, abm, nn, id);
        nfp_abm_ctrl_read_params(alink);
 
        return 0;
+
+err_free_alink:
+       kfree(alink);
+       return err;
 }
 
 static void nfp_abm_vnic_free(struct nfp_app *app, struct nfp_net *nn)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.c b/drivers/net/ethernet/netronome/nfp/nfp_port.c
index 7bd8be5c833b08f3416fff971e1101bf8791214d..a17f1ace6988815688ec2aa66380c8eef111c338 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.c
@@ -218,6 +218,8 @@ int nfp_port_configure(struct net_device *netdev, bool configed)
        eth_port = __nfp_port_get_eth_port(port);
        if (!eth_port)
                return 0;
+       if (port->eth_forced)
+               return 0;
 
        err = nfp_eth_set_configured(port->app->cpp, eth_port->index, configed);
        return err < 0 && err != -EOPNOTSUPP ? err : 0;

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.h b/drivers/net/ethernet/netronome/nfp/nfp_port.h
index fa7e669a969c6e5baa8aec30fedb410d29806793..1d9b2b47e27dba698955d31556066c08ac7a2a34 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.h
@@ -77,6 +77,7 @@ enum nfp_port_flags {
  * @app:       backpointer to the app structure
  * @dl_port:   devlink port structure
  * @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
  * @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)
@@ -99,6 +100,7 @@ struct nfp_port {
                /* NFP_PORT_PHYS_PORT */
                struct {
                        unsigned int eth_id;
+                       bool eth_forced;
                        struct nfp_eth_table_port *eth_port;
                        u8 __iomem *eth_stats;
                };