bridge: switchdev: mrp: Extend MRP API for switchdev for MRP Interconnect

Implement the MRP API for interconnect switchdev. Similar with the other
br_mrp_switchdev function, these function will just eventually call the
switchdev functions: switchdev_port_obj_add/del.

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_mrp_switchdev.c b/net/bridge/br_mrp_switchdev.c
index 0da68a0da4b5a003729bbfcf46a57b32ae8003c7..ed547e03ace173565b3ceaaf9d371bf40197931a 100644 (file)
--- a/net/bridge/br_mrp_switchdev.c
+++ b/net/bridge/br_mrp_switchdev.c
@@ -107,6 +107,68 @@ int br_mrp_switchdev_set_ring_state(struct net_bridge *br,
        return 0;
 }
 
+int br_mrp_switchdev_set_in_role(struct net_bridge *br, struct br_mrp *mrp,
+                                u16 in_id, u32 ring_id,
+                                enum br_mrp_in_role_type role)
+{
+       struct switchdev_obj_in_role_mrp mrp_role = {
+               .obj.orig_dev = br->dev,
+               .obj.id = SWITCHDEV_OBJ_ID_IN_ROLE_MRP,
+               .in_role = role,
+               .in_id = mrp->in_id,
+               .ring_id = mrp->ring_id,
+               .i_port = rtnl_dereference(mrp->i_port)->dev,
+       };
+       int err;
+
+       if (role == BR_MRP_IN_ROLE_DISABLED)
+               err = switchdev_port_obj_del(br->dev, &mrp_role.obj);
+       else
+               err = switchdev_port_obj_add(br->dev, &mrp_role.obj, NULL);
+
+       return err;
+}
+
+int br_mrp_switchdev_set_in_state(struct net_bridge *br, struct br_mrp *mrp,
+                                 enum br_mrp_in_state_type state)
+{
+       struct switchdev_obj_in_state_mrp mrp_state = {
+               .obj.orig_dev = br->dev,
+               .obj.id = SWITCHDEV_OBJ_ID_IN_STATE_MRP,
+               .in_state = state,
+               .in_id = mrp->in_id,
+       };
+       int err;
+
+       err = switchdev_port_obj_add(br->dev, &mrp_state.obj, NULL);
+
+       if (err && err != -EOPNOTSUPP)
+               return err;
+
+       return 0;
+}
+
+int br_mrp_switchdev_send_in_test(struct net_bridge *br, struct br_mrp *mrp,
+                                 u32 interval, u8 max_miss, u32 period)
+{
+       struct switchdev_obj_in_test_mrp test = {
+               .obj.orig_dev = br->dev,
+               .obj.id = SWITCHDEV_OBJ_ID_IN_TEST_MRP,
+               .interval = interval,
+               .max_miss = max_miss,
+               .in_id = mrp->in_id,
+               .period = period,
+       };
+       int err;
+
+       if (interval == 0)
+               err = switchdev_port_obj_del(br->dev, &test.obj);
+       else
+               err = switchdev_port_obj_add(br->dev, &test.obj, NULL);
+
+       return err;
+}
+
 int br_mrp_port_switchdev_set_state(struct net_bridge_port *p,
                                    enum br_mrp_port_state_type state)
 {

diff --git a/net/bridge/br_private_mrp.h b/net/bridge/br_private_mrp.h
index 23da2f956ad0e9469249cefa85d1a1aedd199bf9..0d554ef88db85f44b0dbeafd7b160f20f485c583 100644 (file)
--- a/net/bridge/br_private_mrp.h
+++ b/net/bridge/br_private_mrp.h
@@ -72,6 +72,13 @@ int br_mrp_port_switchdev_set_state(struct net_bridge_port *p,
                                    enum br_mrp_port_state_type state);
 int br_mrp_port_switchdev_set_role(struct net_bridge_port *p,
                                   enum br_mrp_port_role_type role);
+int br_mrp_switchdev_set_in_role(struct net_bridge *br, struct br_mrp *mrp,
+                                u16 in_id, u32 ring_id,
+                                enum br_mrp_in_role_type role);
+int br_mrp_switchdev_set_in_state(struct net_bridge *br, struct br_mrp *mrp,
+                                 enum br_mrp_in_state_type state);
+int br_mrp_switchdev_send_in_test(struct net_bridge *br, struct br_mrp *mrp,
+                                 u32 interval, u8 max_miss, u32 period);
 
 /* br_mrp_netlink.c  */
 int br_mrp_ring_port_open(struct net_device *dev, u8 loc);