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

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

Merge branch 'mlxsw-Spectrum2-acl-prep' 



Ido Schimmel says:

====================
mlxsw: Spectrum-2 small ACL preparations

This is the first set of changes towards Spectrum-2 support in the mlxsw
driver. It contains small changes that prepare the code for the later
introduction of Spectrum-2 support.

The Spectrum-2 ASIC uses an algorithmic TCAM (A-TCAM) instead of a
circuit TCAM (C-TCAM) as Spectrum, and thus most of the changes are
around the ACL code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0dbc81ea 0317a6f4

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

+24 −4
Original line number Diff line number Diff line
@@ -351,9 +351,24 @@ struct mlxsw_afa_block *mlxsw_afa_block_create(struct mlxsw_afa *mlxsw_afa) 
	block->first_set = mlxsw_afa_set_create(true);

	if (!block->first_set)

		goto err_first_set_create;



	/* In case user instructs to have dummy first set, we leave it

	 * empty here and create another, real, set right away.

	 */

	if (mlxsw_afa->ops->dummy_first_set) {

		block->cur_set = mlxsw_afa_set_create(false);

		if (!block->cur_set)

			goto err_second_set_create;

		block->cur_set->prev = block->first_set;

		block->first_set->next = block->cur_set;

	} else {

		block->cur_set = block->first_set;

	}



	return block;



err_second_set_create:

	mlxsw_afa_set_destroy(block->first_set);

err_first_set_create:

	kfree(block);

	return NULL;
@@ -415,11 +430,16 @@ char *mlxsw_afa_block_first_set(struct mlxsw_afa_block *block) 
}

EXPORT_SYMBOL(mlxsw_afa_block_first_set);



u32 mlxsw_afa_block_first_set_kvdl_index(struct mlxsw_afa_block *block)

u32 mlxsw_afa_block_first_kvdl_index(struct mlxsw_afa_block *block)

{

	return block->first_set->kvdl_index;

	/* First set is never in KVD linear. So the first set

	 * with valid KVD linear index is always the second one.

	 */

	if (WARN_ON(!block->first_set->next))

		return 0;

	return block->first_set->next->kvdl_index;

}

EXPORT_SYMBOL(mlxsw_afa_block_first_set_kvdl_index);

EXPORT_SYMBOL(mlxsw_afa_block_first_kvdl_index);



int mlxsw_afa_block_continue(struct mlxsw_afa_block *block)

{

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

+2 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct mlxsw_afa_ops { 
			  bool ingress, int *p_span_id);

	void (*mirror_del)(void *priv, u8 local_in_port, int span_id,

			   bool ingress);

	bool dummy_first_set;

};



struct mlxsw_afa *mlxsw_afa_create(unsigned int max_acts_per_set,
@@ -64,7 +65,7 @@ struct mlxsw_afa_block *mlxsw_afa_block_create(struct mlxsw_afa *mlxsw_afa); 
void mlxsw_afa_block_destroy(struct mlxsw_afa_block *block);

int mlxsw_afa_block_commit(struct mlxsw_afa_block *block);

char *mlxsw_afa_block_first_set(struct mlxsw_afa_block *block);

u32 mlxsw_afa_block_first_set_kvdl_index(struct mlxsw_afa_block *block);

u32 mlxsw_afa_block_first_kvdl_index(struct mlxsw_afa_block *block);

int mlxsw_afa_block_continue(struct mlxsw_afa_block *block);

int mlxsw_afa_block_jump(struct mlxsw_afa_block *block, u16 group_id);

int mlxsw_afa_block_terminate(struct mlxsw_afa_block *block);

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

+25 −17
Original line number Diff line number Diff line
@@ -42,16 +42,20 @@ 


enum mlxsw_afk_element {

	MLXSW_AFK_ELEMENT_SRC_SYS_PORT,

	MLXSW_AFK_ELEMENT_DMAC,

	MLXSW_AFK_ELEMENT_SMAC,

	MLXSW_AFK_ELEMENT_DMAC_32_47,

	MLXSW_AFK_ELEMENT_DMAC_0_31,

	MLXSW_AFK_ELEMENT_SMAC_32_47,

	MLXSW_AFK_ELEMENT_SMAC_0_31,

	MLXSW_AFK_ELEMENT_ETHERTYPE,

	MLXSW_AFK_ELEMENT_IP_PROTO,

	MLXSW_AFK_ELEMENT_SRC_IP4,

	MLXSW_AFK_ELEMENT_DST_IP4,

	MLXSW_AFK_ELEMENT_SRC_IP6_HI,

	MLXSW_AFK_ELEMENT_SRC_IP6_LO,

	MLXSW_AFK_ELEMENT_DST_IP6_HI,

	MLXSW_AFK_ELEMENT_DST_IP6_LO,

	MLXSW_AFK_ELEMENT_SRC_IP_96_127,

	MLXSW_AFK_ELEMENT_SRC_IP_64_95,

	MLXSW_AFK_ELEMENT_SRC_IP_32_63,

	MLXSW_AFK_ELEMENT_SRC_IP_0_31,

	MLXSW_AFK_ELEMENT_DST_IP_96_127,

	MLXSW_AFK_ELEMENT_DST_IP_64_95,

	MLXSW_AFK_ELEMENT_DST_IP_32_63,

	MLXSW_AFK_ELEMENT_DST_IP_0_31,

	MLXSW_AFK_ELEMENT_DST_L4_PORT,

	MLXSW_AFK_ELEMENT_SRC_L4_PORT,

	MLXSW_AFK_ELEMENT_VID,
@@ -99,9 +103,11 @@ struct mlxsw_afk_element_info { 
 * define an internal storage geometry.

 */

static const struct mlxsw_afk_element_info mlxsw_afk_element_infos[] = {

	MLXSW_AFK_ELEMENT_INFO_U32(SRC_SYS_PORT, 0x00, 16, 16),

	MLXSW_AFK_ELEMENT_INFO_BUF(DMAC, 0x04, 6),

	MLXSW_AFK_ELEMENT_INFO_BUF(SMAC, 0x0A, 6),

	MLXSW_AFK_ELEMENT_INFO_U32(SRC_SYS_PORT, 0x00, 16, 8),

	MLXSW_AFK_ELEMENT_INFO_BUF(DMAC_32_47, 0x04, 2),

	MLXSW_AFK_ELEMENT_INFO_BUF(DMAC_0_31, 0x06, 4),

	MLXSW_AFK_ELEMENT_INFO_BUF(SMAC_32_47, 0x0A, 2),

	MLXSW_AFK_ELEMENT_INFO_BUF(SMAC_0_31, 0x0C, 4),

	MLXSW_AFK_ELEMENT_INFO_U32(ETHERTYPE, 0x00, 0, 16),

	MLXSW_AFK_ELEMENT_INFO_U32(IP_PROTO, 0x10, 0, 8),

	MLXSW_AFK_ELEMENT_INFO_U32(VID, 0x10, 8, 12),
@@ -112,12 +118,14 @@ static const struct mlxsw_afk_element_info mlxsw_afk_element_infos[] = { 
	MLXSW_AFK_ELEMENT_INFO_U32(IP_TTL_, 0x18, 0, 8),

	MLXSW_AFK_ELEMENT_INFO_U32(IP_ECN, 0x18, 9, 2),

	MLXSW_AFK_ELEMENT_INFO_U32(IP_DSCP, 0x18, 11, 6),

	MLXSW_AFK_ELEMENT_INFO_U32(SRC_IP4, 0x20, 0, 32),

	MLXSW_AFK_ELEMENT_INFO_U32(DST_IP4, 0x24, 0, 32),

	MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP6_HI, 0x20, 8),

	MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP6_LO, 0x28, 8),

	MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP6_HI, 0x30, 8),

	MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP6_LO, 0x38, 8),

	MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_96_127, 0x20, 4),

	MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_64_95, 0x24, 4),

	MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_32_63, 0x28, 4),

	MLXSW_AFK_ELEMENT_INFO_BUF(SRC_IP_0_31, 0x2C, 4),

	MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_96_127, 0x30, 4),

	MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_64_95, 0x34, 4),

	MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_32_63, 0x38, 4),

	MLXSW_AFK_ELEMENT_INFO_BUF(DST_IP_0_31, 0x3C, 4),

};



#define MLXSW_AFK_ELEMENT_STORAGE_SIZE 0x40

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

+8 −3
Original line number Diff line number Diff line
@@ -2132,14 +2132,18 @@ MLXSW_ITEM32(reg, ptar, op, 0x00, 28, 4); 


/* reg_ptar_action_set_type

 * Type of action set to be used on this region.

 * For Spectrum, this is always type 2 - "flexible"

 * For Spectrum and Spectrum-2, this is always type 2 - "flexible"

 * Access: WO

 */

MLXSW_ITEM32(reg, ptar, action_set_type, 0x00, 16, 8);



enum mlxsw_reg_ptar_key_type {

	MLXSW_REG_PTAR_KEY_TYPE_FLEX = 0x50, /* Spetrum */

	MLXSW_REG_PTAR_KEY_TYPE_FLEX2 = 0x51, /* Spectrum-2 */

};



/* reg_ptar_key_type

 * TCAM key type for the region.

 * For Spectrum, this is always type 0x50 - "FLEX_KEY"

 * Access: WO

 */

MLXSW_ITEM32(reg, ptar, key_type, 0x00, 0, 8);
@@ -2182,13 +2186,14 @@ MLXSW_ITEM8_INDEXED(reg, ptar, flexible_key_id, 0x20, 0, 8, 
		    MLXSW_REG_PTAR_KEY_ID_LEN, 0x00, false);



static inline void mlxsw_reg_ptar_pack(char *payload, enum mlxsw_reg_ptar_op op,

				       enum mlxsw_reg_ptar_key_type key_type,

				       u16 region_size, u16 region_id,

				       const char *tcam_region_info)

{

	MLXSW_REG_ZERO(ptar, payload);

	mlxsw_reg_ptar_op_set(payload, op);

	mlxsw_reg_ptar_action_set_type_set(payload, 2); /* "flexible" */

	mlxsw_reg_ptar_key_type_set(payload, 0x50); /* "FLEX_KEY" */

	mlxsw_reg_ptar_key_type_set(payload, key_type);

	mlxsw_reg_ptar_region_size_set(payload, region_size);

	mlxsw_reg_ptar_region_id_set(payload, region_id);

	mlxsw_reg_ptar_tcam_region_info_memcpy_to(payload, tcam_region_info);

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

+2 −0
Original line number Diff line number Diff line
@@ -3621,6 +3621,8 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	int err;



	mlxsw_sp->afa_ops = &mlxsw_sp1_act_afa_ops;



	mlxsw_sp->core = mlxsw_core;

	mlxsw_sp->bus_info = mlxsw_bus_info;