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

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

nfp: remove phys_port_name on flower's vNIC 



.ndo_get_phys_port_name was recently extended to support multi-vNIC
FWs.  These are firmwares which can have more than one vNIC per PF
without associated port (e.g. Adaptive Buffer Management FW), therefore
we need a way of distinguishing the vNICs.  Unfortunately, it's too
late to make flower use the same naming.  Flower users may depend on
.ndo_get_phys_port_name returning -EOPNOTSUPP, for example the name
udev gave the PF vNIC was just the bare PCI device-based name before
the change, and will have 'nn0' appended after.

To ensure flower's vNIC doesn't have phys_port_name attribute, add
a flag to vNIC struct and set it in flower code.  New projects will
not set the flag adhere to the naming scheme from the start.

Fixes: 51c1df83 ("nfp: assign vNIC id as phys_port_name of vNICs which are not ports")
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarDirk van der Merwe <dirk.vandermerwe@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 29f534c4

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

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ static int nfp_flower_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, 


	eth_hw_addr_random(nn->dp.netdev);

	netif_keep_dst(nn->dp.netdev);

	nn->vnic_no_name = true;



	return 0;

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

+4 −0
Original line number Diff line number Diff line
@@ -590,6 +590,8 @@ struct nfp_net_dp { 
 * @vnic_list:		Entry on device vNIC list

 * @pdev:		Backpointer to PCI device

 * @app:		APP handle if available

 * @vnic_no_name:	For non-port PF vNIC make ndo_get_phys_port_name return

 *			-EOPNOTSUPP to keep backwards compatibility (set by app)

 * @port:		Pointer to nfp_port structure if vNIC is a port

 * @app_priv:		APP private data for this vNIC

 */
@@ -663,6 +665,8 @@ struct nfp_net { 
	struct pci_dev *pdev;

	struct nfp_app *app;



	bool vnic_no_name;



	struct nfp_port *port;



	void *app_priv;

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+1 −1
Original line number Diff line number Diff line
@@ -3286,7 +3286,7 @@ nfp_net_get_phys_port_name(struct net_device *netdev, char *name, size_t len) 
	if (nn->port)

		return nfp_port_get_phys_port_name(netdev, name, len);



	if (nn->dp.is_vf)

	if (nn->dp.is_vf || nn->vnic_no_name)

		return -EOPNOTSUPP;



	n = snprintf(name, len, "n%d", nn->id);