Commit 622d3e92 authored by Danielle Ratson's avatar Danielle Ratson Committed by David S. Miller
Browse files

mlxsw: Set number of port lanes attribute in driver 



Currently, port attributes like flavour, port number and whether the
port was split are set when initializing a port.

Set the number of lanes of the port as well so that it could be easily
passed to devlink in the next patch.

Signed-off-by: default avatarDanielle Ratson <danieller@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71ad8d55

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

+4 −2
Original line number Diff line number Diff line
@@ -2122,6 +2122,7 @@ static int __mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port, 
				  enum devlink_port_flavour flavour,

				  u32 port_number, bool split,

				  u32 split_port_subnumber,

				  u32 lanes,

				  const unsigned char *switch_id,

				  unsigned char switch_id_len)

{
@@ -2159,13 +2160,14 @@ static void __mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port) 
int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,

			 u32 port_number, bool split,

			 u32 split_port_subnumber,

			 u32 lanes,

			 const unsigned char *switch_id,

			 unsigned char switch_id_len)

{

	return __mlxsw_core_port_init(mlxsw_core, local_port,

				      DEVLINK_PORT_FLAVOUR_PHYSICAL,

				      port_number, split, split_port_subnumber,

				      switch_id, switch_id_len);

				      lanes, switch_id, switch_id_len);

}

EXPORT_SYMBOL(mlxsw_core_port_init);
@@ -2186,7 +2188,7 @@ int mlxsw_core_cpu_port_init(struct mlxsw_core *mlxsw_core, 


	err = __mlxsw_core_port_init(mlxsw_core, MLXSW_PORT_CPU_PORT,

				     DEVLINK_PORT_FLAVOUR_CPU,

				     0, false, 0,

				     0, false, 0, 0,

				     switch_id, switch_id_len);

	if (err)

		return err;

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

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ void *mlxsw_core_port_driver_priv(struct mlxsw_core_port *mlxsw_core_port); 
int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,

			 u32 port_number, bool split,

			 u32 split_port_subnumber,

			 u32 lanes,

			 const unsigned char *switch_id,

			 unsigned char switch_id_len);

void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port);

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

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ mlxsw_m_port_create(struct mlxsw_m *mlxsw_m, u8 local_port, u8 module) 
	int err;



	err = mlxsw_core_port_init(mlxsw_m->core, local_port,

				   module + 1, false, 0,

				   module + 1, false, 0, 0,

				   mlxsw_m->base_mac,

				   sizeof(mlxsw_m->base_mac));

	if (err) {

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

+3 −1
Original line number Diff line number Diff line
@@ -1733,12 +1733,14 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;

	bool split = !!split_base_local_port;

	struct mlxsw_sp_port *mlxsw_sp_port;

	u32 lanes = port_mapping->width;

	struct net_device *dev;

	int err;



	err = mlxsw_core_port_init(mlxsw_sp->core, local_port,

				   port_mapping->module + 1, split,

				   port_mapping->lane / port_mapping->width,

				   port_mapping->lane / lanes,

				   lanes,

				   mlxsw_sp->base_mac,

				   sizeof(mlxsw_sp->base_mac));

	if (err) {

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

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int mlxsw_sib_port_create(struct mlxsw_sib *mlxsw_sib, u8 local_port, 
	int err;



	err = mlxsw_core_port_init(mlxsw_sib->core, local_port,

				   module + 1, false, 0,

				   module + 1, false, 0, 0,

				   mlxsw_sib->hw_id, sizeof(mlxsw_sib->hw_id));

	if (err) {

		dev_err(mlxsw_sib->bus_info->dev, "Port %d: Failed to init core port\n",