From: Simon Horman <simon.horman@netronome.com>
To: David Miller <davem@davemloft.net>,
Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: netdev@vger.kernel.org, oss-drivers@netronome.com,
Or Gerlitz <gerlitz.or@gmail.com>,
Simon Horman <simon.horman@netronome.com>
Subject: [PATCH net-next v2 12/12] nfp: add VF and PF representors to flower app
Date: Tue, 20 Jun 2017 23:36:20 +0200 [thread overview]
Message-ID: <1497994580-6271-13-git-send-email-simon.horman@netronome.com> (raw)
In-Reply-To: <1497994580-6271-1-git-send-email-simon.horman@netronome.com>
Initialise VF and PF representors in flower app.
Based in part on work by Benjamin LaHaise, Bert van Leeuwen and
Jakub Kicinski.
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
drivers/net/ethernet/netronome/nfp/flower/main.c | 86 +++++++++++++++++++++++-
1 file changed, 84 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c
index d1d905727c54..582b7be3e219 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/main.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
@@ -149,15 +149,81 @@ static const struct net_device_ops nfp_flower_repr_netdev_ops = {
.ndo_get_offload_stats = nfp_repr_get_offload_stats,
};
+static void nfp_flower_sriov_disable(struct nfp_app *app)
+{
+ nfp_reprs_clean_and_free_by_type(app, NFP_REPR_TYPE_VF);
+}
+
+static int
+nfp_flower_spawn_vnic_reprs(struct nfp_app *app,
+ enum nfp_flower_cmsg_port_vnic_type vnic_type,
+ enum nfp_repr_type repr_type, unsigned int cnt)
+{
+ u8 nfp_pcie = nfp_cppcore_pcie_unit(app->pf->cpp);
+ struct nfp_flower_priv *priv = app->priv;
+ struct nfp_reprs *reprs, *old_reprs;
+ const u8 queue = 0;
+ int i, err;
+
+ reprs = nfp_reprs_alloc(cnt);
+ if (!reprs)
+ return -ENOMEM;
+
+ for (i = 0; i < cnt; i++) {
+ u32 port_id;
+
+ reprs->reprs[i] = nfp_repr_alloc(app);
+ if (!reprs->reprs[i]) {
+ err = -ENOMEM;
+ goto err_reprs_clean;
+ }
+
+ SET_NETDEV_DEV(reprs->reprs[i], &priv->nn->pdev->dev);
+ eth_hw_addr_inherit(reprs->reprs[i], priv->nn->dp.netdev);
+
+ port_id = nfp_flower_cmsg_pcie_port(nfp_pcie, vnic_type,
+ i, queue);
+ err = nfp_repr_init(app, reprs->reprs[i],
+ &nfp_flower_repr_netdev_ops,
+ port_id, NULL, priv->nn->dp.netdev);
+ if (err)
+ goto err_reprs_clean;
+
+ nfp_info(app->cpp, "%s%d Representor(%s) created\n",
+ repr_type == NFP_REPR_TYPE_PF ? "PF" : "VF", i,
+ reprs->reprs[i]->name);
+ }
+
+ old_reprs = nfp_app_reprs_set(app, repr_type, reprs);
+ if (IS_ERR(old_reprs)) {
+ err = PTR_ERR(old_reprs);
+ goto err_reprs_clean;
+ }
+
+ return 0;
+err_reprs_clean:
+ nfp_reprs_clean_and_free(reprs);
+ return err;
+}
+
+static int nfp_flower_sriov_enable(struct nfp_app *app, int num_vfs)
+{
+ return nfp_flower_spawn_vnic_reprs(app,
+ NFP_FLOWER_CMSG_PORT_VNIC_TYPE_VF,
+ NFP_REPR_TYPE_VF, num_vfs);
+}
+
static void nfp_flower_stop(struct nfp_app *app)
{
+ nfp_reprs_clean_and_free_by_type(app, NFP_REPR_TYPE_PF);
nfp_reprs_clean_and_free_by_type(app, NFP_REPR_TYPE_PHYS_PORT);
+
}
-static int nfp_flower_start(struct nfp_app *app)
+static int
+nfp_flower_spawn_phy_reprs(struct nfp_app *app, struct nfp_flower_priv *priv)
{
struct nfp_eth_table *eth_tbl = app->pf->eth_tbl;
- struct nfp_flower_priv *priv = app->priv;
struct nfp_reprs *reprs, *old_reprs;
unsigned int i;
int err;
@@ -218,6 +284,19 @@ static int nfp_flower_start(struct nfp_app *app)
return err;
}
+static int nfp_flower_start(struct nfp_app *app)
+{
+ int err;
+
+ err = nfp_flower_spawn_phy_reprs(app, app->priv);
+ if (err)
+ return err;
+
+ return nfp_flower_spawn_vnic_reprs(app,
+ NFP_FLOWER_CMSG_PORT_VNIC_TYPE_PF,
+ NFP_REPR_TYPE_PF, 1);
+}
+
static void nfp_flower_vnic_clean(struct nfp_app *app, struct nfp_net *nn)
{
kfree(app->priv);
@@ -289,6 +368,9 @@ const struct nfp_app_type app_flower = {
.ctrl_msg_rx = nfp_flower_cmsg_rx,
+ .sriov_enable = nfp_flower_sriov_enable,
+ .sriov_disable = nfp_flower_sriov_disable,
+
.eswitch_mode_get = eswitch_mode_get,
.repr_get = nfp_flower_repr_get,
};
--
2.1.4
next prev parent reply other threads:[~2017-06-20 21:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-20 21:36 [PATCH net-next v2 00/12] nfp: add flower app with representors Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 01/12] net: store port/representator id in metadata_dst Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 02/12] nfp: devlink add support for getting eswitch mode Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 03/12] nfp: move physical port init into a helper Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 04/12] nfp: map mac_stats and vf_cfg BARs Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 05/12] nfp: general representor implementation Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 06/12] nfp: add stats and xmit helpers for representors Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 07/12] nfp: app callbacks for SRIOV Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 08/12] nfp: provide nfp_port to of nfp_net_get_mac_addr() Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 09/12] nfp: add support for tx/rx with metadata portid Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 10/12] nfp: add support for control messages for flower app Simon Horman
2017-06-20 21:36 ` [PATCH net-next v2 11/12] nfp: add " Simon Horman
2017-06-21 9:04 ` Or Gerlitz
2017-06-21 9:59 ` Simon Horman
2017-06-20 21:36 ` Simon Horman [this message]
2017-06-22 14:50 ` [PATCH net-next v2 12/12] nfp: add VF and PF representors to " Or Gerlitz
2017-06-22 19:08 ` Simon Horman
2017-06-21 19:40 ` [PATCH net-next v2 00/12] nfp: add flower app with representors David Miller
2017-06-22 14:54 ` Or Gerlitz
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=1497994580-6271-13-git-send-email-simon.horman@netronome.com \
--to=simon.horman@netronome.com \
--cc=davem@davemloft.net \
--cc=gerlitz.or@gmail.com \
--cc=jakub.kicinski@netronome.com \
--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).