Skip to content

Commit 3ba2ebf

Browse files
idoschdavem330
idosch
authored and
davem330
committed
mlxsw: spectrum: Unsplit the vFID range
Previous commit deprecated the vFIDs used to get traffic to the CPU ('port_vfids'). Thus, we now use the vFIDs as god intended and the artificial split is no longer needed. Rename functions and variables to reflect that. Signed-off-by: Ido Schimmel <[email protected]> Signed-off-by: Jiri Pirko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 99724c1 commit 3ba2ebf

File tree

2 files changed

+30
-29
lines changed

2 files changed

+30
-29
lines changed

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

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2235,7 +2235,7 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core,
22352235
mlxsw_sp->core = mlxsw_core;
22362236
mlxsw_sp->bus_info = mlxsw_bus_info;
22372237
INIT_LIST_HEAD(&mlxsw_sp->fids);
2238-
INIT_LIST_HEAD(&mlxsw_sp->br_vfids.list);
2238+
INIT_LIST_HEAD(&mlxsw_sp->vfids.list);
22392239
INIT_LIST_HEAD(&mlxsw_sp->br_mids.list);
22402240

22412241
err = mlxsw_sp_base_mac_get(mlxsw_sp);
@@ -2320,6 +2320,7 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core)
23202320
mlxsw_sp_buffers_fini(mlxsw_sp);
23212321
mlxsw_sp_traps_fini(mlxsw_sp);
23222322
mlxsw_sp_event_unregister(mlxsw_sp, MLXSW_TRAP_ID_PUDE);
2323+
WARN_ON(!list_empty(&mlxsw_sp->vfids.list));
23232324
WARN_ON(!list_empty(&mlxsw_sp->fids));
23242325
for (i = 0; i < MLXSW_SP_RIF_MAX; i++)
23252326
WARN_ON_ONCE(mlxsw_sp->rifs[i]);
@@ -3373,22 +3374,22 @@ static int mlxsw_sp_netdevice_lag_event(struct net_device *lag_dev,
33733374
}
33743375

33753376
static struct mlxsw_sp_fid *
3376-
mlxsw_sp_br_vfid_find(const struct mlxsw_sp *mlxsw_sp,
3377-
const struct net_device *br_dev)
3377+
mlxsw_sp_vfid_find(const struct mlxsw_sp *mlxsw_sp,
3378+
const struct net_device *br_dev)
33783379
{
33793380
struct mlxsw_sp_fid *f;
33803381

3381-
list_for_each_entry(f, &mlxsw_sp->br_vfids.list, list) {
3382+
list_for_each_entry(f, &mlxsw_sp->vfids.list, list) {
33823383
if (f->dev == br_dev)
33833384
return f;
33843385
}
33853386

33863387
return NULL;
33873388
}
33883389

3389-
static u16 mlxsw_sp_avail_br_vfid_get(const struct mlxsw_sp *mlxsw_sp)
3390+
static u16 mlxsw_sp_avail_vfid_get(const struct mlxsw_sp *mlxsw_sp)
33903391
{
3391-
return find_first_zero_bit(mlxsw_sp->br_vfids.mapped,
3392+
return find_first_zero_bit(mlxsw_sp->vfids.mapped,
33923393
MLXSW_SP_VFID_MAX);
33933394
}
33943395

@@ -3400,17 +3401,17 @@ static int mlxsw_sp_vfid_op(struct mlxsw_sp *mlxsw_sp, u16 fid, bool create)
34003401
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfmr), sfmr_pl);
34013402
}
34023403

3403-
static void mlxsw_sp_vport_br_vfid_leave(struct mlxsw_sp_port *mlxsw_sp_vport);
3404+
static void mlxsw_sp_vport_vfid_leave(struct mlxsw_sp_port *mlxsw_sp_vport);
34043405

3405-
static struct mlxsw_sp_fid *mlxsw_sp_br_vfid_create(struct mlxsw_sp *mlxsw_sp,
3406-
struct net_device *br_dev)
3406+
static struct mlxsw_sp_fid *mlxsw_sp_vfid_create(struct mlxsw_sp *mlxsw_sp,
3407+
struct net_device *br_dev)
34073408
{
34083409
struct device *dev = mlxsw_sp->bus_info->dev;
34093410
struct mlxsw_sp_fid *f;
34103411
u16 vfid, fid;
34113412
int err;
34123413

3413-
vfid = mlxsw_sp_avail_br_vfid_get(mlxsw_sp);
3414+
vfid = mlxsw_sp_avail_vfid_get(mlxsw_sp);
34143415
if (vfid == MLXSW_SP_VFID_MAX) {
34153416
dev_err(dev, "No available vFIDs\n");
34163417
return ERR_PTR(-ERANGE);
@@ -3427,12 +3428,12 @@ static struct mlxsw_sp_fid *mlxsw_sp_br_vfid_create(struct mlxsw_sp *mlxsw_sp,
34273428
if (!f)
34283429
goto err_allocate_vfid;
34293430

3430-
f->leave = mlxsw_sp_vport_br_vfid_leave;
3431+
f->leave = mlxsw_sp_vport_vfid_leave;
34313432
f->fid = fid;
34323433
f->dev = br_dev;
34333434

3434-
list_add(&f->list, &mlxsw_sp->br_vfids.list);
3435-
set_bit(vfid, mlxsw_sp->br_vfids.mapped);
3435+
list_add(&f->list, &mlxsw_sp->vfids.list);
3436+
set_bit(vfid, mlxsw_sp->vfids.mapped);
34363437

34373438
return f;
34383439

@@ -3441,12 +3442,12 @@ static struct mlxsw_sp_fid *mlxsw_sp_br_vfid_create(struct mlxsw_sp *mlxsw_sp,
34413442
return ERR_PTR(-ENOMEM);
34423443
}
34433444

3444-
static void mlxsw_sp_br_vfid_destroy(struct mlxsw_sp *mlxsw_sp,
3445-
struct mlxsw_sp_fid *f)
3445+
static void mlxsw_sp_vfid_destroy(struct mlxsw_sp *mlxsw_sp,
3446+
struct mlxsw_sp_fid *f)
34463447
{
34473448
u16 vfid = mlxsw_sp_fid_to_vfid(f->fid);
34483449

3449-
clear_bit(vfid, mlxsw_sp->br_vfids.mapped);
3450+
clear_bit(vfid, mlxsw_sp->vfids.mapped);
34503451
list_del(&f->list);
34513452

34523453
mlxsw_sp_vfid_op(mlxsw_sp, f->fid, false);
@@ -3464,15 +3465,15 @@ static int mlxsw_sp_vport_fid_map(struct mlxsw_sp_port *mlxsw_sp_vport, u16 fid,
34643465
vid);
34653466
}
34663467

3467-
static int mlxsw_sp_vport_br_vfid_join(struct mlxsw_sp_port *mlxsw_sp_vport,
3468-
struct net_device *br_dev)
3468+
static int mlxsw_sp_vport_vfid_join(struct mlxsw_sp_port *mlxsw_sp_vport,
3469+
struct net_device *br_dev)
34693470
{
34703471
struct mlxsw_sp_fid *f;
34713472
int err;
34723473

3473-
f = mlxsw_sp_br_vfid_find(mlxsw_sp_vport->mlxsw_sp, br_dev);
3474+
f = mlxsw_sp_vfid_find(mlxsw_sp_vport->mlxsw_sp, br_dev);
34743475
if (!f) {
3475-
f = mlxsw_sp_br_vfid_create(mlxsw_sp_vport->mlxsw_sp, br_dev);
3476+
f = mlxsw_sp_vfid_create(mlxsw_sp_vport->mlxsw_sp, br_dev);
34763477
if (IS_ERR(f))
34773478
return PTR_ERR(f);
34783479
}
@@ -3496,11 +3497,11 @@ static int mlxsw_sp_vport_br_vfid_join(struct mlxsw_sp_port *mlxsw_sp_vport,
34963497
mlxsw_sp_vport_flood_set(mlxsw_sp_vport, f->fid, false);
34973498
err_vport_flood_set:
34983499
if (!f->ref_count)
3499-
mlxsw_sp_br_vfid_destroy(mlxsw_sp_vport->mlxsw_sp, f);
3500+
mlxsw_sp_vfid_destroy(mlxsw_sp_vport->mlxsw_sp, f);
35003501
return err;
35013502
}
35023503

3503-
static void mlxsw_sp_vport_br_vfid_leave(struct mlxsw_sp_port *mlxsw_sp_vport)
3504+
static void mlxsw_sp_vport_vfid_leave(struct mlxsw_sp_port *mlxsw_sp_vport)
35043505
{
35053506
struct mlxsw_sp_fid *f = mlxsw_sp_vport_fid_get(mlxsw_sp_vport);
35063507

@@ -3514,7 +3515,7 @@ static void mlxsw_sp_vport_br_vfid_leave(struct mlxsw_sp_port *mlxsw_sp_vport)
35143515

35153516
mlxsw_sp_vport_fid_set(mlxsw_sp_vport, NULL);
35163517
if (--f->ref_count == 0)
3517-
mlxsw_sp_br_vfid_destroy(mlxsw_sp_vport->mlxsw_sp, f);
3518+
mlxsw_sp_vfid_destroy(mlxsw_sp_vport->mlxsw_sp, f);
35183519
}
35193520

35203521
static int mlxsw_sp_vport_bridge_join(struct mlxsw_sp_port *mlxsw_sp_vport,
@@ -3528,7 +3529,7 @@ static int mlxsw_sp_vport_bridge_join(struct mlxsw_sp_port *mlxsw_sp_vport,
35283529
if (f && !WARN_ON(!f->leave))
35293530
f->leave(mlxsw_sp_vport);
35303531

3531-
err = mlxsw_sp_vport_br_vfid_join(mlxsw_sp_vport, br_dev);
3532+
err = mlxsw_sp_vport_vfid_join(mlxsw_sp_vport, br_dev);
35323533
if (err) {
35333534
netdev_err(dev, "Failed to join vFID\n");
35343535
return err;
@@ -3548,7 +3549,7 @@ static int mlxsw_sp_vport_bridge_join(struct mlxsw_sp_port *mlxsw_sp_vport,
35483549
return 0;
35493550

35503551
err_port_vid_learning_set:
3551-
mlxsw_sp_vport_br_vfid_leave(mlxsw_sp_vport);
3552+
mlxsw_sp_vport_vfid_leave(mlxsw_sp_vport);
35523553
return err;
35533554
}
35543555

@@ -3558,7 +3559,7 @@ static void mlxsw_sp_vport_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_vport)
35583559

35593560
mlxsw_sp_port_vid_learning_set(mlxsw_sp_vport, vid, false);
35603561

3561-
mlxsw_sp_vport_br_vfid_leave(mlxsw_sp_vport);
3562+
mlxsw_sp_vport_vfid_leave(mlxsw_sp_vport);
35623563

35633564
mlxsw_sp_vport->learning = 0;
35643565
mlxsw_sp_vport->learning_sync = 0;
@@ -3574,7 +3575,7 @@ mlxsw_sp_port_master_bridge_check(const struct mlxsw_sp_port *mlxsw_sp_port,
35743575

35753576
list_for_each_entry(mlxsw_sp_vport, &mlxsw_sp_port->vports_list,
35763577
vport.list) {
3577-
struct net_device *dev = mlxsw_sp_vport_br_get(mlxsw_sp_vport);
3578+
struct net_device *dev = mlxsw_sp_vport_dev_get(mlxsw_sp_vport);
35783579

35793580
if (dev && dev == br_dev)
35803581
return false;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ struct mlxsw_sp {
218218
struct {
219219
struct list_head list;
220220
DECLARE_BITMAP(mapped, MLXSW_SP_VFID_MAX);
221-
} br_vfids;
221+
} vfids;
222222
struct {
223223
struct list_head list;
224224
DECLARE_BITMAP(mapped, MLXSW_SP_MID_MAX);
@@ -349,7 +349,7 @@ mlxsw_sp_vport_fid_get(const struct mlxsw_sp_port *mlxsw_sp_vport)
349349
}
350350

351351
static inline struct net_device *
352-
mlxsw_sp_vport_br_get(const struct mlxsw_sp_port *mlxsw_sp_vport)
352+
mlxsw_sp_vport_dev_get(const struct mlxsw_sp_port *mlxsw_sp_vport)
353353
{
354354
struct mlxsw_sp_fid *f = mlxsw_sp_vport_fid_get(mlxsw_sp_vport);
355355

0 commit comments

Comments
 (0)