From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Fri, 23 Jun 2017 22:12:00 +0200
Subject: nfp: move physical port init into a helper
Patch-mainline: v4.13-rc1
Git-commit: a7ceb9905eed38454d28c293afc2f0acb7915d00
References: bsc#1055968
Move MAC/PHY port init into a helper to make it easier to reuse
it in the representor code.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/netronome/nfp/nfp_app_nic.c | 23 +++++----------------
drivers/net/ethernet/netronome/nfp/nfp_port.c | 25 +++++++++++++++++++++++
drivers/net/ethernet/netronome/nfp/nfp_port.h | 3 ++
3 files changed, 34 insertions(+), 17 deletions(-)
--- a/drivers/net/ethernet/netronome/nfp/nfp_app_nic.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_app_nic.c
@@ -42,6 +42,8 @@ static int
nfp_app_nic_vnic_init_phy_port(struct nfp_pf *pf, struct nfp_app *app,
struct nfp_net *nn, unsigned int id)
{
+ int err;
+
if (!pf->eth_tbl)
return 0;
@@ -49,26 +51,13 @@ nfp_app_nic_vnic_init_phy_port(struct nf
if (IS_ERR(nn->port))
return PTR_ERR(nn->port);
- nn->port->eth_id = id;
- nn->port->eth_port = nfp_net_find_port(pf->eth_tbl, id);
-
- /* Check if vNIC has external port associated and cfg is OK */
- if (!nn->port->eth_port) {
- nfp_err(app->cpp,
- "NSP port entries don't match vNICs (no entry for port #%d)\n",
- id);
+ err = nfp_port_init_phy_port(pf, app, nn->port, id);
+ if (err) {
nfp_port_free(nn->port);
- return -EINVAL;
- }
- if (nn->port->eth_port->override_changed) {
- nfp_warn(app->cpp,
- "Config changed for port #%d, reboot required before port will be operational\n",
- id);
- nn->port->type = NFP_PORT_INVALID;
- return 1;
+ return err;
}
- return 0;
+ return nn->port->type == NFP_PORT_INVALID;
}
int nfp_app_nic_vnic_init(struct nfp_app *app, struct nfp_net *nn,
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.c
@@ -33,6 +33,7 @@
#include <linux/lockdep.h>
+#include "nfpcore/nfp_cpp.h"
#include "nfpcore/nfp_nsp.h"
#include "nfp_app.h"
#include "nfp_main.h"
@@ -111,6 +112,30 @@ nfp_port_get_phys_port_name(struct net_d
return 0;
}
+
+int nfp_port_init_phy_port(struct nfp_pf *pf, struct nfp_app *app,
+ struct nfp_port *port, unsigned int id)
+{
+ port->eth_id = id;
+ port->eth_port = nfp_net_find_port(pf->eth_tbl, id);
+
+ /* Check if vNIC has external port associated and cfg is OK */
+ if (!port->eth_port) {
+ nfp_err(app->cpp,
+ "NSP port entries don't match vNICs (no entry for port #%d)\n",
+ id);
+ return -EINVAL;
+ }
+ if (port->eth_port->override_changed) {
+ nfp_warn(app->cpp,
+ "Config changed for port #%d, reboot required before port will be operational\n",
+ id);
+ port->type = NFP_PORT_INVALID;
+ return 0;
+ }
+
+ return 0;
+}
struct nfp_port *
nfp_port_alloc(struct nfp_app *app, enum nfp_port_type type,
--- a/drivers/net/ethernet/netronome/nfp/nfp_port.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_port.h
@@ -104,6 +104,9 @@ nfp_port_alloc(struct nfp_app *app, enum
struct net_device *netdev);
void nfp_port_free(struct nfp_port *port);
+int nfp_port_init_phy_port(struct nfp_pf *pf, struct nfp_app *app,
+ struct nfp_port *port, unsigned int id);
+
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);