Commit 1f700367 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

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: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarDirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d05d902e
...@@ -103,6 +103,7 @@ nfp_abm_spawn_repr(struct nfp_app *app, struct nfp_abm_link *alink, ...@@ -103,6 +103,7 @@ nfp_abm_spawn_repr(struct nfp_app *app, struct nfp_abm_link *alink,
} }
if (ptype == NFP_PORT_PHYS_PORT) { if (ptype == NFP_PORT_PHYS_PORT) {
port->eth_forced = true;
err = nfp_port_init_phy_port(app->pf, app, port, alink->id); err = nfp_port_init_phy_port(app->pf, app, port, alink->id);
if (err) if (err)
goto err_free_port; 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, ...@@ -276,8 +277,10 @@ nfp_abm_vnic_set_mac(struct nfp_pf *pf, struct nfp_abm *abm, struct nfp_net *nn,
static int static int
nfp_abm_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, unsigned int id) 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 *abm = app->priv;
struct nfp_abm_link *alink; struct nfp_abm_link *alink;
int err;
alink = kzalloc(sizeof(*alink), GFP_KERNEL); alink = kzalloc(sizeof(*alink), GFP_KERNEL);
if (!alink) if (!alink)
...@@ -287,12 +290,23 @@ nfp_abm_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, unsigned int id) ...@@ -287,12 +290,23 @@ nfp_abm_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, unsigned int id)
alink->vnic = nn; alink->vnic = nn;
alink->id = id; 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); netif_keep_dst(nn->dp.netdev);
nfp_abm_vnic_set_mac(app->pf, abm, nn, id); nfp_abm_vnic_set_mac(app->pf, abm, nn, id);
nfp_abm_ctrl_read_params(alink); nfp_abm_ctrl_read_params(alink);
return 0; return 0;
err_free_alink:
kfree(alink);
return err;
} }
static void nfp_abm_vnic_free(struct nfp_app *app, struct nfp_net *nn) static void nfp_abm_vnic_free(struct nfp_app *app, struct nfp_net *nn)
......
...@@ -218,6 +218,8 @@ int nfp_port_configure(struct net_device *netdev, bool configed) ...@@ -218,6 +218,8 @@ int nfp_port_configure(struct net_device *netdev, bool configed)
eth_port = __nfp_port_get_eth_port(port); eth_port = __nfp_port_get_eth_port(port);
if (!eth_port) if (!eth_port)
return 0; return 0;
if (port->eth_forced)
return 0;
err = nfp_eth_set_configured(port->app->cpp, eth_port->index, configed); err = nfp_eth_set_configured(port->app->cpp, eth_port->index, configed);
return err < 0 && err != -EOPNOTSUPP ? err : 0; return err < 0 && err != -EOPNOTSUPP ? err : 0;
......
...@@ -77,6 +77,7 @@ enum nfp_port_flags { ...@@ -77,6 +77,7 @@ enum nfp_port_flags {
* @app: backpointer to the app structure * @app: backpointer to the app structure
* @dl_port: devlink port structure * @dl_port: devlink port structure
* @eth_id: for %NFP_PORT_PHYS_PORT port ID in NFP enumeration scheme * @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_port: for %NFP_PORT_PHYS_PORT translated ETH Table port entry
* @eth_stats: for %NFP_PORT_PHYS_PORT MAC stats if available * @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) * @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 { ...@@ -99,6 +100,7 @@ struct nfp_port {
/* NFP_PORT_PHYS_PORT */ /* NFP_PORT_PHYS_PORT */
struct { struct {
unsigned int eth_id; unsigned int eth_id;
bool eth_forced;
struct nfp_eth_table_port *eth_port; struct nfp_eth_table_port *eth_port;
u8 __iomem *eth_stats; u8 __iomem *eth_stats;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment