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

Commit 4b6b1869 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum_kvdl: Pass entry type to alloc/free 



Future Spectrum-2 KVD linear manager implementation needs to know type
of the entry to alloc and free. So define the types in an enum and
pass it down to alloc and free functions. Once the entry type
is passed down, KVDL common part knows sizes of each entry types,
so replace size function arg with entry count.

Signed-off-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 ebcff743

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

+34 −7
Original line number Diff line number Diff line
@@ -438,28 +438,55 @@ mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan); 
void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif);



/* spectrum_kvdl.c */

enum mlxsw_sp_kvdl_entry_type {

	MLXSW_SP_KVDL_ENTRY_TYPE_ADJ,

	MLXSW_SP_KVDL_ENTRY_TYPE_ACTSET,

	MLXSW_SP_KVDL_ENTRY_TYPE_PBS,

	MLXSW_SP_KVDL_ENTRY_TYPE_MCRIGR,

};



static inline unsigned int

mlxsw_sp_kvdl_entry_size(enum mlxsw_sp_kvdl_entry_type type)

{

	switch (type) {

	case MLXSW_SP_KVDL_ENTRY_TYPE_ADJ: /* fall through */

	case MLXSW_SP_KVDL_ENTRY_TYPE_ACTSET: /* fall through */

	case MLXSW_SP_KVDL_ENTRY_TYPE_PBS: /* fall through */

	case MLXSW_SP_KVDL_ENTRY_TYPE_MCRIGR: /* fall through */

	default:

		return 1;

	}

}



struct mlxsw_sp_kvdl_ops {

	size_t priv_size;

	int (*init)(struct mlxsw_sp *mlxsw_sp, void *priv);

	void (*fini)(struct mlxsw_sp *mlxsw_sp, void *priv);

	int (*alloc)(struct mlxsw_sp *mlxsw_sp, void *priv,

		     enum mlxsw_sp_kvdl_entry_type type,

		     unsigned int entry_count, u32 *p_entry_index);

	void (*free)(struct mlxsw_sp *mlxsw_sp, void *priv,

		     enum mlxsw_sp_kvdl_entry_type type,

		     int entry_index);

	int (*alloc_size_query)(struct mlxsw_sp *mlxsw_sp, void *priv,

				enum mlxsw_sp_kvdl_entry_type type,

				unsigned int entry_count,

				unsigned int *p_alloc_size);

				unsigned int *p_alloc_count);

	int (*resources_register)(struct mlxsw_sp *mlxsw_sp, void *priv);

};



int mlxsw_sp_kvdl_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_kvdl_fini(struct mlxsw_sp *mlxsw_sp);

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);

int mlxsw_sp_kvdl_alloc_size_query(struct mlxsw_sp *mlxsw_sp,

int mlxsw_sp_kvdl_alloc(struct mlxsw_sp *mlxsw_sp,

			enum mlxsw_sp_kvdl_entry_type type,

			unsigned int entry_count, u32 *p_entry_index);

void mlxsw_sp_kvdl_free(struct mlxsw_sp *mlxsw_sp,

			enum mlxsw_sp_kvdl_entry_type type,

			int entry_index);

int mlxsw_sp_kvdl_alloc_count_query(struct mlxsw_sp *mlxsw_sp,

				    enum mlxsw_sp_kvdl_entry_type type,

				    unsigned int entry_count,

				   unsigned int *p_alloc_size);

				    unsigned int *p_alloc_count);



/* spectrum1_kvdl.c */

extern const struct mlxsw_sp_kvdl_ops mlxsw_sp1_kvdl_ops;

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

+5 −1
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ static void mlxsw_sp1_kvdl_part_free(struct mlxsw_sp1_kvdl_part *part, 
}



static int mlxsw_sp1_kvdl_alloc(struct mlxsw_sp *mlxsw_sp, void *priv,

				enum mlxsw_sp_kvdl_entry_type type,

				unsigned int entry_count,

				u32 *p_entry_index)

{
@@ -192,6 +193,7 @@ static int mlxsw_sp1_kvdl_alloc(struct mlxsw_sp *mlxsw_sp, void *priv, 
}



static void mlxsw_sp1_kvdl_free(struct mlxsw_sp *mlxsw_sp, void *priv,

				enum mlxsw_sp_kvdl_entry_type type,

				int entry_index)

{

	struct mlxsw_sp1_kvdl *kvdl = priv;
@@ -204,7 +206,9 @@ static void mlxsw_sp1_kvdl_free(struct mlxsw_sp *mlxsw_sp, void *priv, 
}



static int mlxsw_sp1_kvdl_alloc_size_query(struct mlxsw_sp *mlxsw_sp,

					   void *priv, unsigned int entry_count,

					   void *priv,

					   enum mlxsw_sp_kvdl_entry_type type,

					   unsigned int entry_count,

					   unsigned int *p_alloc_size)

{

	struct mlxsw_sp1_kvdl *kvdl = priv;

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

+12 −9
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 
#include "core_acl_flex_actions.h"

#include "spectrum_span.h"



#define MLXSW_SP_KVDL_ACT_EXT_SIZE 1



static int mlxsw_sp_act_kvdl_set_add(void *priv, u32 *p_kvdl_index,

				     char *enc_actions, bool is_first)

{
@@ -53,8 +51,8 @@ static int mlxsw_sp_act_kvdl_set_add(void *priv, u32 *p_kvdl_index, 
	if (is_first)

		return 0;



	err = mlxsw_sp_kvdl_alloc(mlxsw_sp, MLXSW_SP_KVDL_ACT_EXT_SIZE,

				  &kvdl_index);

	err = mlxsw_sp_kvdl_alloc(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_ACTSET,

				  1, &kvdl_index);

	if (err)

		return err;

	mlxsw_reg_pefa_pack(pefa_pl, kvdl_index, enc_actions);
@@ -65,7 +63,8 @@ static int mlxsw_sp_act_kvdl_set_add(void *priv, u32 *p_kvdl_index, 
	return 0;



err_pefa_write:

	mlxsw_sp_kvdl_free(mlxsw_sp, kvdl_index);

	mlxsw_sp_kvdl_free(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_ACTSET,

			   kvdl_index);

	return err;

}
@@ -76,7 +75,8 @@ static void mlxsw_sp_act_kvdl_set_del(void *priv, u32 kvdl_index, 


	if (is_first)

		return;

	mlxsw_sp_kvdl_free(mlxsw_sp, kvdl_index);

	mlxsw_sp_kvdl_free(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_ACTSET,

			   kvdl_index);

}



static int mlxsw_sp_act_kvdl_fwd_entry_add(void *priv, u32 *p_kvdl_index,
@@ -87,7 +87,8 @@ static int mlxsw_sp_act_kvdl_fwd_entry_add(void *priv, u32 *p_kvdl_index, 
	u32 kvdl_index;

	int err;



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

	err = mlxsw_sp_kvdl_alloc(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_PBS,

				  1, &kvdl_index);

	if (err)

		return err;

	mlxsw_reg_ppbs_pack(ppbs_pl, kvdl_index, local_port);
@@ -98,7 +99,8 @@ static int mlxsw_sp_act_kvdl_fwd_entry_add(void *priv, u32 *p_kvdl_index, 
	return 0;



err_ppbs_write:

	mlxsw_sp_kvdl_free(mlxsw_sp, kvdl_index);

	mlxsw_sp_kvdl_free(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_PBS,

			   kvdl_index);

	return err;

}
@@ -106,7 +108,8 @@ static void mlxsw_sp_act_kvdl_fwd_entry_del(void *priv, u32 kvdl_index) 
{

	struct mlxsw_sp *mlxsw_sp = priv;



	mlxsw_sp_kvdl_free(mlxsw_sp, kvdl_index);

	mlxsw_sp_kvdl_free(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_PBS,

			   kvdl_index);

}



static int

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

+14 −10
Original line number Diff line number Diff line
@@ -74,28 +74,32 @@ void mlxsw_sp_kvdl_fini(struct mlxsw_sp *mlxsw_sp) 
	kfree(kvdl);

}



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

			u32 *p_entry_index)

int mlxsw_sp_kvdl_alloc(struct mlxsw_sp *mlxsw_sp,

			enum mlxsw_sp_kvdl_entry_type type,

			unsigned int entry_count, u32 *p_entry_index)

{

	struct mlxsw_sp_kvdl *kvdl = mlxsw_sp->kvdl;



	return kvdl->kvdl_ops->alloc(mlxsw_sp, kvdl->priv,

	return kvdl->kvdl_ops->alloc(mlxsw_sp, kvdl->priv, type,

				     entry_count, p_entry_index);

}



void mlxsw_sp_kvdl_free(struct mlxsw_sp *mlxsw_sp, int entry_index)

void mlxsw_sp_kvdl_free(struct mlxsw_sp *mlxsw_sp,

			enum mlxsw_sp_kvdl_entry_type type,

			int entry_index)

{

	struct mlxsw_sp_kvdl *kvdl = mlxsw_sp->kvdl;



	kvdl->kvdl_ops->free(mlxsw_sp, kvdl->priv, entry_index);

	kvdl->kvdl_ops->free(mlxsw_sp, kvdl->priv, type, entry_index);

}



int mlxsw_sp_kvdl_alloc_size_query(struct mlxsw_sp *mlxsw_sp,

int mlxsw_sp_kvdl_alloc_count_query(struct mlxsw_sp *mlxsw_sp,

				    enum mlxsw_sp_kvdl_entry_type type,

				    unsigned int entry_count,

				   unsigned int *p_alloc_size)

				    unsigned int *p_alloc_count)

{

	struct mlxsw_sp_kvdl *kvdl = mlxsw_sp->kvdl;



	return kvdl->kvdl_ops->alloc_size_query(mlxsw_sp, kvdl->priv,

						entry_count, p_alloc_size);

	return kvdl->kvdl_ops->alloc_size_query(mlxsw_sp, kvdl->priv, type,

						entry_count, p_alloc_count);

}

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

+4 −5
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ mlxsw_sp_mr_erif_list_init(struct mlxsw_sp_mr_tcam_erif_list *erif_list) 
	INIT_LIST_HEAD(&erif_list->erif_sublists);

}



#define MLXSW_SP_KVDL_RIGR2_SIZE 1



static struct mlxsw_sp_mr_erif_sublist *

mlxsw_sp_mr_erif_sublist_create(struct mlxsw_sp *mlxsw_sp,

				struct mlxsw_sp_mr_tcam_erif_list *erif_list)
@@ -96,8 +94,8 @@ mlxsw_sp_mr_erif_sublist_create(struct mlxsw_sp *mlxsw_sp, 
	erif_sublist = kzalloc(sizeof(*erif_sublist), GFP_KERNEL);

	if (!erif_sublist)

		return ERR_PTR(-ENOMEM);

	err = mlxsw_sp_kvdl_alloc(mlxsw_sp, MLXSW_SP_KVDL_RIGR2_SIZE,

				  &erif_sublist->rigr2_kvdl_index);

	err = mlxsw_sp_kvdl_alloc(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_MCRIGR,

				  1, &erif_sublist->rigr2_kvdl_index);

	if (err) {

		kfree(erif_sublist);

		return ERR_PTR(err);
@@ -112,7 +110,8 @@ mlxsw_sp_mr_erif_sublist_destroy(struct mlxsw_sp *mlxsw_sp, 
				 struct mlxsw_sp_mr_erif_sublist *erif_sublist)

{

	list_del(&erif_sublist->list);

	mlxsw_sp_kvdl_free(mlxsw_sp, erif_sublist->rigr2_kvdl_index);

	mlxsw_sp_kvdl_free(mlxsw_sp, MLXSW_SP_KVDL_ENTRY_TYPE_MCRIGR,

			   erif_sublist->rigr2_kvdl_index);

	kfree(erif_sublist);

}