Commit 7aad5244 authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

mlxsw: spectrum: Set basic trap groups from an array 



Instead of calling the same code four times, do it in a loop over array
which contains trap grups to be set.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3268ee8f

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

+18 −29
Original line number Diff line number Diff line
@@ -2528,40 +2528,29 @@ static void mlxsw_sp_lag_fini(struct mlxsw_sp *mlxsw_sp) 
	kfree(mlxsw_sp->lags);

}



static const u8 mlxsw_sp_basic_trap_groups[] = {

	MLXSW_REG_HTGT_TRAP_GROUP_EMAD,

	MLXSW_REG_HTGT_TRAP_GROUP_MFDE,

	MLXSW_REG_HTGT_TRAP_GROUP_MTWE,

	MLXSW_REG_HTGT_TRAP_GROUP_PMPE,

};



static int mlxsw_sp_basic_trap_groups_set(struct mlxsw_core *mlxsw_core)

{

	char htgt_pl[MLXSW_REG_HTGT_LEN];

	int err;

	int i;



	mlxsw_reg_htgt_pack(htgt_pl, MLXSW_REG_HTGT_TRAP_GROUP_EMAD,

			    MLXSW_REG_HTGT_INVALID_POLICER,

			    MLXSW_REG_HTGT_DEFAULT_PRIORITY,

			    MLXSW_REG_HTGT_DEFAULT_TC);

	err =  mlxsw_reg_write(mlxsw_core, MLXSW_REG(htgt), htgt_pl);

	if (err)

		return err;



	mlxsw_reg_htgt_pack(htgt_pl, MLXSW_REG_HTGT_TRAP_GROUP_MFDE,

			    MLXSW_REG_HTGT_INVALID_POLICER,

			    MLXSW_REG_HTGT_DEFAULT_PRIORITY,

			    MLXSW_REG_HTGT_DEFAULT_TC);

	err = mlxsw_reg_write(mlxsw_core, MLXSW_REG(htgt), htgt_pl);

	if (err)

		return err;



	mlxsw_reg_htgt_pack(htgt_pl, MLXSW_REG_HTGT_TRAP_GROUP_MTWE,

	for (i = 0; i < ARRAY_SIZE(mlxsw_sp_basic_trap_groups); i++) {

		mlxsw_reg_htgt_pack(htgt_pl, mlxsw_sp_basic_trap_groups[i],

				    MLXSW_REG_HTGT_INVALID_POLICER,

				    MLXSW_REG_HTGT_DEFAULT_PRIORITY,

				    MLXSW_REG_HTGT_DEFAULT_TC);

		err = mlxsw_reg_write(mlxsw_core, MLXSW_REG(htgt), htgt_pl);

		if (err)

			return err;



	mlxsw_reg_htgt_pack(htgt_pl, MLXSW_REG_HTGT_TRAP_GROUP_PMPE,

			    MLXSW_REG_HTGT_INVALID_POLICER,

			    MLXSW_REG_HTGT_DEFAULT_PRIORITY,

			    MLXSW_REG_HTGT_DEFAULT_TC);

	return mlxsw_reg_write(mlxsw_core, MLXSW_REG(htgt), htgt_pl);

	}

	return 0;

}



static const struct mlxsw_sp_ptp_ops mlxsw_sp1_ptp_ops = {