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

Commit 13124443 authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

mlxsw: spectrum_kvdl: Cosmetic kvdl allocator API change 



Currently the return allocated index and err value are multiplexed.
This patch changes the API to decouple the ret value from the allocated
index.

Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2239cc63

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

+2 −1
Original line number Diff line number Diff line
@@ -583,7 +583,8 @@ int mlxsw_sp_bridge_vrf_join(struct mlxsw_sp *mlxsw_sp, 
void mlxsw_sp_bridge_vrf_leave(struct mlxsw_sp *mlxsw_sp,

			       struct net_device *l3_dev);



int mlxsw_sp_kvdl_alloc(struct mlxsw_sp *mlxsw_sp, unsigned int entry_count);

int mlxsw_sp_kvdl_alloc(struct mlxsw_sp *mlxsw_sp, unsigned int entry_count,

			u32 *p_entry_index);

void mlxsw_sp_kvdl_free(struct mlxsw_sp *mlxsw_sp, int entry_index);



struct mlxsw_afk *mlxsw_sp_acl_afk(struct mlxsw_sp_acl *acl);

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

+7 −10
Original line number Diff line number Diff line
@@ -595,7 +595,6 @@ static int mlxsw_sp_act_kvdl_set_add(void *priv, u32 *p_kvdl_index, 
	struct mlxsw_sp *mlxsw_sp = priv;

	char pefa_pl[MLXSW_REG_PEFA_LEN];

	u32 kvdl_index;

	int ret;

	int err;



	/* The first action set of a TCAM entry is stored directly in TCAM,
@@ -604,10 +603,10 @@ static int mlxsw_sp_act_kvdl_set_add(void *priv, u32 *p_kvdl_index, 
	if (is_first)

		return 0;



	ret = mlxsw_sp_kvdl_alloc(mlxsw_sp, MLXSW_SP_KDVL_ACT_EXT_SIZE);

	if (ret < 0)

		return ret;

	kvdl_index = ret;

	err = mlxsw_sp_kvdl_alloc(mlxsw_sp, MLXSW_SP_KDVL_ACT_EXT_SIZE,

				  &kvdl_index);

	if (err)

		return err;

	mlxsw_reg_pefa_pack(pefa_pl, kvdl_index, enc_actions);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pefa), pefa_pl);

	if (err)
@@ -636,13 +635,11 @@ static int mlxsw_sp_act_kvdl_fwd_entry_add(void *priv, u32 *p_kvdl_index, 
	struct mlxsw_sp *mlxsw_sp = priv;

	char ppbs_pl[MLXSW_REG_PPBS_LEN];

	u32 kvdl_index;

	int ret;

	int err;



	ret = mlxsw_sp_kvdl_alloc(mlxsw_sp, 1);

	if (ret < 0)

		return ret;

	kvdl_index = ret;

	err = mlxsw_sp_kvdl_alloc(mlxsw_sp, 1, &kvdl_index);

	if (err)

		return err;

	mlxsw_reg_ppbs_pack(ppbs_pl, kvdl_index, local_port);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ppbs), ppbs_pl);

	if (err)

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

+4 −2
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ 
	(MLXSW_SP_KVD_LINEAR_SIZE - MLXSW_SP_KVDL_CHUNKS_BASE)

#define MLXSW_SP_CHUNK_MAX 32



int mlxsw_sp_kvdl_alloc(struct mlxsw_sp *mlxsw_sp, unsigned int entry_count)

int mlxsw_sp_kvdl_alloc(struct mlxsw_sp *mlxsw_sp, unsigned int entry_count,

			u32 *p_entry_index)

{

	int entry_index;

	int size;
@@ -72,7 +73,8 @@ int mlxsw_sp_kvdl_alloc(struct mlxsw_sp *mlxsw_sp, unsigned int entry_count) 


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

			set_bit(entry_index + i, mlxsw_sp->kvdl.usage);

		return entry_index;

		*p_entry_index = entry_index;

		return 0;

	}

	return -ENOBUFS;

}

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

+2 −4
Original line number Diff line number Diff line
@@ -1274,7 +1274,6 @@ mlxsw_sp_nexthop_group_refresh(struct mlxsw_sp *mlxsw_sp, 
	bool old_adj_index_valid;

	u32 old_adj_index;

	u16 old_ecmp_size;

	int ret;

	int i;

	int err;
@@ -1312,15 +1311,14 @@ mlxsw_sp_nexthop_group_refresh(struct mlxsw_sp *mlxsw_sp, 
		 */

		goto set_trap;



	ret = mlxsw_sp_kvdl_alloc(mlxsw_sp, ecmp_size);

	if (ret < 0) {

	err = mlxsw_sp_kvdl_alloc(mlxsw_sp, ecmp_size, &adj_index);

	if (err) {

		/* We ran out of KVD linear space, just set the

		 * trap and let everything flow through kernel.

		 */

		dev_warn(mlxsw_sp->bus_info->dev, "Failed to allocate KVD linear area for nexthop group.\n");

		goto set_trap;

	}

	adj_index = ret;

	old_adj_index_valid = nh_grp->adj_index_valid;

	old_adj_index = nh_grp->adj_index;

	old_ecmp_size = nh_grp->ecmp_size;