From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: davem@davemloft.net, jiri@resnulli.us
Cc: oss-drivers@netronome.com, netdev@vger.kernel.org,
Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: [PATCH net-next 3/8] nfp: register devlink ports of all reprs
Date: Tue, 26 Feb 2019 10:24:31 -0800 [thread overview]
Message-ID: <20190226182436.23811-4-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <20190226182436.23811-1-jakub.kicinski@netronome.com>
Register all representors as devlink ports.
The port_index is slightly tricky to figure out, we use a bit of
arbitrary math to create unique IDs for PCI ports.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
.../net/ethernet/netronome/nfp/nfp_devlink.c | 47 ++++++++++++++++++-
.../net/ethernet/netronome/nfp/nfp_net_repr.c | 16 ++++++-
2 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
index 9af3cb1f2f17..36976e37d162 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
@@ -350,7 +350,8 @@ const struct devlink_ops nfp_devlink_ops = {
.flash_update = nfp_devlink_flash_update,
};
-int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port)
+static int
+nfp_devlink_port_init_phys(struct devlink *devlink, struct nfp_port *port)
{
struct nfp_eth_table_port eth_port;
int ret;
@@ -368,6 +369,34 @@ int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port)
return 0;
}
+static int
+nfp_devlink_port_init_pci(struct devlink *devlink, struct nfp_port *port,
+ u32 flavour)
+{
+ devlink_port_type_eth_set(&port->dl_port, port->netdev);
+ devlink_port_attrs_pci_set(&port->dl_port, flavour,
+ port->pf_id, port->vf_id);
+ return 0;
+}
+
+int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port)
+{
+ struct devlink *devlink = priv_to_devlink(app->pf);
+
+ switch (port->type) {
+ case NFP_PORT_PHYS_PORT:
+ return nfp_devlink_port_init_phys(devlink, port);
+ case NFP_PORT_PF_PORT:
+ return nfp_devlink_port_init_pci(devlink, port,
+ DEVLINK_PORT_FLAVOUR_PCI_PF);
+ case NFP_PORT_VF_PORT:
+ return nfp_devlink_port_init_pci(devlink, port,
+ DEVLINK_PORT_FLAVOUR_PCI_VF);
+ default:
+ return -EINVAL;
+ }
+}
+
void nfp_devlink_port_clean(struct nfp_port *port)
{
}
@@ -376,7 +405,21 @@ 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);
+ switch (port->type) {
+ case NFP_PORT_PHYS_PORT:
+ return devlink_port_register(devlink, &port->dl_port,
+ port->eth_id);
+ case NFP_PORT_PF_PORT:
+ return devlink_port_register(devlink, &port->dl_port,
+ (port->pf_id + 1) * 10000 +
+ port->pf_split_id * 1000);
+ case NFP_PORT_VF_PORT:
+ return devlink_port_register(devlink, &port->dl_port,
+ (port->pf_id + 1) * 10000 +
+ port->vf_id + 1);
+ default:
+ return -EINVAL;
+ }
}
void nfp_devlink_port_unregister(struct nfp_port *port)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
index d2c803bb4e56..869d22760a6e 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
@@ -292,7 +292,9 @@ nfp_repr_transfer_features(struct net_device *netdev, struct net_device *lower)
static void nfp_repr_clean(struct nfp_repr *repr)
{
+ nfp_devlink_port_unregister(repr->port);
unregister_netdev(repr->netdev);
+ nfp_devlink_port_clean(repr->port);
nfp_app_repr_clean(repr->app, repr->netdev);
dst_release((struct dst_entry *)repr->dst);
nfp_port_free(repr->port);
@@ -395,12 +397,24 @@ int nfp_repr_init(struct nfp_app *app, struct net_device *netdev,
if (err)
goto err_clean;
- err = register_netdev(netdev);
+ err = nfp_devlink_port_init(app, repr->port);
if (err)
goto err_repr_clean;
+ err = register_netdev(netdev);
+ if (err)
+ goto err_port_clean;
+
+ err = nfp_devlink_port_register(app, repr->port);
+ if (err)
+ goto err_unreg_netdev;
+
return 0;
+err_unreg_netdev:
+ unregister_netdev(repr->netdev);
+err_port_clean:
+ nfp_devlink_port_clean(repr->port);
err_repr_clean:
nfp_app_repr_clean(app, netdev);
err_clean:
--
2.19.2
next prev parent reply other threads:[~2019-02-26 18:24 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 18:24 [PATCH net-next 0/8] devlink: add PF and VF port flavours Jakub Kicinski
2019-02-26 18:24 ` [PATCH net-next 1/8] nfp: split devlink port init from registration Jakub Kicinski
2019-02-26 18:24 ` [PATCH net-next 2/8] devlink: add PF and VF port flavours Jakub Kicinski
2019-02-27 12:16 ` Jiri Pirko
2019-03-04 4:59 ` Parav Pandit
2019-03-04 7:30 ` Jiri Pirko
2019-03-20 17:29 ` Abodunrin, Akeem G
2019-03-21 12:26 ` Jiri Pirko
2019-02-27 12:23 ` Jiri Pirko
2019-02-27 12:41 ` Jiri Pirko
2019-02-27 17:23 ` Jakub Kicinski
2019-02-27 20:17 ` Jiri Pirko
2019-02-27 22:42 ` Jakub Kicinski
2019-02-28 8:44 ` Jiri Pirko
2019-02-28 16:08 ` Jakub Kicinski
2019-02-28 16:24 ` David Ahern
2019-02-26 18:24 ` Jakub Kicinski [this message]
2019-02-26 18:24 ` [PATCH net-next 4/8] devlink: allow subports on devlink PCI ports Jakub Kicinski
2019-02-27 12:37 ` Jiri Pirko
2019-02-27 18:30 ` Jakub Kicinski
2019-02-28 8:56 ` Jiri Pirko
2019-02-28 13:32 ` Jiri Pirko
2019-02-28 16:24 ` Jakub Kicinski
2019-03-01 7:25 ` Jiri Pirko
2019-03-01 16:04 ` Jakub Kicinski
2019-03-01 16:20 ` Jiri Pirko
2019-03-04 16:15 ` Jason Gunthorpe
2019-03-05 1:03 ` Jakub Kicinski
2019-03-05 1:30 ` Jason Gunthorpe
2019-03-05 2:11 ` Jakub Kicinski
2019-03-05 22:11 ` Jason Gunthorpe
2019-03-04 5:00 ` Parav Pandit
2019-02-26 18:24 ` [PATCH net-next 5/8] nfp: switch to devlink_port_get_phys_port_name() Jakub Kicinski
2019-02-26 18:24 ` [PATCH net-next 6/8] devlink: introduce port's peer netdevs Jakub Kicinski
2019-02-27 13:08 ` Jiri Pirko
2019-02-27 18:47 ` Jakub Kicinski
2019-02-28 9:00 ` Jiri Pirko
2019-02-28 16:36 ` Jakub Kicinski
2019-03-01 7:37 ` Jiri Pirko
2019-03-01 16:05 ` Jakub Kicinski
2019-03-04 5:07 ` Parav Pandit
2019-02-26 18:24 ` [PATCH net-next 7/8] nfp: expose PF " Jakub Kicinski
2019-02-26 18:24 ` [PATCH net-next 8/8] devlink: fix kdoc Jakub Kicinski
2019-02-27 13:13 ` Jiri Pirko
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=20190226182436.23811-4-jakub.kicinski@netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=davem@davemloft.net \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.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).