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

Commit 42df8358 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: reg: Add priority field for PTCEV2 register 



This is going to be needed for Spectrum-2 C-TCAM implementation.

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 a5995cc8

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

+11 −1
Original line number Diff line number Diff line
@@ -2402,6 +2402,15 @@ MLXSW_ITEM32(reg, ptce2, op, 0x00, 20, 3); 
 */

MLXSW_ITEM32(reg, ptce2, offset, 0x00, 0, 16);



/* reg_ptce2_priority

 * Priority of the rule, higher values win. The range is 1..cap_kvd_size-1.

 * Note: priority does not have to be unique per rule.

 * Within a region, higher priority should have lower offset (no limitation

 * between regions in a multi-region).

 * Access: RW

 */

MLXSW_ITEM32(reg, ptce2, priority, 0x04, 0, 24);



/* reg_ptce2_tcam_region_info

 * Opaque object that represents the TCAM region.

 * Access: Index
@@ -2437,12 +2446,13 @@ MLXSW_ITEM_BUF(reg, ptce2, flex_action_set, 0xE0, 
static inline void mlxsw_reg_ptce2_pack(char *payload, bool valid,

					enum mlxsw_reg_ptce2_op op,

					const char *tcam_region_info,

					u16 offset)

					u16 offset, u32 priority)

{

	MLXSW_REG_ZERO(ptce2, payload);

	mlxsw_reg_ptce2_v_set(payload, valid);

	mlxsw_reg_ptce2_op_set(payload, op);

	mlxsw_reg_ptce2_offset_set(payload, offset);

	mlxsw_reg_ptce2_priority_set(payload, priority);

	mlxsw_reg_ptce2_tcam_region_info_memcpy_to(payload, tcam_region_info);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ mlxsw_sp1_acl_tcam_region_entry_activity_get(struct mlxsw_sp *mlxsw_sp, 
	int err;



	mlxsw_reg_ptce2_pack(ptce2_pl, true, MLXSW_REG_PTCE2_OP_QUERY_CLEAR_ON_READ,

			     _region->tcam_region_info, offset);

			     _region->tcam_region_info, offset, 0);

	err = mlxsw_reg_query(mlxsw_sp->core, MLXSW_REG(ptce2), ptce2_pl);

	if (err)

		return err;

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

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ mlxsw_sp_acl_ctcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp, 
	char *key;



	mlxsw_reg_ptce2_pack(ptce2_pl, true, MLXSW_REG_PTCE2_OP_WRITE_WRITE,

			     region->tcam_region_info, offset);

			     region->tcam_region_info, offset, 0);

	key = mlxsw_reg_ptce2_flex_key_blocks_data(ptce2_pl);

	mask = mlxsw_reg_ptce2_mask_data(ptce2_pl);

	mlxsw_afk_encode(afk, region->key_info, &rulei->values, key, mask);
@@ -100,7 +100,7 @@ mlxsw_sp_acl_ctcam_region_entry_remove(struct mlxsw_sp *mlxsw_sp, 
	char ptce2_pl[MLXSW_REG_PTCE2_LEN];



	mlxsw_reg_ptce2_pack(ptce2_pl, false, MLXSW_REG_PTCE2_OP_WRITE_WRITE,

			     region->tcam_region_info, offset);

			     region->tcam_region_info, offset, 0);

	mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptce2), ptce2_pl);

}