Commit bc82521e authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_trap: Do not initialize dedicated discard policer 



The policer is now initialized as part of the registration with devlink,
so there is no need to initialize it before the registration.

Remove the initialization.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13f2e64b

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

+1 −9
Original line number Diff line number Diff line
@@ -307,8 +307,7 @@ static const u16 mlxsw_sp_listener_devlink_map[] = { 
	DEVLINK_TRAP_GENERIC_ID_EGRESS_FLOW_ACTION_DROP,

};



#define MLXSW_SP_DISCARD_POLICER_ID	(MLXSW_REG_HTGT_TRAP_GROUP_MAX + 1)

#define MLXSW_SP_THIN_POLICER_ID	(MLXSW_SP_DISCARD_POLICER_ID + 1)

#define MLXSW_SP_THIN_POLICER_ID	(MLXSW_REG_HTGT_TRAP_GROUP_MAX + 1)



static struct mlxsw_sp_trap_policer_item *

mlxsw_sp_trap_policer_item_lookup(struct mlxsw_sp *mlxsw_sp, u32 id)
@@ -327,13 +326,6 @@ mlxsw_sp_trap_policer_item_lookup(struct mlxsw_sp *mlxsw_sp, u32 id) 
static int mlxsw_sp_trap_cpu_policers_set(struct mlxsw_sp *mlxsw_sp)

{

	char qpcr_pl[MLXSW_REG_QPCR_LEN];

	int err;



	mlxsw_reg_qpcr_pack(qpcr_pl, MLXSW_SP_DISCARD_POLICER_ID,

			    MLXSW_REG_QPCR_IR_UNITS_M, false, 10 * 1024, 7);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(qpcr), qpcr_pl);

	if (err)

		return err;



	/* The purpose of "thin" policer is to drop as many packets

	 * as possible. The dummy group is using it.