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

Commit 1571e2fd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-call-for-phys_port_name-into-devlink-directly-if-possible' 



Jiri Pirko says:

===================
net: call for phys_port_name into devlink directly if possible

phys_port_name may be assembled by a helper in devlink. It is currently
the case only for mlxsw driver. Benefit from the get_devlink_port ndo
and call into devlink directly from dev_get_phys_port_name(). That saves
the trip to the driver, simplifies the code and makes it similar to
recently introduced ethtool-devlink compat helpers.

Move bnxt, partly nfp and dsa to let devlink core generate the name too.
===================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ede1fd18 746364f2

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+8 −18
Original line number Diff line number Diff line
@@ -10048,23 +10048,6 @@ static int bnxt_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh, 
	return rc;

}



static int bnxt_get_phys_port_name(struct net_device *dev, char *buf,

				   size_t len)

{

	struct bnxt *bp = netdev_priv(dev);

	int rc;



	/* The PF and it's VF-reps only support the switchdev framework */

	if (!BNXT_PF(bp))

		return -EOPNOTSUPP;



	rc = snprintf(buf, len, "p%d", bp->pf.port_id);



	if (rc >= len)

		return -EOPNOTSUPP;

	return 0;

}



int bnxt_get_port_parent_id(struct net_device *dev,

			    struct netdev_phys_item_id *ppid)

{
@@ -10083,6 +10066,13 @@ int bnxt_get_port_parent_id(struct net_device *dev, 
	return 0;

}



static struct devlink_port *bnxt_get_devlink_port(struct net_device *dev)

{

	struct bnxt *bp = netdev_priv(dev);



	return &bp->dl_port;

}



static const struct net_device_ops bnxt_netdev_ops = {

	.ndo_open		= bnxt_open,

	.ndo_start_xmit		= bnxt_start_xmit,
@@ -10115,7 +10105,7 @@ static const struct net_device_ops bnxt_netdev_ops = { 
	.ndo_bridge_getlink	= bnxt_bridge_getlink,

	.ndo_bridge_setlink	= bnxt_bridge_setlink,

	.ndo_get_port_parent_id	= bnxt_get_port_parent_id,

	.ndo_get_phys_port_name = bnxt_get_phys_port_name

	.ndo_get_devlink_port	= bnxt_get_devlink_port,

};



static void bnxt_remove_one(struct pci_dev *pdev)

drivers/net/ethernet/mellanox/mlxsw/core.c

+6 −4
Original line number Diff line number Diff line
@@ -1796,16 +1796,18 @@ enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core, 
}

EXPORT_SYMBOL(mlxsw_core_port_type_get);



int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core,

				       u8 local_port, char *name, size_t len)



struct devlink_port *

mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,

				 u8 local_port)

{

	struct mlxsw_core_port *mlxsw_core_port =

					&mlxsw_core->ports[local_port];

	struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port;



	return devlink_port_get_phys_port_name(devlink_port, name, len);

	return devlink_port;

}

EXPORT_SYMBOL(mlxsw_core_port_get_phys_port_name);

EXPORT_SYMBOL(mlxsw_core_port_devlink_port_get);



static void mlxsw_core_buf_dump_dbg(struct mlxsw_core *mlxsw_core,

				    const char *buf, size_t size)

drivers/net/ethernet/mellanox/mlxsw/core.h

+3 −2
Original line number Diff line number Diff line
@@ -176,8 +176,9 @@ void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port, 
			   void *port_driver_priv);

enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core,

						u8 local_port);

int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core,

				       u8 local_port, char *name, size_t len);

struct devlink_port *

mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,

				 u8 local_port);



int mlxsw_core_schedule_dw(struct delayed_work *dwork, unsigned long delay);

bool mlxsw_core_schedule_work(struct work_struct *work);

drivers/net/ethernet/mellanox/mlxsw/minimal.c

+11 −11
Original line number Diff line number Diff line
@@ -51,16 +51,6 @@ static int mlxsw_m_port_dummy_open_stop(struct net_device *dev) 
	return 0;

}



static int

mlxsw_m_port_get_phys_port_name(struct net_device *dev, char *name, size_t len)

{

	struct mlxsw_m_port *mlxsw_m_port = netdev_priv(dev);

	struct mlxsw_core *core = mlxsw_m_port->mlxsw_m->core;

	u8 local_port = mlxsw_m_port->local_port;



	return mlxsw_core_port_get_phys_port_name(core, local_port, name, len);

}



static int mlxsw_m_port_get_port_parent_id(struct net_device *dev,

					   struct netdev_phys_item_id *ppid)

{
@@ -73,11 +63,21 @@ static int mlxsw_m_port_get_port_parent_id(struct net_device *dev, 
	return 0;

}



static struct devlink_port *

mlxsw_m_port_get_devlink_port(struct net_device *dev)

{

	struct mlxsw_m_port *mlxsw_m_port = netdev_priv(dev);

	struct mlxsw_m *mlxsw_m = mlxsw_m_port->mlxsw_m;



	return mlxsw_core_port_devlink_port_get(mlxsw_m->core,

						mlxsw_m_port->local_port);

}



static const struct net_device_ops mlxsw_m_port_netdev_ops = {

	.ndo_open		= mlxsw_m_port_dummy_open_stop,

	.ndo_stop		= mlxsw_m_port_dummy_open_stop,

	.ndo_get_phys_port_name	= mlxsw_m_port_get_phys_port_name,

	.ndo_get_port_parent_id	= mlxsw_m_port_get_port_parent_id,

	.ndo_get_devlink_port	= mlxsw_m_port_get_devlink_port,

};



static int mlxsw_m_get_module_info(struct net_device *netdev,

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+11 −11
Original line number Diff line number Diff line
@@ -1254,16 +1254,6 @@ static int mlxsw_sp_port_kill_vid(struct net_device *dev, 
	return 0;

}



static int mlxsw_sp_port_get_phys_port_name(struct net_device *dev, char *name,

					    size_t len)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);



	return mlxsw_core_port_get_phys_port_name(mlxsw_sp_port->mlxsw_sp->core,

						  mlxsw_sp_port->local_port,

						  name, len);

}



static struct mlxsw_sp_port_mall_tc_entry *

mlxsw_sp_port_mall_tc_entry_find(struct mlxsw_sp_port *port,

				 unsigned long cookie) {
@@ -1726,6 +1716,16 @@ static int mlxsw_sp_port_get_port_parent_id(struct net_device *dev, 
	return 0;

}



static struct devlink_port *

mlxsw_sp_port_get_devlink_port(struct net_device *dev)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;



	return mlxsw_core_port_devlink_port_get(mlxsw_sp->core,

						mlxsw_sp_port->local_port);

}



static const struct net_device_ops mlxsw_sp_port_netdev_ops = {

	.ndo_open		= mlxsw_sp_port_open,

	.ndo_stop		= mlxsw_sp_port_stop,
@@ -1739,9 +1739,9 @@ static const struct net_device_ops mlxsw_sp_port_netdev_ops = { 
	.ndo_get_offload_stats	= mlxsw_sp_port_get_offload_stats,

	.ndo_vlan_rx_add_vid	= mlxsw_sp_port_add_vid,

	.ndo_vlan_rx_kill_vid	= mlxsw_sp_port_kill_vid,

	.ndo_get_phys_port_name	= mlxsw_sp_port_get_phys_port_name,

	.ndo_set_features	= mlxsw_sp_set_features,

	.ndo_get_port_parent_id	= mlxsw_sp_port_get_port_parent_id,

	.ndo_get_devlink_port	= mlxsw_sp_port_get_devlink_port,

};



static void mlxsw_sp_port_get_drvinfo(struct net_device *dev,