From: Horatiu Vultur <horatiu.vultur@microchip.com>
To: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>,
<bridge@lists.linux-foundation.org>, <jiri@resnulli.us>,
<ivecera@redhat.com>, <davem@davemloft.net>,
<roopa@cumulusnetworks.com>, <nikolay@cumulusnetworks.com>,
<anirudh.venkataramanan@intel.com>, <olteanv@gmail.com>,
<andrew@lunn.ch>, <jeffrey.t.kirsher@intel.com>,
<UNGLinuxDriver@microchip.com>
Cc: Horatiu Vultur <horatiu.vultur@microchip.com>
Subject: [RFC net-next v3 07/10] net: bridge: mrp: switchdev: Implement MRP API for switchdev
Date: Fri, 24 Jan 2020 17:18:25 +0100 [thread overview]
Message-ID: <20200124161828.12206-8-horatiu.vultur@microchip.com> (raw)
In-Reply-To: <20200124161828.12206-1-horatiu.vultur@microchip.com>
Implement the MRP api for switchdev.
These functions will just eventually call the switchdev functions:
switchdev_port_obj_add/del and switchdev_port_attr_set.
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
---
net/bridge/br_mrp_switchdev.c | 147 ++++++++++++++++++++++++++++++++++
1 file changed, 147 insertions(+)
create mode 100644 net/bridge/br_mrp_switchdev.c
diff --git a/net/bridge/br_mrp_switchdev.c b/net/bridge/br_mrp_switchdev.c
new file mode 100644
index 000000000000..2226d98806de
--- /dev/null
+++ b/net/bridge/br_mrp_switchdev.c
@@ -0,0 +1,147 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <net/switchdev.h>
+
+#include "br_private_mrp.h"
+
+int br_mrp_port_switchdev_add(struct net_bridge_port *p, u32 ring_nr)
+{
+ struct net_bridge *br = p->br;
+ struct switchdev_obj_port_mrp mrp = {
+ .obj.orig_dev = br->dev,
+ .obj.id = SWITCHDEV_OBJ_ID_PORT_MRP,
+ .port = p->dev,
+ .ring_nr = ring_nr,
+ };
+ int err = 0;
+
+ err = switchdev_port_obj_add(br->dev, &mrp.obj, NULL);
+
+ if (err && err != -EOPNOTSUPP)
+ return err;
+
+ return 0;
+}
+
+int br_mrp_switchdev_set_ring_role(struct br_mrp *mrp,
+ enum br_mrp_ring_role_type role)
+{
+ struct switchdev_obj_ring_role_mrp mrp_role = {
+ .obj.orig_dev = mrp->br->dev,
+ .obj.id = SWITCHDEV_OBJ_ID_RING_ROLE_MRP,
+ .ring_role = role,
+ .ring_nr = mrp->ring_nr,
+ };
+ int err = 0;
+
+ pr_info("%s role: %d\n", __func__, role);
+
+ if (role == BR_MRP_RING_ROLE_DISABLED)
+ err = switchdev_port_obj_del(mrp->br->dev, &mrp_role.obj);
+ else
+ err = switchdev_port_obj_add(mrp->br->dev, &mrp_role.obj, NULL);
+
+ if (err && err != -EOPNOTSUPP)
+ return err;
+
+ return 0;
+}
+
+int br_mrp_switchdev_send_ring_test(struct br_mrp *mrp, u32 interval,
+ u8 max_miss)
+{
+ struct switchdev_obj_ring_test_mrp test = {
+ .obj.orig_dev = mrp->br->dev,
+ .obj.id = SWITCHDEV_OBJ_ID_RING_TEST_MRP,
+ .interval = interval,
+ .max_miss = max_miss,
+ .ring_nr = mrp->ring_nr,
+ };
+ int err = 0;
+
+ if (interval == 0)
+ err = switchdev_port_obj_del(mrp->br->dev, &test.obj);
+ else
+ err = switchdev_port_obj_add(mrp->br->dev, &test.obj, NULL);
+
+ return err;
+}
+
+int br_mrp_port_switchdev_del(struct net_bridge_port *p, u32 ring_nr)
+{
+ struct net_bridge *br = p->br;
+ struct switchdev_obj_port_mrp mrp = {
+ .obj.orig_dev = br->dev,
+ .obj.id = SWITCHDEV_OBJ_ID_PORT_MRP,
+ .port = p->dev,
+ .ring_nr = ring_nr,
+ };
+ int err = 0;
+
+ err = switchdev_port_obj_del(br->dev, &mrp.obj);
+
+ if (err && err != -EOPNOTSUPP)
+ return err;
+
+ return 0;
+}
+
+int br_mrp_port_switchdev_set_state(struct net_bridge_port *p,
+ enum br_mrp_port_state_type state)
+{
+ struct switchdev_attr attr = {
+ .orig_dev = p->dev,
+ .id = SWITCHDEV_ATTR_ID_MRP_PORT_STATE,
+ .u.mrp_port_state = state,
+ };
+ int err = 0;
+
+ pr_info("%s port: %s, state: %d\n", __func__, p->dev->name, state);
+
+ err = switchdev_port_attr_set(p->dev, &attr);
+ if (err && err != -EOPNOTSUPP)
+ br_warn(p->br, "error setting offload MRP state on port %u(%s)\n",
+ (unsigned int)p->port_no, p->dev->name);
+
+ return err;
+}
+
+int br_mrp_port_switchdev_set_role(struct net_bridge_port *p,
+ enum br_mrp_port_role_type role)
+{
+ struct switchdev_attr attr = {
+ .orig_dev = p->dev,
+ .id = SWITCHDEV_ATTR_ID_MRP_PORT_ROLE,
+ .u.mrp_port_role = role,
+ };
+ int err;
+
+ err = switchdev_port_attr_set(p->dev, &attr);
+ if (err && err != -EOPNOTSUPP)
+ return err;
+
+ return 0;
+}
+
+int br_mrp_switchdev_set_ring_state(struct br_mrp *mrp,
+ enum br_mrp_ring_state_type state)
+{
+ struct switchdev_attr attr = {
+ .id = SWITCHDEV_ATTR_ID_MRP_RING_STATE,
+ .u.mrp_ring_state = state,
+ };
+ int err = 0;
+
+ attr.orig_dev = mrp->p_port->dev,
+ err = switchdev_port_attr_set(mrp->p_port->dev, &attr);
+ if (err && err != -EOPNOTSUPP)
+ return err;
+
+ attr.orig_dev = mrp->s_port->dev;
+ err = switchdev_port_attr_set(mrp->s_port->dev, &attr);
+ if (err && err != -EOPNOTSUPP)
+ return err;
+
+ return err;
+}
+
--
2.17.1
next prev parent reply other threads:[~2020-01-24 16:19 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 16:18 [RFC net-next v3 00/10] net: bridge: mrp: Add support for Media Redundancy Protocol (MRP) Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 01/10] net: bridge: mrp: Expose mrp attributes Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 02/10] net: bridge: mrp: Expose function br_mrp_port_open Horatiu Vultur
2020-01-24 17:37 ` Andrew Lunn
2020-01-25 11:29 ` Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 03/10] net: bridge: mrp: Add MRP interface used by netlink Horatiu Vultur
2020-01-24 17:43 ` Andrew Lunn
2020-01-25 11:37 ` Horatiu Vultur
2020-01-25 15:20 ` Andrew Lunn
2020-01-25 19:16 ` Allan W. Nielsen
2020-01-26 13:28 ` Horatiu Vultur
2020-01-26 15:39 ` Andrew Lunn
2020-02-20 9:08 ` Nikolay Aleksandrov
2020-02-20 13:00 ` Allan W. Nielsen
2020-01-24 16:18 ` [RFC net-next v3 04/10] net: bridge: mrp: Add generic netlink interface to configure MRP Horatiu Vultur
2020-01-25 15:34 ` Andrew Lunn
2020-01-25 19:28 ` Allan W. Nielsen
2020-01-26 13:39 ` Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 05/10] net: bridge: mrp: Update MRP interface to add switchdev support Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 06/10] net: bridge: mrp: switchdev: Extend switchdev API to offload MRP Horatiu Vultur
2020-01-25 16:35 ` Andrew Lunn
2020-01-26 13:22 ` Horatiu Vultur
2020-01-26 15:59 ` Andrew Lunn
2020-01-27 11:04 ` Allan W. Nielsen
2020-01-27 14:41 ` Jürgen Lambrecht
[not found] ` <c5733ddb-a837-b866-54bf-c631baf36c54@televic.com>
2020-01-27 15:06 ` Andrew Lunn
2020-01-28 9:50 ` Jürgen Lambrecht
2020-01-27 11:29 ` Jürgen Lambrecht
2020-01-27 12:27 ` Allan W. Nielsen
2020-01-27 14:39 ` Jürgen Lambrecht
2020-01-28 9:58 ` Allan W. Nielsen
2020-01-24 16:18 ` Horatiu Vultur [this message]
2020-01-24 16:18 ` [RFC net-next v3 08/10] net: bridge: mrp: Connect MRP api with the switchev API Horatiu Vultur
2020-01-24 16:18 ` [RFC net-next v3 09/10] net: bridge: mrp: Integrate MRP into the bridge Horatiu Vultur
2020-01-25 15:42 ` Andrew Lunn
2020-01-26 12:49 ` Horatiu Vultur
2020-01-25 16:16 ` Andrew Lunn
2020-01-26 13:01 ` Horatiu Vultur
2020-01-26 17:12 ` Andrew Lunn
2020-01-27 10:57 ` Allan W. Nielsen
2020-01-27 13:02 ` Horatiu Vultur
2020-01-27 13:40 ` Andrew Lunn
2020-01-28 9:56 ` Jürgen Lambrecht
2020-01-28 10:17 ` Allan W. Nielsen
2020-01-24 16:18 ` [RFC net-next v3 10/10] net: bridge: mrp: Update Kconfig and Makefile Horatiu Vultur
2020-01-24 20:34 ` [RFC net-next v3 00/10] net: bridge: mrp: Add support for Media Redundancy Protocol (MRP) Allan W. Nielsen
2020-01-24 21:05 ` Vinicius Costa Gomes
2020-01-25 9:44 ` Allan W. Nielsen
2020-01-25 16:23 ` Andrew Lunn
2020-01-25 19:12 ` Allan W. Nielsen
2020-01-25 21:18 ` Vinicius Costa Gomes
2020-01-28 10:35 ` Jürgen Lambrecht
2020-02-18 12:18 ` Allan W. Nielsen
2020-02-18 16:55 ` Jakub Kicinski
2020-02-20 10:48 ` Nikolay Aleksandrov
2020-02-20 12:58 ` Allan W. Nielsen
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=20200124161828.12206-8-horatiu.vultur@microchip.com \
--to=horatiu.vultur@microchip.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=anirudh.venkataramanan@intel.com \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=ivecera@redhat.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jiri@resnulli.us \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=olteanv@gmail.com \
--cc=roopa@cumulusnetworks.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
all inboxes | Powered by JetHome®