[PATCH net-next 1/8] nfp: split devlink port init from registration
From: Jakub Kicinski <hidden>
Date: 2019-02-26 18:24:53
Subsystem:
netronome ethernet drivers, networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
In the future we want to switch to using the devlink_port_get_phys_port_name() helper for .ndo_phys_port_name. This requires that we initialize the devlink ports before the netdevs are registered. Split the registration from init. Signed-off-by: Jakub Kicinski <redacted> --- .../net/ethernet/netronome/nfp/nfp_devlink.c | 13 ++++++++++--- .../net/ethernet/netronome/nfp/nfp_net_main.c | 17 ++++++++++++++--- drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 ++ 3 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
index e9eca99cf493..9af3cb1f2f17 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c@@ -350,10 +350,9 @@ const struct devlink_ops nfp_devlink_ops = { .flash_update = nfp_devlink_flash_update, }; -int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) +int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port) { struct nfp_eth_table_port eth_port; - struct devlink *devlink; int ret; rtnl_lock();
@@ -366,8 +365,16 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) devlink_port_attrs_set(&port->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL, eth_port.label_port, eth_port.is_split, eth_port.label_subport); + return 0; +} + +void nfp_devlink_port_clean(struct nfp_port *port) +{ +} - devlink = priv_to_devlink(app->pf); +int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) +{ + struct devlink *devlink = priv_to_devlink(app->pf); return devlink_port_register(devlink, &port->dl_port, port->eth_id); }
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
index 08f5fdbd8e41..39e87bb73ebf 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c@@ -150,9 +150,15 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) nn->id = id; + if (nn->port) { + err = nfp_devlink_port_init(pf->app, nn->port); + if (err) + return err; + } + err = nfp_net_init(nn); if (err) - return err; + goto err_port_clean; nfp_net_debugfs_vnic_add(nn, pf->ddir);
@@ -167,17 +173,20 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) if (nfp_net_is_data_vnic(nn)) { err = nfp_app_vnic_init(pf->app, nn); if (err) - goto err_devlink_port_clean; + goto err_port_unreg; } return 0; -err_devlink_port_clean: +err_port_unreg: if (nn->port) nfp_devlink_port_unregister(nn->port); err_dfs_clean: nfp_net_debugfs_dir_clean(&nn->debugfs_dir); nfp_net_clean(nn); +err_port_clean: + if (nn->port) + nfp_devlink_port_clean(nn->port); return err; }
@@ -224,6 +233,8 @@ static void nfp_net_pf_clean_vnic(struct nfp_pf *pf, struct nfp_net *nn) nfp_devlink_port_unregister(nn->port); nfp_net_debugfs_dir_clean(&nn->debugfs_dir); nfp_net_clean(nn); + if (nn->port) + nfp_devlink_port_clean(nn->port); } static int nfp_net_pf_alloc_irqs(struct nfp_pf *pf)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.h b/drivers/net/ethernet/netronome/nfp/nfp_port.h
index 90ae053f5c07..09c55ca2371a 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.h@@ -129,6 +129,8 @@ int nfp_net_refresh_eth_port(struct nfp_port *port); void nfp_net_refresh_port_table(struct nfp_port *port); int nfp_net_refresh_port_table_sync(struct nfp_pf *pf); +int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port); +void nfp_devlink_port_clean(struct nfp_port *port); int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port); void nfp_devlink_port_unregister(struct nfp_port *port);
--
2.19.2