Commit a41b9626 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_buffers: Introduce shared buffer ops 



The size of the internal buffer is currently calculated in the SPAN module.
Logically it belongs to the spectrum_buffers module, where it should be
moved. However, that being a chip-specific operation, it needs dynamic
dispatch. There currently is a chip-specific structure for description of
shared buffer values, struct mlxsw_sp_sb_vals. However placing ops into
this structure would be confusing. Therefore introduce a new per-chip
structure, currently empty, and initialize the ops pointer as appropriate.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0cda1a9b

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

+3 −0
Original line number Diff line number Diff line
@@ -2697,6 +2697,7 @@ static int mlxsw_sp1_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->mac_mask = mlxsw_sp1_mac_mask;

	mlxsw_sp->rif_ops_arr = mlxsw_sp1_rif_ops_arr;

	mlxsw_sp->sb_vals = &mlxsw_sp1_sb_vals;

	mlxsw_sp->sb_ops = &mlxsw_sp1_sb_ops;

	mlxsw_sp->port_type_speed_ops = &mlxsw_sp1_port_type_speed_ops;

	mlxsw_sp->ptp_ops = &mlxsw_sp1_ptp_ops;

	mlxsw_sp->span_ops = &mlxsw_sp1_span_ops;
@@ -2725,6 +2726,7 @@ static int mlxsw_sp2_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->mac_mask = mlxsw_sp2_mac_mask;

	mlxsw_sp->rif_ops_arr = mlxsw_sp2_rif_ops_arr;

	mlxsw_sp->sb_vals = &mlxsw_sp2_sb_vals;

	mlxsw_sp->sb_ops = &mlxsw_sp2_sb_ops;

	mlxsw_sp->port_type_speed_ops = &mlxsw_sp2_port_type_speed_ops;

	mlxsw_sp->ptp_ops = &mlxsw_sp2_ptp_ops;

	mlxsw_sp->span_ops = &mlxsw_sp2_span_ops;
@@ -2751,6 +2753,7 @@ static int mlxsw_sp3_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->mac_mask = mlxsw_sp2_mac_mask;

	mlxsw_sp->rif_ops_arr = mlxsw_sp2_rif_ops_arr;

	mlxsw_sp->sb_vals = &mlxsw_sp2_sb_vals;

	mlxsw_sp->sb_ops = &mlxsw_sp3_sb_ops;

	mlxsw_sp->port_type_speed_ops = &mlxsw_sp2_port_type_speed_ops;

	mlxsw_sp->ptp_ops = &mlxsw_sp2_ptp_ops;

	mlxsw_sp->span_ops = &mlxsw_sp3_span_ops;

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

+6 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ struct mlxsw_sp_mr_tcam_ops; 
struct mlxsw_sp_acl_rulei_ops;

struct mlxsw_sp_acl_tcam_ops;

struct mlxsw_sp_nve_ops;

struct mlxsw_sp_sb_ops;

struct mlxsw_sp_sb_vals;

struct mlxsw_sp_port_type_speed_ops;

struct mlxsw_sp_ptp_state;
@@ -171,6 +172,7 @@ struct mlxsw_sp { 
	const struct mlxsw_sp_nve_ops **nve_ops_arr;

	const struct mlxsw_sp_rif_ops **rif_ops_arr;

	const struct mlxsw_sp_sb_vals *sb_vals;

	const struct mlxsw_sp_sb_ops *sb_ops;

	const struct mlxsw_sp_port_type_speed_ops *port_type_speed_ops;

	const struct mlxsw_sp_ptp_ops *ptp_ops;

	const struct mlxsw_sp_span_ops *span_ops;
@@ -514,6 +516,10 @@ int mlxsw_sp_hdroom_configure(struct mlxsw_sp_port *mlxsw_sp_port, 
extern const struct mlxsw_sp_sb_vals mlxsw_sp1_sb_vals;

extern const struct mlxsw_sp_sb_vals mlxsw_sp2_sb_vals;



extern const struct mlxsw_sp_sb_ops mlxsw_sp1_sb_ops;

extern const struct mlxsw_sp_sb_ops mlxsw_sp2_sb_ops;

extern const struct mlxsw_sp_sb_ops mlxsw_sp3_sb_ops;



/* spectrum_switchdev.c */

int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp);

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

+12 −0
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ struct mlxsw_sp_sb_vals { 
	unsigned int cms_cpu_count;

};



struct mlxsw_sp_sb_ops {

};



u32 mlxsw_sp_cells_bytes(const struct mlxsw_sp *mlxsw_sp, u32 cells)

{

	return mlxsw_sp->sb->cell_size * cells;
@@ -1101,6 +1104,15 @@ const struct mlxsw_sp_sb_vals mlxsw_sp2_sb_vals = { 
	.cms_cpu_count = ARRAY_SIZE(mlxsw_sp_cpu_port_sb_cms),

};



const struct mlxsw_sp_sb_ops mlxsw_sp1_sb_ops = {

};



const struct mlxsw_sp_sb_ops mlxsw_sp2_sb_ops = {

};



const struct mlxsw_sp_sb_ops mlxsw_sp3_sb_ops = {

};



int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp)

{

	u32 max_headroom_size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE