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

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

Merge branch 'mlxsw-Remove-compatibility-with-old-firmware' 



Jiri Pirko says:

====================
mlxsw: Remove compatibility with old firmware

Up until recently we couldn't enforce a minimal firmware version, which
forced us to be compatible with old firmware versions. This patchset
removes this code and simplifies the driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4cd31af7 2e915e0b

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

+34 −80
Original line number Diff line number Diff line
@@ -860,21 +860,13 @@ static int mlxsw_sp_port_mtu_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 mtu) 
	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pmtu), pmtu_pl);

}



static int __mlxsw_sp_port_swid_set(struct mlxsw_sp *mlxsw_sp, u8 local_port,

				    u8 swid)

{

	char pspa_pl[MLXSW_REG_PSPA_LEN];



	mlxsw_reg_pspa_pack(pspa_pl, swid, local_port);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pspa), pspa_pl);

}



static int mlxsw_sp_port_swid_set(struct mlxsw_sp_port *mlxsw_sp_port, u8 swid)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char pspa_pl[MLXSW_REG_PSPA_LEN];



	return __mlxsw_sp_port_swid_set(mlxsw_sp, mlxsw_sp_port->local_port,

					swid);

	mlxsw_reg_pspa_pack(pspa_pl, swid, mlxsw_sp_port->local_port);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pspa), pspa_pl);

}



int mlxsw_sp_port_vp_mode_set(struct mlxsw_sp_port *mlxsw_sp_port, bool enable)
@@ -975,13 +967,14 @@ static int mlxsw_sp_port_module_info_get(struct mlxsw_sp *mlxsw_sp, 
	return 0;

}



static int mlxsw_sp_port_module_map(struct mlxsw_sp *mlxsw_sp, u8 local_port,

static int mlxsw_sp_port_module_map(struct mlxsw_sp_port *mlxsw_sp_port,

				    u8 module, u8 width, u8 lane)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char pmlp_pl[MLXSW_REG_PMLP_LEN];

	int i;



	mlxsw_reg_pmlp_pack(pmlp_pl, local_port);

	mlxsw_reg_pmlp_pack(pmlp_pl, mlxsw_sp_port->local_port);

	mlxsw_reg_pmlp_width_set(pmlp_pl, width);

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

		mlxsw_reg_pmlp_module_set(pmlp_pl, i, module);
@@ -991,11 +984,12 @@ static int mlxsw_sp_port_module_map(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pmlp), pmlp_pl);

}



static int mlxsw_sp_port_module_unmap(struct mlxsw_sp *mlxsw_sp, u8 local_port)

static int mlxsw_sp_port_module_unmap(struct mlxsw_sp_port *mlxsw_sp_port)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char pmlp_pl[MLXSW_REG_PMLP_LEN];



	mlxsw_reg_pmlp_pack(pmlp_pl, local_port);

	mlxsw_reg_pmlp_pack(pmlp_pl, mlxsw_sp_port->local_port);

	mlxsw_reg_pmlp_width_set(pmlp_pl, 0);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pmlp), pmlp_pl);

}
@@ -2655,7 +2649,7 @@ static int mlxsw_sp_port_ets_init(struct mlxsw_sp_port *mlxsw_sp_port) 
	return 0;

}



static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,

static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,

				bool split, u8 module, u8 width, u8 lane)

{

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;
@@ -2663,9 +2657,18 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	struct net_device *dev;

	int err;



	err = mlxsw_core_port_init(mlxsw_sp->core, local_port);

	if (err) {

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

			local_port);

		return err;

	}



	dev = alloc_etherdev(sizeof(struct mlxsw_sp_port));

	if (!dev)

		return -ENOMEM;

	if (!dev) {

		err = -ENOMEM;

		goto err_alloc_etherdev;

	}

	SET_NETDEV_DEV(dev, mlxsw_sp->bus_info->dev);

	mlxsw_sp_port = netdev_priv(dev);

	mlxsw_sp_port->dev = dev;
@@ -2707,6 +2710,13 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	dev->netdev_ops = &mlxsw_sp_port_netdev_ops;

	dev->ethtool_ops = &mlxsw_sp_port_ethtool_ops;



	err = mlxsw_sp_port_module_map(mlxsw_sp_port, module, width, lane);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to map module\n",

			mlxsw_sp_port->local_port);

		goto err_port_module_map;

	}



	err = mlxsw_sp_port_swid_set(mlxsw_sp_port, 0);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Port %d: Failed to set SWID\n",
@@ -2829,6 +2839,8 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
err_dev_addr_init:

	mlxsw_sp_port_swid_set(mlxsw_sp_port, MLXSW_PORT_SWID_DISABLED_PORT);

err_port_swid_set:

	mlxsw_sp_port_module_unmap(mlxsw_sp_port);

err_port_module_map:

	kfree(mlxsw_sp_port->hw_stats.cache);

err_alloc_hw_stats:

	kfree(mlxsw_sp_port->sample);
@@ -2836,32 +2848,12 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	free_percpu(mlxsw_sp_port->pcpu_stats);

err_alloc_stats:

	free_netdev(dev);

	return err;

}



static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,

				bool split, u8 module, u8 width, u8 lane)

{

	int err;



	err = mlxsw_core_port_init(mlxsw_sp->core, local_port);

	if (err) {

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

			local_port);

		return err;

	}

	err = __mlxsw_sp_port_create(mlxsw_sp, local_port, split,

				     module, width, lane);

	if (err)

		goto err_port_create;

	return 0;



err_port_create:

err_alloc_etherdev:

	mlxsw_core_port_fini(mlxsw_sp->core, local_port);

	return err;

}



static void __mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port)

static void mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port)

{

	struct mlxsw_sp_port *mlxsw_sp_port = mlxsw_sp->ports[local_port];
@@ -2874,17 +2866,12 @@ static void __mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port) 
	mlxsw_sp_port_fids_fini(mlxsw_sp_port);

	mlxsw_sp_port_dcb_fini(mlxsw_sp_port);

	mlxsw_sp_port_swid_set(mlxsw_sp_port, MLXSW_PORT_SWID_DISABLED_PORT);

	mlxsw_sp_port_module_unmap(mlxsw_sp, mlxsw_sp_port->local_port);

	mlxsw_sp_port_module_unmap(mlxsw_sp_port);

	kfree(mlxsw_sp_port->hw_stats.cache);

	kfree(mlxsw_sp_port->sample);

	free_percpu(mlxsw_sp_port->pcpu_stats);

	WARN_ON_ONCE(!list_empty(&mlxsw_sp_port->vlans_list));

	free_netdev(mlxsw_sp_port->dev);

}



static void mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port)

{

	__mlxsw_sp_port_remove(mlxsw_sp, local_port);

	mlxsw_core_port_fini(mlxsw_sp->core, local_port);

}
@@ -2962,19 +2949,6 @@ static int mlxsw_sp_port_split_create(struct mlxsw_sp *mlxsw_sp, u8 base_port, 
	u8 width = MLXSW_PORT_MODULE_MAX_WIDTH / count;

	int err, i;



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

		err = mlxsw_sp_port_module_map(mlxsw_sp, base_port + i, module,

					       width, i * width);

		if (err)

			goto err_port_module_map;

	}



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

		err = __mlxsw_sp_port_swid_set(mlxsw_sp, base_port + i, 0);

		if (err)

			goto err_port_swid_set;

	}



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

		err = mlxsw_sp_port_create(mlxsw_sp, base_port + i, true,

					   module, width, i * width);
@@ -2988,15 +2962,6 @@ static int mlxsw_sp_port_split_create(struct mlxsw_sp *mlxsw_sp, u8 base_port, 
	for (i--; i >= 0; i--)

		if (mlxsw_sp_port_created(mlxsw_sp, base_port + i))

			mlxsw_sp_port_remove(mlxsw_sp, base_port + i);

	i = count;

err_port_swid_set:

	for (i--; i >= 0; i--)

		__mlxsw_sp_port_swid_set(mlxsw_sp, base_port + i,

					 MLXSW_PORT_SWID_DISABLED_PORT);

	i = count;

err_port_module_map:

	for (i--; i >= 0; i--)

		mlxsw_sp_port_module_unmap(mlxsw_sp, base_port + i);

	return err;

}
@@ -3011,17 +2976,6 @@ static void mlxsw_sp_port_unsplit_create(struct mlxsw_sp *mlxsw_sp, 
	 */

	count = count / 2;



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

		local_port = base_port + i * 2;

		module = mlxsw_sp->port_to_module[local_port];



		mlxsw_sp_port_module_map(mlxsw_sp, local_port, module, width,

					 0);

	}



	for (i = 0; i < count; i++)

		__mlxsw_sp_port_swid_set(mlxsw_sp, base_port + i * 2, 0);



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

		local_port = base_port + i * 2;

		module = mlxsw_sp->port_to_module[local_port];

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

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ static int mlxsw_sp_lpm_tree_put(struct mlxsw_sp *mlxsw_sp, 
	return 0;

}



#define MLXSW_SP_LPM_TREE_MIN 2 /* trees 0 and 1 are reserved */

#define MLXSW_SP_LPM_TREE_MIN 1 /* tree 0 is reserved */



static int mlxsw_sp_lpm_init(struct mlxsw_sp *mlxsw_sp)

{