| Message ID | 20201208120802.1268708-9-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | LAG offload for Ocelot DSA switches | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | fail | Series longer than 15 patches |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | fail | Errors and warnings before: 4 this patch: 4 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 34 lines checked |
| netdev/build_allmodconfig_warn | fail | Errors and warnings before: 4 this patch: 4 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On 08/12/2020 14:07:54+0200, Vladimir Oltean wrote: > The index of the LAG is equal to the logical port ID that all the > physical port members have, which is further equal to the index of the > first physical port that is a member of the LAG. > > The code gets a bit carried away with logic like this: > > if (a == b) > c = a; > else > c = b; > > which can be simplified, of course, into: > > c = b; > > (with a being port, b being lp, c being lag) > > This further makes the "lp" variable redundant, since we can use "lag" > everywhere where "lp" (logical port) was used. So instead of a "c = b" > assignment, we can do a complete deletion of b. Only one comment here: > > if (bond_mask) { > lp = __ffs(bond_mask); > ocelot->lags[lp] = 0; > } > > lp was clobbered before, because it was used as a temporary variable to > hold the new smallest port ID from the bond. Now that we don't have "lp" > any longer, we'll just avoid the temporary variable and zeroize the > bonding mask directly. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > drivers/net/ethernet/mscc/ocelot.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c > index 30dee1f957d1..080fd4ce37ea 100644 > --- a/drivers/net/ethernet/mscc/ocelot.c > +++ b/drivers/net/ethernet/mscc/ocelot.c > @@ -1291,28 +1291,24 @@ int ocelot_port_lag_join(struct ocelot *ocelot, int port, > struct net_device *bond) > { > u32 bond_mask = 0; > - int lag, lp; > + int lag; > > ocelot->ports[port]->bond = bond; > > bond_mask = ocelot_get_bond_mask(ocelot, bond); > > - lp = __ffs(bond_mask); > + lag = __ffs(bond_mask); > > /* If the new port is the lowest one, use it as the logical port from > * now on > */ > - if (port == lp) { > - lag = port; > + if (port == lag) { > ocelot->lags[port] = bond_mask; > bond_mask &= ~BIT(port); > - if (bond_mask) { > - lp = __ffs(bond_mask); > - ocelot->lags[lp] = 0; > - } > + if (bond_mask) > + ocelot->lags[__ffs(bond_mask)] = 0; > } else { > - lag = lp; > - ocelot->lags[lp] |= BIT(port); > + ocelot->lags[lag] |= BIT(port); > } > > ocelot_setup_lag(ocelot, lag); > -- > 2.25.1 >
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 30dee1f957d1..080fd4ce37ea 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -1291,28 +1291,24 @@ int ocelot_port_lag_join(struct ocelot *ocelot, int port, struct net_device *bond) { u32 bond_mask = 0; - int lag, lp; + int lag; ocelot->ports[port]->bond = bond; bond_mask = ocelot_get_bond_mask(ocelot, bond); - lp = __ffs(bond_mask); + lag = __ffs(bond_mask); /* If the new port is the lowest one, use it as the logical port from * now on */ - if (port == lp) { - lag = port; + if (port == lag) { ocelot->lags[port] = bond_mask; bond_mask &= ~BIT(port); - if (bond_mask) { - lp = __ffs(bond_mask); - ocelot->lags[lp] = 0; - } + if (bond_mask) + ocelot->lags[__ffs(bond_mask)] = 0; } else { - lag = lp; - ocelot->lags[lp] |= BIT(port); + ocelot->lags[lag] |= BIT(port); } ocelot_setup_lag(ocelot, lag);
The index of the LAG is equal to the logical port ID that all the physical port members have, which is further equal to the index of the first physical port that is a member of the LAG. The code gets a bit carried away with logic like this: if (a == b) c = a; else c = b; which can be simplified, of course, into: c = b; (with a being port, b being lp, c being lag) This further makes the "lp" variable redundant, since we can use "lag" everywhere where "lp" (logical port) was used. So instead of a "c = b" assignment, we can do a complete deletion of b. Only one comment here: if (bond_mask) { lp = __ffs(bond_mask); ocelot->lags[lp] = 0; } lp was clobbered before, because it was used as a temporary variable to hold the new smallest port ID from the bond. Now that we don't have "lp" any longer, we'll just avoid the temporary variable and zeroize the bonding mask directly. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- drivers/net/ethernet/mscc/ocelot.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)