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

Commit 011d3256 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: Implement ndo_get_devlink_port 



In order for devlink compat functions to work, implement
ndo_get_devlink_port.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent af3836df

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

+12 −0
Original line number Diff line number Diff line
@@ -1807,6 +1807,18 @@ int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core, 
}

EXPORT_SYMBOL(mlxsw_core_port_get_phys_port_name);



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;

}

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 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ 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 −0
Original line number Diff line number Diff line
@@ -73,11 +73,22 @@ 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 −0
Original line number Diff line number Diff line
@@ -1726,6 +1726,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,
@@ -1742,6 +1752,7 @@ static const struct net_device_ops mlxsw_sp_port_netdev_ops = { 
	.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,

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

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

}



static struct devlink_port *

mlxsw_sx_port_get_devlink_port(struct net_device *dev)

{

	struct mlxsw_sx_port *mlxsw_sx_port = netdev_priv(dev);

	struct mlxsw_sx *mlxsw_sx = mlxsw_sx_port->mlxsw_sx;



	return mlxsw_core_port_devlink_port_get(mlxsw_sx->core,

						mlxsw_sx_port->local_port);

}



static const struct net_device_ops mlxsw_sx_port_netdev_ops = {

	.ndo_open		= mlxsw_sx_port_open,

	.ndo_stop		= mlxsw_sx_port_stop,
@@ -409,6 +419,7 @@ static const struct net_device_ops mlxsw_sx_port_netdev_ops = { 
	.ndo_get_stats64	= mlxsw_sx_port_get_stats64,

	.ndo_get_phys_port_name = mlxsw_sx_port_get_phys_port_name,

	.ndo_get_port_parent_id	= mlxsw_sx_port_get_port_parent_id,

	.ndo_get_devlink_port	= mlxsw_sx_port_get_devlink_port,

};



static void mlxsw_sx_port_get_drvinfo(struct net_device *dev,