From: Vladimir Oltean <olteanv@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: netdev <netdev@vger.kernel.org>,
Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Vivien Didelot <vivien.didelot@gmail.com>,
Claudiu Manoil <claudiu.manoil@nxp.com>,
Tobias Waldekranz <tobias@waldekranz.com>,
Maxim Kochetkov <fido_max@inbox.ru>
Subject: [PATCH v2 net-next 14/14] net: dsa: felix: propagate the LAG offload ops towards the ocelot lib
Date: Sat, 16 Jan 2021 02:59:43 +0200 [thread overview]
Message-ID: <20210116005943.219479-15-olteanv@gmail.com> (raw)
In-Reply-To: <20210116005943.219479-1-olteanv@gmail.com>
From: Vladimir Oltean <vladimir.oltean@nxp.com>
The ocelot switch has been supporting LAG offload since its initial
commit, however felix could not make use of that, due to lack of a LAG
abstraction in DSA. Now that we have that, let's forward DSA's calls
towards the ocelot library, who will deal with setting up the bonding.
Note that ocelot_port_lag_leave can return an error due to memory
allocation but we are currently ignoring that, because the DSA method
returns void.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
Changes in v2:
s/lag_dev/bond/g
drivers/net/dsa/ocelot/felix.c | 28 ++++++++++++++++++++++++++++
drivers/net/ethernet/mscc/ocelot.c | 1 +
drivers/net/ethernet/mscc/ocelot.h | 6 ------
include/soc/mscc/ocelot.h | 6 ++++++
4 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 2c6ac2b137ec..af867535f9eb 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -105,6 +105,31 @@ static void felix_bridge_leave(struct dsa_switch *ds, int port,
ocelot_port_bridge_leave(ocelot, port, br);
}
+static int felix_lag_join(struct dsa_switch *ds, int port,
+ struct net_device *bond,
+ struct netdev_lag_upper_info *info)
+{
+ struct ocelot *ocelot = ds->priv;
+
+ return ocelot_port_lag_join(ocelot, port, bond, info);
+}
+
+static int felix_lag_leave(struct dsa_switch *ds, int port,
+ struct net_device *bond)
+{
+ struct ocelot *ocelot = ds->priv;
+
+ return ocelot_port_lag_leave(ocelot, port, bond);
+}
+
+static int felix_lag_change(struct dsa_switch *ds, int port)
+{
+ struct dsa_port *dp = dsa_to_port(ds, port);
+ struct ocelot *ocelot = ds->priv;
+
+ return ocelot_port_lag_change(ocelot, port, dp->lag_tx_enabled);
+}
+
static int felix_vlan_prepare(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_vlan *vlan)
{
@@ -881,6 +906,9 @@ const struct dsa_switch_ops felix_switch_ops = {
.port_mdb_del = felix_mdb_del,
.port_bridge_join = felix_bridge_join,
.port_bridge_leave = felix_bridge_leave,
+ .port_lag_join = felix_lag_join,
+ .port_lag_leave = felix_lag_leave,
+ .port_lag_change = felix_lag_change,
.port_stp_state_set = felix_bridge_stp_state_set,
.port_vlan_filtering = felix_vlan_filtering,
.port_vlan_add = felix_vlan_add,
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index c31a63d9fe2a..b2fdee8a713c 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -1361,6 +1361,7 @@ int ocelot_port_lag_change(struct ocelot *ocelot, int port, bool lag_tx_active)
/* Rebalance the LAGs */
return ocelot_set_aggr_pgids(ocelot);
}
+EXPORT_SYMBOL(ocelot_port_lag_change);
/* Configure the maximum SDU (L2 payload) on RX to the value specified in @sdu.
* The length of VLAN tags is accounted for automatically via DEV_MAC_TAGS_CFG.
diff --git a/drivers/net/ethernet/mscc/ocelot.h b/drivers/net/ethernet/mscc/ocelot.h
index fc055525fd88..e3352ae7b11f 100644
--- a/drivers/net/ethernet/mscc/ocelot.h
+++ b/drivers/net/ethernet/mscc/ocelot.h
@@ -109,12 +109,6 @@ int ocelot_mact_learn(struct ocelot *ocelot, int port,
unsigned int vid, enum macaccess_entry_type type);
int ocelot_mact_forget(struct ocelot *ocelot,
const unsigned char mac[ETH_ALEN], unsigned int vid);
-int ocelot_port_lag_join(struct ocelot *ocelot, int port,
- struct net_device *bond,
- struct netdev_lag_upper_info *info);
-int ocelot_port_lag_leave(struct ocelot *ocelot, int port,
- struct net_device *bond);
-int ocelot_port_lag_change(struct ocelot *ocelot, int port, bool lag_tx_active);
struct net_device *ocelot_port_to_netdev(struct ocelot *ocelot, int port);
int ocelot_netdev_to_port(struct net_device *dev);
diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 7bd7c58a7490..d9b5d31bb181 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -796,6 +796,12 @@ int ocelot_port_mdb_add(struct ocelot *ocelot, int port,
const struct switchdev_obj_port_mdb *mdb);
int ocelot_port_mdb_del(struct ocelot *ocelot, int port,
const struct switchdev_obj_port_mdb *mdb);
+int ocelot_port_lag_join(struct ocelot *ocelot, int port,
+ struct net_device *bond,
+ struct netdev_lag_upper_info *info);
+int ocelot_port_lag_leave(struct ocelot *ocelot, int port,
+ struct net_device *bond);
+int ocelot_port_lag_change(struct ocelot *ocelot, int port, bool lag_tx_active);
int ocelot_devlink_sb_register(struct ocelot *ocelot);
void ocelot_devlink_sb_unregister(struct ocelot *ocelot);
--
2.25.1
next prev parent reply other threads:[~2021-01-16 1:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-16 0:59 [PATCH v2 net-next 00/14] LAG offload for Ocelot DSA switches Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 01/14] net: mscc: ocelot: allow offloading of bridge on top of LAG Vladimir Oltean
2021-01-17 1:26 ` Jakub Kicinski
2021-01-17 12:37 ` Vladimir Oltean
2021-01-18 19:04 ` Jakub Kicinski
2021-01-18 19:35 ` Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 02/14] net: mscc: ocelot: rename ocelot_netdevice_port_event to ocelot_netdevice_changeupper Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 03/14] net: mscc: ocelot: use a switch-case statement in ocelot_netdevice_event Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 04/14] net: mscc: ocelot: don't refuse bonding interfaces we can't offload Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 05/14] net: mscc: ocelot: use ipv6 in the aggregation code Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 06/14] net: mscc: ocelot: set up the bonding mask in a way that avoids a net_device Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 07/14] net: mscc: ocelot: avoid unneeded "lp" variable in LAG join Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 08/14] net: mscc: ocelot: use "lag" variable name in ocelot_bridge_stp_state_set Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 09/14] net: mscc: ocelot: reapply bridge forwarding mask on bonding join/leave Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 10/14] net: mscc: ocelot: set up logical port IDs centrally Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 11/14] net: mscc: ocelot: drop the use of the "lags" array Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 12/14] net: mscc: ocelot: rename aggr_count to num_ports_in_lag Vladimir Oltean
2021-01-16 0:59 ` [PATCH v2 net-next 13/14] net: mscc: ocelot: rebalance LAGs on link up/down events Vladimir Oltean
2021-01-16 0:59 ` Vladimir Oltean [this message]
2021-01-16 15:51 ` [PATCH v2 net-next 00/14] LAG offload for Ocelot DSA switches Vladimir Oltean
2021-01-17 1:25 ` Jakub Kicinski
2021-01-17 1:58 ` Jakub Kicinski
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=20210116005943.219479-15-olteanv@gmail.com \
--to=olteanv@gmail.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=fido_max@inbox.ru \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tobias@waldekranz.com \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).