Commit 2b7bccd1 authored by Petr Machata's avatar Petr Machata Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_fid: Extract SFMR packing into a helper 



Both mlxsw_sp_fid_op() and mlxsw_sp_fid_edit_op() pack the core of SFMR the
same way. Extract the common code into a helper and call that. Extract out
of that a wrapper that just calls mlxsw_reg_sfmr_pack(), because it will
be useful for the dummy family later on.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Link: https://lore.kernel.org/r/31f32b4d767183f6cb197148d0792feab2efadba.1700503644.git.petrm@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b51c876c

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

+19 −14
Original line number Diff line number Diff line
@@ -424,21 +424,35 @@ static enum mlxsw_reg_sfmr_op mlxsw_sp_sfmr_op(bool valid) 
		       MLXSW_REG_SFMR_OP_DESTROY_FID;

}



static int mlxsw_sp_fid_op(const struct mlxsw_sp_fid *fid, bool valid)

static void mlxsw_sp_fid_pack(char *sfmr_pl,

			      const struct mlxsw_sp_fid *fid,

			      enum mlxsw_reg_sfmr_op op)

{

	struct mlxsw_sp *mlxsw_sp = fid->fid_family->mlxsw_sp;

	char sfmr_pl[MLXSW_REG_SFMR_LEN];

	u16 smpe;



	smpe = fid->fid_family->smpe_index_valid ? fid->fid_index : 0;



	mlxsw_reg_sfmr_pack(sfmr_pl, mlxsw_sp_sfmr_op(valid), fid->fid_index,

	mlxsw_reg_sfmr_pack(sfmr_pl, op, fid->fid_index,

			    fid->fid_family->smpe_index_valid, smpe);

}



static void mlxsw_sp_fid_pack_ctl(char *sfmr_pl,

				  const struct mlxsw_sp_fid *fid,

				  enum mlxsw_reg_sfmr_op op)

{

	mlxsw_sp_fid_pack(sfmr_pl, fid, op);

	mlxsw_reg_sfmr_fid_offset_set(sfmr_pl, fid->fid_offset);

	mlxsw_reg_sfmr_flood_rsp_set(sfmr_pl, fid->fid_family->flood_rsp);

	mlxsw_reg_sfmr_flood_bridge_type_set(sfmr_pl,

					     fid->fid_family->bridge_type);

}



static int mlxsw_sp_fid_op(const struct mlxsw_sp_fid *fid, bool valid)

{

	struct mlxsw_sp *mlxsw_sp = fid->fid_family->mlxsw_sp;

	char sfmr_pl[MLXSW_REG_SFMR_LEN];



	mlxsw_sp_fid_pack_ctl(sfmr_pl, fid, mlxsw_sp_sfmr_op(valid));

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfmr), sfmr_pl);

}
@@ -447,17 +461,8 @@ static int mlxsw_sp_fid_edit_op(const struct mlxsw_sp_fid *fid, 
{

	struct mlxsw_sp *mlxsw_sp = fid->fid_family->mlxsw_sp;

	char sfmr_pl[MLXSW_REG_SFMR_LEN];

	u16 smpe;



	smpe = fid->fid_family->smpe_index_valid ? fid->fid_index : 0;



	mlxsw_reg_sfmr_pack(sfmr_pl, MLXSW_REG_SFMR_OP_CREATE_FID,

			    fid->fid_index,

			    fid->fid_family->smpe_index_valid, smpe);

	mlxsw_reg_sfmr_fid_offset_set(sfmr_pl, fid->fid_offset);

	mlxsw_reg_sfmr_flood_rsp_set(sfmr_pl, fid->fid_family->flood_rsp);

	mlxsw_reg_sfmr_flood_bridge_type_set(sfmr_pl,

					     fid->fid_family->bridge_type);

	mlxsw_sp_fid_pack_ctl(sfmr_pl, fid, MLXSW_REG_SFMR_OP_CREATE_FID);

	mlxsw_reg_sfmr_vv_set(sfmr_pl, fid->vni_valid);

	mlxsw_reg_sfmr_vni_set(sfmr_pl, be32_to_cpu(fid->vni));

	mlxsw_reg_sfmr_vtfp_set(sfmr_pl, fid->nve_flood_index_valid);