From: Alexandre Belloni <alexandre.belloni@bootlin•com>
To: Vladimir Oltean <vladimir.oltean@nxp•com>
Cc: Tobias Waldekranz <tobias@waldekranz•com>,
"David S . Miller" <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>,
netdev@vger•kernel.org, UNGLinuxDriver@microchip•com,
Andrew Lunn <andrew@lunn•ch>,
Florian Fainelli <f.fainelli@gmail•com>,
Vivien Didelot <vivien.didelot@gmail•com>,
Claudiu Manoil <claudiu.manoil@nxp•com>
Subject: Re: [RFC PATCH net-next 11/16] net: mscc: ocelot: set up logical port IDs centrally
Date: Wed, 16 Dec 2020 21:15:58 +0100 [thread overview]
Message-ID: <20201216201558.GN2814589@piout.net> (raw)
In-Reply-To: <20201208120802.1268708-12-vladimir.oltean@nxp.com>
On 08/12/2020 14:07:57+0200, Vladimir Oltean wrote:
> The setup of logical port IDs is done in two places: from the inconclusively
> named ocelot_setup_lag and from ocelot_port_lag_leave, a function that
> also calls ocelot_setup_lag (which apparently does an incomplete setup
> of the LAG).
>
> To improve this situation, we can rename ocelot_setup_lag into
> ocelot_setup_logical_port_ids, and drop the "lag" argument. It will now
> set up the logical port IDs of all switch ports, which may be just
> slightly more inefficient but more maintainable.
>
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp•com>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin•com>
> ---
> drivers/net/ethernet/mscc/ocelot.c | 47 ++++++++++++++++++------------
> 1 file changed, 28 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
> index ee0fcee8e09a..1a98c24af056 100644
> --- a/drivers/net/ethernet/mscc/ocelot.c
> +++ b/drivers/net/ethernet/mscc/ocelot.c
> @@ -1279,20 +1279,36 @@ static void ocelot_set_aggr_pgids(struct ocelot *ocelot)
> }
> }
>
> -static void ocelot_setup_lag(struct ocelot *ocelot, int lag)
> +/* When offloading a bonding interface, the switch ports configured under the
> + * same bond must have the same logical port ID, equal to the physical port ID
> + * of the lowest numbered physical port in that bond. Otherwise, in standalone/
> + * bridged mode, each port has a logical port ID equal to its physical port ID.
> + */
> +static void ocelot_setup_logical_port_ids(struct ocelot *ocelot)
> {
> - unsigned long bond_mask = ocelot->lags[lag];
> - unsigned int p;
> + int port;
>
> - for_each_set_bit(p, &bond_mask, ocelot->num_phys_ports) {
> - u32 port_cfg = ocelot_read_gix(ocelot, ANA_PORT_PORT_CFG, p);
> + for (port = 0; port < ocelot->num_phys_ports; port++) {
> + struct ocelot_port *ocelot_port = ocelot->ports[port];
> + struct net_device *bond;
> +
> + if (!ocelot_port)
> + continue;
>
> - port_cfg &= ~ANA_PORT_PORT_CFG_PORTID_VAL_M;
> + bond = ocelot_port->bond;
> + if (bond) {
> + int lag = __ffs(ocelot_get_bond_mask(ocelot, bond));
>
> - /* Use lag port as logical port for port i */
> - ocelot_write_gix(ocelot, port_cfg |
> - ANA_PORT_PORT_CFG_PORTID_VAL(lag),
> - ANA_PORT_PORT_CFG, p);
> + ocelot_rmw_gix(ocelot,
> + ANA_PORT_PORT_CFG_PORTID_VAL(lag),
> + ANA_PORT_PORT_CFG_PORTID_VAL_M,
> + ANA_PORT_PORT_CFG, port);
> + } else {
> + ocelot_rmw_gix(ocelot,
> + ANA_PORT_PORT_CFG_PORTID_VAL(port),
> + ANA_PORT_PORT_CFG_PORTID_VAL_M,
> + ANA_PORT_PORT_CFG, port);
> + }
> }
> }
>
> @@ -1320,7 +1336,7 @@ int ocelot_port_lag_join(struct ocelot *ocelot, int port,
> ocelot->lags[lag] |= BIT(port);
> }
>
> - ocelot_setup_lag(ocelot, lag);
> + ocelot_setup_logical_port_ids(ocelot);
> ocelot_apply_bridge_fwd_mask(ocelot);
> ocelot_set_aggr_pgids(ocelot);
>
> @@ -1331,7 +1347,6 @@ EXPORT_SYMBOL(ocelot_port_lag_join);
> void ocelot_port_lag_leave(struct ocelot *ocelot, int port,
> struct net_device *bond)
> {
> - u32 port_cfg;
> int i;
>
> ocelot->ports[port]->bond = NULL;
> @@ -1348,15 +1363,9 @@ void ocelot_port_lag_leave(struct ocelot *ocelot, int port,
>
> ocelot->lags[n] = ocelot->lags[port];
> ocelot->lags[port] = 0;
> -
> - ocelot_setup_lag(ocelot, n);
> }
>
> - port_cfg = ocelot_read_gix(ocelot, ANA_PORT_PORT_CFG, port);
> - port_cfg &= ~ANA_PORT_PORT_CFG_PORTID_VAL_M;
> - ocelot_write_gix(ocelot, port_cfg | ANA_PORT_PORT_CFG_PORTID_VAL(port),
> - ANA_PORT_PORT_CFG, port);
> -
> + ocelot_setup_logical_port_ids(ocelot);
> ocelot_apply_bridge_fwd_mask(ocelot);
> ocelot_set_aggr_pgids(ocelot);
> }
> --
> 2.25.1
>
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2020-12-16 20:16 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 12:07 [RFC PATCH net-next 00/16] LAG offload for Ocelot DSA switches Vladimir Oltean
2020-12-08 12:07 ` [RFC PATCH net-next 01/16] net: mscc: ocelot: offload bridge port flags to device Vladimir Oltean
2020-12-15 14:37 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 02/16] net: mscc: ocelot: allow offloading of bridge on top of LAG Vladimir Oltean
2020-12-15 14:43 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 03/16] net: mscc: ocelot: rename ocelot_netdevice_port_event to ocelot_netdevice_changeupper Vladimir Oltean
2020-12-15 15:01 ` Alexandre Belloni
2020-12-15 15:27 ` Vladimir Oltean
2020-12-08 12:07 ` [RFC PATCH net-next 04/16] net: mscc: ocelot: use a switch-case statement in ocelot_netdevice_event Vladimir Oltean
2020-12-15 15:52 ` Alexandre Belloni
2020-12-15 15:56 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 05/16] net: mscc: ocelot: don't refuse bonding interfaces we can't offload Vladimir Oltean
2020-12-15 15:56 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 06/16] net: mscc: ocelot: use ipv6 in the aggregation code Vladimir Oltean
2020-12-15 16:03 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 07/16] net: mscc: ocelot: set up the bonding mask in a way that avoids a net_device Vladimir Oltean
2020-12-15 16:36 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 08/16] net: mscc: ocelot: avoid unneeded "lp" variable in LAG join Vladimir Oltean
2020-12-15 16:47 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 09/16] net: mscc: ocelot: use "lag" variable name in ocelot_bridge_stp_state_set Vladimir Oltean
2020-12-15 16:49 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 10/16] net: mscc: ocelot: reapply bridge forwarding mask on bonding join/leave Vladimir Oltean
2020-12-16 12:29 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 11/16] net: mscc: ocelot: set up logical port IDs centrally Vladimir Oltean
2020-12-16 20:15 ` Alexandre Belloni [this message]
2020-12-08 12:07 ` [RFC PATCH net-next 12/16] net: mscc: ocelot: drop the use of the "lags" array Vladimir Oltean
2020-12-16 21:29 ` Alexandre Belloni
2021-01-15 11:05 ` Vladimir Oltean
2021-01-15 12:02 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 13/16] net: mscc: ocelot: rename aggr_count to num_ports_in_lag Vladimir Oltean
2020-12-16 21:31 ` Alexandre Belloni
2020-12-08 12:08 ` [RFC PATCH net-next 14/16] net: mscc: ocelot: rebalance LAGs on link up/down events Vladimir Oltean
2020-12-16 21:32 ` Alexandre Belloni
2020-12-08 12:08 ` [RFC PATCH net-next 15/16] net: dsa: felix: propagate the LAG offload ops towards the ocelot lib Vladimir Oltean
2020-12-08 12:08 ` [RFC PATCH net-next 16/16] net: dsa: ocelot: tell DSA that we can offload link aggregation Vladimir Oltean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201216201558.GN2814589@piout.net \
--to=alexandre.belloni@bootlin$(echo .)com \
--cc=UNGLinuxDriver@microchip$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=claudiu.manoil@nxp$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=tobias@waldekranz$(echo .)com \
--cc=vivien.didelot@gmail$(echo .)com \
--cc=vladimir.oltean@nxp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox