From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com,
jakub.kicinski@netronome.com, f.fainelli@gmail.com,
andrew@lunn.ch, vivien.didelot@gmail.com
Subject: [patch net-next v3 11/15] nfp: move devlink port type set after netdev registration
Date: Sun, 24 Mar 2019 11:14:34 +0100 [thread overview]
Message-ID: <20190324101438.6376-12-jiri@resnulli.us> (raw)
In-Reply-To: <20190324101438.6376-1-jiri@resnulli.us>
From: Jiri Pirko <jiri@mellanox.com>
Similar to other driver, move the port type set after netdev registration
is done. Along with that, clear the type before unregistration.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
v2->v3:
- move type set to be called before nfp_app_vnic_init()
v1->v2:
- new patch
---
drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 11 ++++++++++-
drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 9 +++++++--
drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 ++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
index e9eca99cf493..cb59a18ec6a6 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
@@ -362,7 +362,6 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port)
if (ret)
return ret;
- devlink_port_type_eth_set(&port->dl_port, port->netdev);
devlink_port_attrs_set(&port->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
eth_port.label_port, eth_port.is_split,
eth_port.label_subport);
@@ -377,6 +376,16 @@ void nfp_devlink_port_unregister(struct nfp_port *port)
devlink_port_unregister(&port->dl_port);
}
+void nfp_devlink_port_type_eth_set(struct nfp_port *port)
+{
+ devlink_port_type_eth_set(&port->dl_port, port->netdev);
+}
+
+void nfp_devlink_port_type_clear(struct nfp_port *port)
+{
+ devlink_port_type_clear(&port->dl_port);
+}
+
struct devlink *nfp_devlink_get_devlink(struct net_device *netdev)
{
struct nfp_app *app;
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
index 08f5fdbd8e41..f35278062476 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
@@ -160,6 +160,7 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id)
err = nfp_devlink_port_register(pf->app, nn->port);
if (err)
goto err_dfs_clean;
+ nfp_devlink_port_type_eth_set(nn->port);
}
nfp_net_info(nn);
@@ -173,8 +174,10 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id)
return 0;
err_devlink_port_clean:
- if (nn->port)
+ if (nn->port) {
+ nfp_devlink_port_type_clear(nn->port);
nfp_devlink_port_unregister(nn->port);
+ }
err_dfs_clean:
nfp_net_debugfs_dir_clean(&nn->debugfs_dir);
nfp_net_clean(nn);
@@ -220,8 +223,10 @@ static void nfp_net_pf_clean_vnic(struct nfp_pf *pf, struct nfp_net *nn)
{
if (nfp_net_is_data_vnic(nn))
nfp_app_vnic_clean(pf->app, nn);
- if (nn->port)
+ if (nn->port) {
+ nfp_devlink_port_type_clear(nn->port);
nfp_devlink_port_unregister(nn->port);
+ }
nfp_net_debugfs_dir_clean(&nn->debugfs_dir);
nfp_net_clean(nn);
}
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.h b/drivers/net/ethernet/netronome/nfp/nfp_port.h
index 90ae053f5c07..d7fd203bb180 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.h
@@ -131,6 +131,8 @@ int nfp_net_refresh_port_table_sync(struct nfp_pf *pf);
int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port);
void nfp_devlink_port_unregister(struct nfp_port *port);
+void nfp_devlink_port_type_eth_set(struct nfp_port *port);
+void nfp_devlink_port_type_clear(struct nfp_port *port);
/**
* Mac stats (0x0000 - 0x0200)
--
2.17.2
next prev parent reply other threads:[~2019-03-24 10:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-24 10:14 [patch net-next v3 00/15] devlink: small spring cleanup Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 01/15] net: devlink: add couple of missing mutex_destroy() calls Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 02/15] bnxt: add missing net/devlink.h include Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 03/15] dsa: " Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 04/15] bnxt: set devlink port attrs properly Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 05/15] bnxt: call devlink_port_type_eth_set() before port register Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 06/15] net: devlink: don't take devlink_mutex for devlink_compat_* Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 07/15] net: devlink: don't pass return value of __devlink_port_type_set() Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 08/15] mlxsw: Move devlink_port_attrs_set() call before register Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 09/15] dsa: move " Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 10/15] net: devlink: disallow port_attrs_set() to be called " Jiri Pirko
2019-03-24 10:14 ` Jiri Pirko [this message]
2019-03-24 10:14 ` [patch net-next v3 12/15] bnxt: set devlink port type after registration Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 13/15] net: devlink: warn on setting type on unregistered port Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 14/15] net: devlink: add port type spinlock Jiri Pirko
2019-03-24 10:14 ` [patch net-next v3 15/15] net: devlink: select NET_DEVLINK from drivers Jiri Pirko
2019-03-24 19:04 ` [patch net-next v3 00/15] devlink: small spring cleanup David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190324101438.6376-12-jiri@resnulli.us \
--to=jiri@resnulli.us \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=idosch@mellanox.com \
--cc=jakub.kicinski@netronome.com \
--cc=mlxsw@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).