Commit 1d079116 authored by Petr Machata's avatar Petr Machata Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_fid: Move mlxsw_sp_fid_flood_table_init() up 



Move the function to the point where it will need to be to be visible for
the 802.1d ops.

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/aef09e26b0c2dd077531e665d7135b300bdaf0a8.1701183892.git.petrm@nvidia.com


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

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

+30 −30
Original line number Diff line number Diff line
@@ -1077,6 +1077,36 @@ mlxsw_sp_fid_8021d_vid_to_fid_rif_update(const struct mlxsw_sp_fid *fid, 
	return 0;

}



static int

mlxsw_sp_fid_flood_table_init(struct mlxsw_sp_fid_family *fid_family,

			      const struct mlxsw_sp_flood_table *flood_table)

{

	enum mlxsw_sp_flood_type packet_type = flood_table->packet_type;

	struct mlxsw_sp *mlxsw_sp = fid_family->mlxsw_sp;

	const int *sfgc_packet_types;

	u16 mid_base;

	int err, i;



	mid_base = mlxsw_sp_fid_pgt_base_ctl(fid_family, flood_table);



	sfgc_packet_types = mlxsw_sp_packet_type_sfgc_types[packet_type];

	for (i = 0; i < MLXSW_REG_SFGC_TYPE_MAX; i++) {

		char sfgc_pl[MLXSW_REG_SFGC_LEN];



		if (!sfgc_packet_types[i])

			continue;



		mlxsw_reg_sfgc_pack(sfgc_pl, i, fid_family->bridge_type,

				    flood_table->table_type, 0, mid_base);



		err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfgc), sfgc_pl);

		if (err)

			return err;

	}



	return 0;

}



static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021d_ops_ctl = {

	.setup			= mlxsw_sp_fid_8021d_setup,

	.configure		= mlxsw_sp_fid_8021d_configure,
@@ -1675,36 +1705,6 @@ struct mlxsw_sp_fid *mlxsw_sp_fid_dummy_get(struct mlxsw_sp *mlxsw_sp) 
	return mlxsw_sp_fid_get(mlxsw_sp, MLXSW_SP_FID_TYPE_DUMMY, NULL);

}



static int

mlxsw_sp_fid_flood_table_init(struct mlxsw_sp_fid_family *fid_family,

			      const struct mlxsw_sp_flood_table *flood_table)

{

	enum mlxsw_sp_flood_type packet_type = flood_table->packet_type;

	struct mlxsw_sp *mlxsw_sp = fid_family->mlxsw_sp;

	const int *sfgc_packet_types;

	u16 mid_base;

	int err, i;



	mid_base = mlxsw_sp_fid_pgt_base_ctl(fid_family, flood_table);



	sfgc_packet_types = mlxsw_sp_packet_type_sfgc_types[packet_type];

	for (i = 0; i < MLXSW_REG_SFGC_TYPE_MAX; i++) {

		char sfgc_pl[MLXSW_REG_SFGC_LEN];



		if (!sfgc_packet_types[i])

			continue;



		mlxsw_reg_sfgc_pack(sfgc_pl, i, fid_family->bridge_type,

				    flood_table->table_type, 0, mid_base);



		err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfgc), sfgc_pl);

		if (err)

			return err;

	}



	return 0;

}



static int

mlxsw_sp_fid_flood_tables_init(struct mlxsw_sp_fid_family *fid_family)

{