From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Ido Schimmel <idosch@mellanox.com>,
linux-kernel@vger.kernel.org (open list),
devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM),
bridge@lists.linux-foundation.org (moderated list:ETHERNET
BRIDGE),
jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com
Subject: [PATCH net-next 13/16] net: mscc: ocelot: Handle SWITCHDEV_PORT_ATTR_SET
Date: Fri, 8 Feb 2019 16:32:45 -0800 [thread overview]
Message-ID: <20190209003248.31088-14-f.fainelli@gmail.com> (raw)
In-Reply-To: <20190209003248.31088-1-f.fainelli@gmail.com>
Following patches will change the way we communicate getting or setting
a port's attribute and use a blocking notifier to perform those tasks.
Prepare ocelot to support receiving notifier events targeting
SWITCHDEV_PORT_ATTR_SET and simply translate that into the existing
ocelot_port_attr_set() call.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/mscc/ocelot.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 195306d05bcd..adab478d36f1 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -1324,10 +1324,6 @@ static int ocelot_port_obj_del(struct net_device *dev,
return ret;
}
-static const struct switchdev_ops ocelot_port_switchdev_ops = {
- .switchdev_port_attr_set = ocelot_port_attr_set,
-};
-
static int ocelot_port_bridge_join(struct ocelot_port *ocelot_port,
struct net_device *bridge)
{
@@ -1582,6 +1578,24 @@ struct notifier_block ocelot_netdevice_nb __read_mostly = {
};
EXPORT_SYMBOL(ocelot_netdevice_nb);
+static int
+ocelot_switchdev_port_attr_event(unsigned long event,
+ struct net_device *netdev,
+ struct switchdev_notifier_port_attr_info *port_attr_info)
+{
+ int err = -EOPNOTSUPP;
+
+ switch (event) {
+ case SWITCHDEV_PORT_ATTR_SET:
+ err = ocelot_port_attr_set(netdev, port_attr_info->attr,
+ port_attr_info->trans);
+ break;
+ }
+
+ port_attr_info->handled = true;
+ return notifier_from_errno(err);
+}
+
static int ocelot_switchdev_blocking_event(struct notifier_block *unused,
unsigned long event, void *ptr)
{
@@ -1600,6 +1614,8 @@ static int ocelot_switchdev_blocking_event(struct notifier_block *unused,
ocelot_netdevice_dev_check,
ocelot_port_obj_del);
return notifier_from_errno(err);
+ case SWITCHDEV_PORT_ATTR_SET:
+ return ocelot_switchdev_port_attr_event(event, dev, ptr);
}
return NOTIFY_DONE;
--
2.17.1
next prev parent reply other threads:[~2019-02-09 0:34 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-09 0:32 [PATCH net-next 00/16] net: Remove switchdev_ops Florian Fainelli
2019-02-09 0:32 ` [PATCH net-next 01/16] Documentation: networking: switchdev: Update port parent ID section Florian Fainelli
2019-02-09 17:22 ` Jiri Pirko
2019-02-09 0:32 ` [PATCH net-next 02/16] mlxsw: spectrum: Check bridge flags during prepare phase Florian Fainelli
2019-02-09 17:48 ` Jiri Pirko
2019-02-09 0:32 ` [PATCH net-next 03/16] staging: fsl-dpaa2: ethsw: Check bridge port flags during set Florian Fainelli
2019-02-09 17:48 ` Jiri Pirko
2019-02-09 0:32 ` [PATCH net-next 04/16] net: dsa: Add setter for SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS Florian Fainelli
2019-02-09 17:48 ` Jiri Pirko
2019-02-09 0:32 ` [PATCH net-next 05/16] rocker: Check bridge flags during prepare phase Florian Fainelli
2019-02-09 17:48 ` Jiri Pirko
2019-02-09 0:32 ` [PATCH net-next 06/16] net: bridge: Stop calling switchdev_port_attr_get() Florian Fainelli
2019-02-09 17:48 ` Jiri Pirko
2019-02-09 0:32 ` [PATCH net-next 07/16] net: Remove SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT Florian Fainelli
2019-02-09 17:49 ` Jiri Pirko
2019-02-09 0:32 ` [PATCH net-next 08/16] net: Get rid of switchdev_port_attr_get() Florian Fainelli
2019-02-09 18:15 ` Jiri Pirko
2019-02-09 0:32 ` [PATCH net-next 09/16] switchdev: Add SWITCHDEV_PORT_ATTR_SET Florian Fainelli
2019-02-09 18:18 ` Jiri Pirko
2019-02-09 0:32 ` [PATCH net-next 10/16] rocker: Handle SWITCHDEV_PORT_ATTR_SET Florian Fainelli
2019-02-09 18:21 ` Jiri Pirko
2019-02-09 18:24 ` Jiri Pirko
2019-02-10 4:20 ` Florian Fainelli
2019-02-09 0:32 ` [PATCH net-next 11/16] net: dsa: " Florian Fainelli
2019-02-09 0:32 ` [PATCH net-next 12/16] mlxsw: spectrum_switchdev: " Florian Fainelli
2019-02-09 0:32 ` Florian Fainelli [this message]
2019-02-09 0:32 ` [PATCH net-next 14/16] staging: fsl-dpaa2: ethsw: " Florian Fainelli
2019-02-09 0:32 ` [PATCH net-next 15/16] net: switchdev: Replace port attr set SDO with a notification Florian Fainelli
2019-02-09 0:36 ` Florian Fainelli
2019-02-09 20:38 ` Jiri Pirko
2019-02-09 0:32 ` [PATCH net-next 16/16] net: Remove switchdev_ops Florian Fainelli
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=20190209003248.31088-14-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=andrew@lunn.ch \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=devel@driverdev.osuosl.org \
--cc=idosch@mellanox.com \
--cc=jiri@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--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).