Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38edbf6f authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: spawn nfp_ports for PF and VF ports 



nfp_port is an abstraction which is supposed to allow us sharing
code between different netdev types (vNIC vs repr).  Spawn ports
for PFs and VFs to enable this sharing.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ce6bbbb

drivers/net/ethernet/netronome/nfp/flower/main.c

+17 −2
Original line number Diff line number Diff line
@@ -162,14 +162,19 @@ nfp_flower_spawn_vnic_reprs(struct nfp_app *app, 
	u8 nfp_pcie = nfp_cppcore_pcie_unit(app->pf->cpp);

	struct nfp_flower_priv *priv = app->priv;

	struct nfp_reprs *reprs, *old_reprs;

	enum nfp_port_type port_type;

	const u8 queue = 0;

	int i, err;



	port_type = repr_type == NFP_REPR_TYPE_PF ? NFP_PORT_PF_PORT :

						    NFP_PORT_VF_PORT;



	reprs = nfp_reprs_alloc(cnt);

	if (!reprs)

		return -ENOMEM;



	for (i = 0; i < cnt; i++) {

		struct nfp_port *port;

		u32 port_id;



		reprs->reprs[i] = nfp_repr_alloc(app);
@@ -178,15 +183,25 @@ nfp_flower_spawn_vnic_reprs(struct nfp_app *app, 
			goto err_reprs_clean;

		}



		port = nfp_port_alloc(app, port_type, reprs->reprs[i]);

		if (repr_type == NFP_REPR_TYPE_PF) {

			port->pf_id = i;

		} else {

			port->pf_id = 0; /* For now we only support 1 PF */

			port->vf_id = i;

		}



		eth_hw_addr_random(reprs->reprs[i]);



		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)

				    port_id, port, priv->nn->dp.netdev);

		if (err) {

			nfp_port_free(port);

			goto err_reprs_clean;

		}



		nfp_info(app->cpp, "%s%d Representor(%s) created\n",

			 repr_type == NFP_REPR_TYPE_PF ? "PF" : "VF", i,

drivers/net/ethernet/netronome/nfp/nfp_port.h

+18 −2
Original line number Diff line number Diff line
@@ -47,10 +47,14 @@ struct nfp_port; 
 *			state when port disappears because of FW fault or config

 *			change

 * @NFP_PORT_PHYS_PORT:	external NIC port

 * @NFP_PORT_PF_PORT:	logical port of PCI PF

 * @NFP_PORT_VF_PORT:	logical port of PCI VF

 */

enum nfp_port_type {

	NFP_PORT_INVALID,

	NFP_PORT_PHYS_PORT,

	NFP_PORT_PF_PORT,

	NFP_PORT_VF_PORT,

};



/**
@@ -72,6 +76,8 @@ enum nfp_port_flags { 
 * @dl_port:	devlink port structure

 * @eth_id:	for %NFP_PORT_PHYS_PORT port ID in NFP enumeration scheme

 * @eth_port:	for %NFP_PORT_PHYS_PORT translated ETH Table port entry

 * @pf_id:	for %NFP_PORT_PF_PORT, %NFP_PORT_VF_PORT ID of the PCI PF (0-3)

 * @vf_id:	for %NFP_PORT_VF_PORT ID of the PCI VF within @pf_id

 * @port_list:	entry on pf's list of ports

 */

struct nfp_port {
@@ -84,8 +90,18 @@ struct nfp_port { 


	struct devlink_port dl_port;



	union {

		/* NFP_PORT_PHYS_PORT */

		struct {

			unsigned int eth_id;

			struct nfp_eth_table_port *eth_port;

		};

		/* NFP_PORT_PF_PORT, NFP_PORT_VF_PORT */

		struct {

			unsigned int pf_id;

			unsigned int vf_id;

		};

	};



	struct list_head port_list;

};