Skip to content

Commit 1a9234e

Browse files
idoschdavem330
idosch
authored and
davem330
committed
mlxsw: spectrum: Fix sparse warnings
drivers/net/ethernet/mellanox/mlxsw//spectrum.c:251:28: warning: symbol 'mlxsw_sp_span_entry_find' was not declared. Should it be static? drivers/net/ethernet/mellanox/mlxsw//spectrum.c:265:28: warning: symbol 'mlxsw_sp_span_entry_get' was not declared. Should it be static? drivers/net/ethernet/mellanox/mlxsw//spectrum.c:367:56: warning: mixing different enum types drivers/net/ethernet/mellanox/mlxsw//spectrum.c:367:56: int enum mlxsw_sp_span_type versus drivers/net/ethernet/mellanox/mlxsw//spectrum.c:367:56: int enum mlxsw_reg_mpar_i_e ... drivers/net/ethernet/mellanox/mlxsw//spectrum_buffers.c:598:32: warning: mixing different enum types drivers/net/ethernet/mellanox/mlxsw//spectrum_buffers.c:598:32: int enum mlxsw_reg_sbxx_dir versus drivers/net/ethernet/mellanox/mlxsw//spectrum_buffers.c:598:32: int enum devlink_sb_pool_type drivers/net/ethernet/mellanox/mlxsw//spectrum_buffers.c:600:39: warning: mixing different enum types drivers/net/ethernet/mellanox/mlxsw//spectrum_buffers.c:600:39: int enum mlxsw_reg_sbpr_mode versus drivers/net/ethernet/mellanox/mlxsw//spectrum_buffers.c:600:39: int enum devlink_sb_threshold_type ... drivers/net/ethernet/mellanox/mlxsw//spectrum_router.c:255:54: warning: mixing different enum types drivers/net/ethernet/mellanox/mlxsw//spectrum_router.c:255:54: int enum mlxsw_sp_l3proto versus drivers/net/ethernet/mellanox/mlxsw//spectrum_router.c:255:54: int enum mlxsw_reg_ralxx_protocol ... drivers/net/ethernet/mellanox/mlxsw//spectrum_router.c:1749:6: warning: symbol 'mlxsw_sp_fib_entry_put' was not declared. Should it be static? Signed-off-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 18c2d2c commit 1a9234e

File tree

3 files changed

+42
-26
lines changed

3 files changed

+42
-26
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ static void mlxsw_sp_span_entry_destroy(struct mlxsw_sp *mlxsw_sp,
248248
span_entry->used = false;
249249
}
250250

251-
struct mlxsw_sp_span_entry *mlxsw_sp_span_entry_find(struct mlxsw_sp_port *port)
251+
static struct mlxsw_sp_span_entry *
252+
mlxsw_sp_span_entry_find(struct mlxsw_sp_port *port)
252253
{
253254
struct mlxsw_sp *mlxsw_sp = port->mlxsw_sp;
254255
int i;
@@ -262,7 +263,8 @@ struct mlxsw_sp_span_entry *mlxsw_sp_span_entry_find(struct mlxsw_sp_port *port)
262263
return NULL;
263264
}
264265

265-
struct mlxsw_sp_span_entry *mlxsw_sp_span_entry_get(struct mlxsw_sp_port *port)
266+
static struct mlxsw_sp_span_entry
267+
*mlxsw_sp_span_entry_get(struct mlxsw_sp_port *port)
266268
{
267269
struct mlxsw_sp_span_entry *span_entry;
268270

@@ -364,7 +366,8 @@ mlxsw_sp_span_inspected_port_bind(struct mlxsw_sp_port *port,
364366
}
365367

366368
/* bind the port to the SPAN entry */
367-
mlxsw_reg_mpar_pack(mpar_pl, port->local_port, type, true, pa_id);
369+
mlxsw_reg_mpar_pack(mpar_pl, port->local_port,
370+
(enum mlxsw_reg_mpar_i_e) type, true, pa_id);
368371
err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(mpar), mpar_pl);
369372
if (err)
370373
goto err_mpar_reg_write;
@@ -405,7 +408,8 @@ mlxsw_sp_span_inspected_port_unbind(struct mlxsw_sp_port *port,
405408
return;
406409

407410
/* remove the inspected port */
408-
mlxsw_reg_mpar_pack(mpar_pl, port->local_port, type, false, pa_id);
411+
mlxsw_reg_mpar_pack(mpar_pl, port->local_port,
412+
(enum mlxsw_reg_mpar_i_e) type, false, pa_id);
409413
mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(mpar), mpar_pl);
410414

411415
/* remove the SBIB buffer if it was egress SPAN */

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,9 @@ int mlxsw_sp_sb_pool_get(struct mlxsw_core *mlxsw_core,
595595
enum mlxsw_reg_sbxx_dir dir = dir_get(pool_index);
596596
struct mlxsw_sp_sb_pr *pr = mlxsw_sp_sb_pr_get(mlxsw_sp, pool, dir);
597597

598-
pool_info->pool_type = dir;
598+
pool_info->pool_type = (enum devlink_sb_pool_type) dir;
599599
pool_info->size = MLXSW_SP_CELLS_TO_BYTES(pr->size);
600-
pool_info->threshold_type = pr->mode;
600+
pool_info->threshold_type = (enum devlink_sb_threshold_type) pr->mode;
601601
return 0;
602602
}
603603

@@ -608,9 +608,10 @@ int mlxsw_sp_sb_pool_set(struct mlxsw_core *mlxsw_core,
608608
struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
609609
u8 pool = pool_get(pool_index);
610610
enum mlxsw_reg_sbxx_dir dir = dir_get(pool_index);
611-
enum mlxsw_reg_sbpr_mode mode = threshold_type;
612611
u32 pool_size = MLXSW_SP_BYTES_TO_CELLS(size);
612+
enum mlxsw_reg_sbpr_mode mode;
613613

614+
mode = (enum mlxsw_reg_sbpr_mode) threshold_type;
614615
return mlxsw_sp_sb_pr_write(mlxsw_sp, pool, dir, mode, pool_size);
615616
}
616617

@@ -696,13 +697,13 @@ int mlxsw_sp_sb_tc_pool_bind_get(struct mlxsw_core_port *mlxsw_core_port,
696697
struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
697698
u8 local_port = mlxsw_sp_port->local_port;
698699
u8 pg_buff = tc_index;
699-
enum mlxsw_reg_sbxx_dir dir = pool_type;
700+
enum mlxsw_reg_sbxx_dir dir = (enum mlxsw_reg_sbxx_dir) pool_type;
700701
struct mlxsw_sp_sb_cm *cm = mlxsw_sp_sb_cm_get(mlxsw_sp, local_port,
701702
pg_buff, dir);
702703

703704
*p_threshold = mlxsw_sp_sb_threshold_out(mlxsw_sp, cm->pool, dir,
704705
cm->max_buff);
705-
*p_pool_index = pool_index_get(cm->pool, pool_type);
706+
*p_pool_index = pool_index_get(cm->pool, dir);
706707
return 0;
707708
}
708709

@@ -716,7 +717,7 @@ int mlxsw_sp_sb_tc_pool_bind_set(struct mlxsw_core_port *mlxsw_core_port,
716717
struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
717718
u8 local_port = mlxsw_sp_port->local_port;
718719
u8 pg_buff = tc_index;
719-
enum mlxsw_reg_sbxx_dir dir = pool_type;
720+
enum mlxsw_reg_sbxx_dir dir = (enum mlxsw_reg_sbxx_dir) pool_type;
720721
u8 pool = pool_get(pool_index);
721722
u32 max_buff;
722723
int err;
@@ -943,7 +944,7 @@ int mlxsw_sp_sb_occ_tc_port_bind_get(struct mlxsw_core_port *mlxsw_core_port,
943944
struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
944945
u8 local_port = mlxsw_sp_port->local_port;
945946
u8 pg_buff = tc_index;
946-
enum mlxsw_reg_sbxx_dir dir = pool_type;
947+
enum mlxsw_reg_sbxx_dir dir = (enum mlxsw_reg_sbxx_dir) pool_type;
947948
struct mlxsw_sp_sb_cm *cm = mlxsw_sp_sb_cm_get(mlxsw_sp, local_port,
948949
pg_buff, dir);
949950

‎drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,9 @@ static int mlxsw_sp_lpm_tree_alloc(struct mlxsw_sp *mlxsw_sp,
252252
{
253253
char ralta_pl[MLXSW_REG_RALTA_LEN];
254254

255-
mlxsw_reg_ralta_pack(ralta_pl, true, lpm_tree->proto, lpm_tree->id);
255+
mlxsw_reg_ralta_pack(ralta_pl, true,
256+
(enum mlxsw_reg_ralxx_protocol) lpm_tree->proto,
257+
lpm_tree->id);
256258
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ralta), ralta_pl);
257259
}
258260

@@ -261,7 +263,9 @@ static int mlxsw_sp_lpm_tree_free(struct mlxsw_sp *mlxsw_sp,
261263
{
262264
char ralta_pl[MLXSW_REG_RALTA_LEN];
263265

264-
mlxsw_reg_ralta_pack(ralta_pl, false, lpm_tree->proto, lpm_tree->id);
266+
mlxsw_reg_ralta_pack(ralta_pl, false,
267+
(enum mlxsw_reg_ralxx_protocol) lpm_tree->proto,
268+
lpm_tree->id);
265269
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ralta), ralta_pl);
266270
}
267271

@@ -384,7 +388,9 @@ static int mlxsw_sp_vr_lpm_tree_bind(struct mlxsw_sp *mlxsw_sp,
384388
{
385389
char raltb_pl[MLXSW_REG_RALTB_LEN];
386390

387-
mlxsw_reg_raltb_pack(raltb_pl, vr->id, vr->proto, vr->lpm_tree->id);
391+
mlxsw_reg_raltb_pack(raltb_pl, vr->id,
392+
(enum mlxsw_reg_ralxx_protocol) vr->proto,
393+
vr->lpm_tree->id);
388394
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(raltb), raltb_pl);
389395
}
390396

@@ -394,7 +400,8 @@ static int mlxsw_sp_vr_lpm_tree_unbind(struct mlxsw_sp *mlxsw_sp,
394400
char raltb_pl[MLXSW_REG_RALTB_LEN];
395401

396402
/* Bind to tree 0 which is default */
397-
mlxsw_reg_raltb_pack(raltb_pl, vr->id, vr->proto, 0);
403+
mlxsw_reg_raltb_pack(raltb_pl, vr->id,
404+
(enum mlxsw_reg_ralxx_protocol) vr->proto, 0);
398405
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(raltb), raltb_pl);
399406
}
400407

@@ -1081,9 +1088,10 @@ static int mlxsw_sp_adj_index_mass_update_vr(struct mlxsw_sp *mlxsw_sp,
10811088
{
10821089
char raleu_pl[MLXSW_REG_RALEU_LEN];
10831090

1084-
mlxsw_reg_raleu_pack(raleu_pl, vr->proto, vr->id,
1085-
adj_index, ecmp_size,
1086-
new_adj_index, new_ecmp_size);
1091+
mlxsw_reg_raleu_pack(raleu_pl,
1092+
(enum mlxsw_reg_ralxx_protocol) vr->proto, vr->id,
1093+
adj_index, ecmp_size, new_adj_index,
1094+
new_ecmp_size);
10871095
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(raleu), raleu_pl);
10881096
}
10891097

@@ -1558,8 +1566,9 @@ static int mlxsw_sp_fib_entry_op4_remote(struct mlxsw_sp *mlxsw_sp,
15581566
trap_id = MLXSW_TRAP_ID_RTR_INGRESS0;
15591567
}
15601568

1561-
mlxsw_reg_ralue_pack4(ralue_pl, vr->proto, op, vr->id,
1562-
fib_entry->key.prefix_len, *p_dip);
1569+
mlxsw_reg_ralue_pack4(ralue_pl,
1570+
(enum mlxsw_reg_ralxx_protocol) vr->proto, op,
1571+
vr->id, fib_entry->key.prefix_len, *p_dip);
15631572
mlxsw_reg_ralue_act_remote_pack(ralue_pl, trap_action, trap_id,
15641573
adjacency_index, ecmp_size);
15651574
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ralue), ralue_pl);
@@ -1573,8 +1582,9 @@ static int mlxsw_sp_fib_entry_op4_local(struct mlxsw_sp *mlxsw_sp,
15731582
u32 *p_dip = (u32 *) fib_entry->key.addr;
15741583
struct mlxsw_sp_vr *vr = fib_entry->vr;
15751584

1576-
mlxsw_reg_ralue_pack4(ralue_pl, vr->proto, op, vr->id,
1577-
fib_entry->key.prefix_len, *p_dip);
1585+
mlxsw_reg_ralue_pack4(ralue_pl,
1586+
(enum mlxsw_reg_ralxx_protocol) vr->proto, op,
1587+
vr->id, fib_entry->key.prefix_len, *p_dip);
15781588
mlxsw_reg_ralue_act_local_pack(ralue_pl,
15791589
MLXSW_REG_RALUE_TRAP_ACTION_NOP, 0,
15801590
fib_entry->rif);
@@ -1589,8 +1599,9 @@ static int mlxsw_sp_fib_entry_op4_trap(struct mlxsw_sp *mlxsw_sp,
15891599
u32 *p_dip = (u32 *) fib_entry->key.addr;
15901600
struct mlxsw_sp_vr *vr = fib_entry->vr;
15911601

1592-
mlxsw_reg_ralue_pack4(ralue_pl, vr->proto, op, vr->id,
1593-
fib_entry->key.prefix_len, *p_dip);
1602+
mlxsw_reg_ralue_pack4(ralue_pl,
1603+
(enum mlxsw_reg_ralxx_protocol) vr->proto, op,
1604+
vr->id, fib_entry->key.prefix_len, *p_dip);
15941605
mlxsw_reg_ralue_act_ip2me_pack(ralue_pl);
15951606
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ralue), ralue_pl);
15961607
}
@@ -1753,8 +1764,8 @@ mlxsw_sp_fib_entry_find(struct mlxsw_sp *mlxsw_sp,
17531764
fib4->fi->fib_dev);
17541765
}
17551766

1756-
void mlxsw_sp_fib_entry_put(struct mlxsw_sp *mlxsw_sp,
1757-
struct mlxsw_sp_fib_entry *fib_entry)
1767+
static void mlxsw_sp_fib_entry_put(struct mlxsw_sp *mlxsw_sp,
1768+
struct mlxsw_sp_fib_entry *fib_entry)
17581769
{
17591770
struct mlxsw_sp_vr *vr = fib_entry->vr;
17601771

0 commit comments

Comments
 (0)