From: Horatiu Vultur <horatiu.vultur@microchip.com> To: <nikolay@cumulusnetworks.com>, <davem@davemloft.net>, <jiri@resnulli.us>, <ivecera@redhat.com>, <kuba@kernel.org>, <roopa@cumulusnetworks.com>, <olteanv@gmail.com>, <andrew@lunn.ch>, <UNGLinuxDriver@microchip.com>, <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>, <bridge@lists.linux-foundation.org> Cc: Horatiu Vultur <horatiu.vultur@microchip.com> Subject: [PATCH net-next 07/13] switchdev: mrp: Extend switchdev API to offload MRP Date: Mon, 20 Apr 2020 17:09:41 +0200 [thread overview] Message-ID: <20200420150947.30974-8-horatiu.vultur@microchip.com> (raw) In-Reply-To: <20200420150947.30974-1-horatiu.vultur@microchip.com> Extend switchdev API to add support for MRP. The HW is notified in following cases: SWITCHDEV_OBJ_ID_MRP: This is used when a MRP instance is added/removed from the MRP ring. SWITCHDEV_OBJ_ID_RING_ROLE_MRP: This is used when the role of the node changes. The current supported roles are MRM and MRC. SWITCHDEV_OBJ_ID_RING_TEST_MRP: This is used when to start/stop sending MRP_Test frames on the mrp ring ports. This is called only on nodes that have the role MRM. In case this fails then the SW will generate the frames. SWITCHDEV_OBJ_ID_RING_STATE_STATE: This is used when the ring changes it states to open or closed. This is required to notify HW because the MRP_Test frame contains the field MRP_InState which contains this information. SWITCHDEV_ATTR_ID_MRP_PORT_STATE: This is used when the port's state is changed. It can be in blocking/forwarding mode. SWITCHDEV_ATTR_ID_MRP_PORT_ROLE: This is used when port's role changes. The roles of the port can be primary/secondary. This is required to notify HW because the MRP_Test frame contains the field MRP_PortRole that contains this information. Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> --- include/net/switchdev.h | 62 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/include/net/switchdev.h b/include/net/switchdev.h index aee86a189432..ae7aeb0d1f9c 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -40,6 +40,10 @@ enum switchdev_attr_id { SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING, SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED, SWITCHDEV_ATTR_ID_BRIDGE_MROUTER, +#if IS_ENABLED(CONFIG_BRIDGE_MRP) + SWITCHDEV_ATTR_ID_MRP_PORT_STATE, + SWITCHDEV_ATTR_ID_MRP_PORT_ROLE, +#endif }; struct switchdev_attr { @@ -55,6 +59,11 @@ struct switchdev_attr { clock_t ageing_time; /* BRIDGE_AGEING_TIME */ bool vlan_filtering; /* BRIDGE_VLAN_FILTERING */ bool mc_disabled; /* MC_DISABLED */ +#if IS_ENABLED(CONFIG_BRIDGE_MRP) + u8 mrp_port_state; /* MRP_PORT_STATE */ + u8 mrp_port_role; /* MRP_PORT_ROLE */ + u8 mrp_ring_state; /* MRP_RING_STATE */ +#endif } u; }; @@ -63,6 +72,12 @@ enum switchdev_obj_id { SWITCHDEV_OBJ_ID_PORT_VLAN, SWITCHDEV_OBJ_ID_PORT_MDB, SWITCHDEV_OBJ_ID_HOST_MDB, +#if IS_ENABLED(CONFIG_BRIDGE_MRP) + SWITCHDEV_OBJ_ID_MRP, + SWITCHDEV_OBJ_ID_RING_TEST_MRP, + SWITCHDEV_OBJ_ID_RING_ROLE_MRP, + SWITCHDEV_OBJ_ID_RING_STATE_MRP, +#endif }; struct switchdev_obj { @@ -94,6 +109,53 @@ struct switchdev_obj_port_mdb { #define SWITCHDEV_OBJ_PORT_MDB(OBJ) \ container_of((OBJ), struct switchdev_obj_port_mdb, obj) + +#if IS_ENABLED(CONFIG_BRIDGE_MRP) +/* SWITCHDEV_OBJ_ID_MRP */ +struct switchdev_obj_mrp { + struct switchdev_obj obj; + struct net_device *p_port; + struct net_device *s_port; + u32 ring_id; +}; + +#define SWITCHDEV_OBJ_MRP(OBJ) \ + container_of((OBJ), struct switchdev_obj_mrp, obj) + +/* SWITCHDEV_OBJ_ID_RING_TEST_MRP */ +struct switchdev_obj_ring_test_mrp { + struct switchdev_obj obj; + /* The value is in us and a value of 0 represents to stop */ + u32 interval; + u8 max_miss; + u32 ring_id; + u32 period; +}; + +#define SWITCHDEV_OBJ_RING_TEST_MRP(OBJ) \ + container_of((OBJ), struct switchdev_obj_ring_test_mrp, obj) + +/* SWICHDEV_OBJ_ID_RING_ROLE_MRP */ +struct switchdev_obj_ring_role_mrp { + struct switchdev_obj obj; + u8 ring_role; + u32 ring_id; +}; + +#define SWITCHDEV_OBJ_RING_ROLE_MRP(OBJ) \ + container_of((OBJ), struct switchdev_obj_ring_role_mrp, obj) + +struct switchdev_obj_ring_state_mrp { + struct switchdev_obj obj; + u8 ring_state; + u32 ring_id; +}; + +#define SWITCHDEV_OBJ_RING_STATE_MRP(OBJ) \ + container_of((OBJ), struct switchdev_obj_ring_state_mrp, obj) + +#endif + typedef int switchdev_obj_dump_cb_t(struct switchdev_obj *obj); enum switchdev_notifier_type { -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Horatiu Vultur <horatiu.vultur@microchip.com> To: nikolay@cumulusnetworks.com, davem@davemloft.net, jiri@resnulli.us, ivecera@redhat.com, kuba@kernel.org, roopa@cumulusnetworks.com, olteanv@gmail.com, andrew@lunn.ch, UNGLinuxDriver@microchip.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bridge@lists.linux-foundation.org Cc: Horatiu Vultur <horatiu.vultur@microchip.com> Subject: [Bridge] [PATCH net-next 07/13] switchdev: mrp: Extend switchdev API to offload MRP Date: Mon, 20 Apr 2020 17:09:41 +0200 [thread overview] Message-ID: <20200420150947.30974-8-horatiu.vultur@microchip.com> (raw) In-Reply-To: <20200420150947.30974-1-horatiu.vultur@microchip.com> Extend switchdev API to add support for MRP. The HW is notified in following cases: SWITCHDEV_OBJ_ID_MRP: This is used when a MRP instance is added/removed from the MRP ring. SWITCHDEV_OBJ_ID_RING_ROLE_MRP: This is used when the role of the node changes. The current supported roles are MRM and MRC. SWITCHDEV_OBJ_ID_RING_TEST_MRP: This is used when to start/stop sending MRP_Test frames on the mrp ring ports. This is called only on nodes that have the role MRM. In case this fails then the SW will generate the frames. SWITCHDEV_OBJ_ID_RING_STATE_STATE: This is used when the ring changes it states to open or closed. This is required to notify HW because the MRP_Test frame contains the field MRP_InState which contains this information. SWITCHDEV_ATTR_ID_MRP_PORT_STATE: This is used when the port's state is changed. It can be in blocking/forwarding mode. SWITCHDEV_ATTR_ID_MRP_PORT_ROLE: This is used when port's role changes. The roles of the port can be primary/secondary. This is required to notify HW because the MRP_Test frame contains the field MRP_PortRole that contains this information. Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> --- include/net/switchdev.h | 62 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/include/net/switchdev.h b/include/net/switchdev.h index aee86a189432..ae7aeb0d1f9c 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -40,6 +40,10 @@ enum switchdev_attr_id { SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING, SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED, SWITCHDEV_ATTR_ID_BRIDGE_MROUTER, +#if IS_ENABLED(CONFIG_BRIDGE_MRP) + SWITCHDEV_ATTR_ID_MRP_PORT_STATE, + SWITCHDEV_ATTR_ID_MRP_PORT_ROLE, +#endif }; struct switchdev_attr { @@ -55,6 +59,11 @@ struct switchdev_attr { clock_t ageing_time; /* BRIDGE_AGEING_TIME */ bool vlan_filtering; /* BRIDGE_VLAN_FILTERING */ bool mc_disabled; /* MC_DISABLED */ +#if IS_ENABLED(CONFIG_BRIDGE_MRP) + u8 mrp_port_state; /* MRP_PORT_STATE */ + u8 mrp_port_role; /* MRP_PORT_ROLE */ + u8 mrp_ring_state; /* MRP_RING_STATE */ +#endif } u; }; @@ -63,6 +72,12 @@ enum switchdev_obj_id { SWITCHDEV_OBJ_ID_PORT_VLAN, SWITCHDEV_OBJ_ID_PORT_MDB, SWITCHDEV_OBJ_ID_HOST_MDB, +#if IS_ENABLED(CONFIG_BRIDGE_MRP) + SWITCHDEV_OBJ_ID_MRP, + SWITCHDEV_OBJ_ID_RING_TEST_MRP, + SWITCHDEV_OBJ_ID_RING_ROLE_MRP, + SWITCHDEV_OBJ_ID_RING_STATE_MRP, +#endif }; struct switchdev_obj { @@ -94,6 +109,53 @@ struct switchdev_obj_port_mdb { #define SWITCHDEV_OBJ_PORT_MDB(OBJ) \ container_of((OBJ), struct switchdev_obj_port_mdb, obj) + +#if IS_ENABLED(CONFIG_BRIDGE_MRP) +/* SWITCHDEV_OBJ_ID_MRP */ +struct switchdev_obj_mrp { + struct switchdev_obj obj; + struct net_device *p_port; + struct net_device *s_port; + u32 ring_id; +}; + +#define SWITCHDEV_OBJ_MRP(OBJ) \ + container_of((OBJ), struct switchdev_obj_mrp, obj) + +/* SWITCHDEV_OBJ_ID_RING_TEST_MRP */ +struct switchdev_obj_ring_test_mrp { + struct switchdev_obj obj; + /* The value is in us and a value of 0 represents to stop */ + u32 interval; + u8 max_miss; + u32 ring_id; + u32 period; +}; + +#define SWITCHDEV_OBJ_RING_TEST_MRP(OBJ) \ + container_of((OBJ), struct switchdev_obj_ring_test_mrp, obj) + +/* SWICHDEV_OBJ_ID_RING_ROLE_MRP */ +struct switchdev_obj_ring_role_mrp { + struct switchdev_obj obj; + u8 ring_role; + u32 ring_id; +}; + +#define SWITCHDEV_OBJ_RING_ROLE_MRP(OBJ) \ + container_of((OBJ), struct switchdev_obj_ring_role_mrp, obj) + +struct switchdev_obj_ring_state_mrp { + struct switchdev_obj obj; + u8 ring_state; + u32 ring_id; +}; + +#define SWITCHDEV_OBJ_RING_STATE_MRP(OBJ) \ + container_of((OBJ), struct switchdev_obj_ring_state_mrp, obj) + +#endif + typedef int switchdev_obj_dump_cb_t(struct switchdev_obj *obj); enum switchdev_notifier_type { -- 2.17.1
next prev parent reply other threads:[~2020-04-20 15:12 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-20 15:09 [PATCH net-next 00/13] net: bridge: mrp: Add support for Media Redundancy Protocol(MRP) Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 01/13] bridge: uapi: mrp: Add mrp attributes Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 02/13] net: bridge: Add port attribute IFLA_BRPORT_MRP_RING_OPEN Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 03/13] bridge: mrp: Update Kconfig Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 04/13] bridge: mrp: Expose function br_mrp_port_open Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 17:30 ` Nikolay Aleksandrov 2020-04-20 17:30 ` [Bridge] " Nikolay Aleksandrov 2020-04-20 19:26 ` Horatiu Vultur 2020-04-20 19:26 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 05/13] bridge: mrp: Add MRP interface Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 06/13] bridge: mrp: Extend bridge interface Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` Horatiu Vultur [this message] 2020-04-20 15:09 ` [Bridge] [PATCH net-next 07/13] switchdev: mrp: Extend switchdev API to offload MRP Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 08/13] bridge: switchdev: mrp: Implement MRP API for switchdev Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 09/13] bridge: mrp: Connect MRP API with the switchev API Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 17:17 ` Nikolay Aleksandrov 2020-04-20 17:17 ` [Bridge] " Nikolay Aleksandrov 2020-04-20 19:13 ` Horatiu Vultur 2020-04-20 19:13 ` [Bridge] " Horatiu Vultur 2020-04-21 8:44 ` Nikolay Aleksandrov 2020-04-21 8:44 ` [Bridge] " Nikolay Aleksandrov 2020-04-21 9:31 ` Horatiu Vultur 2020-04-21 9:31 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 10/13] bridge: mrp: Implement netlink interface to configure MRP Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 17:18 ` Nikolay Aleksandrov 2020-04-20 17:18 ` [Bridge] " Nikolay Aleksandrov 2020-04-20 19:16 ` Horatiu Vultur 2020-04-20 19:16 ` [Bridge] " Horatiu Vultur 2020-04-21 8:47 ` Nikolay Aleksandrov 2020-04-21 8:47 ` [Bridge] " Nikolay Aleksandrov 2020-04-21 9:17 ` Horatiu Vultur 2020-04-21 9:17 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 11/13] bridge: mrp: Update Makefile Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 12/13] bridge: mrp: Integrate MRP into the bridge Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur 2020-04-20 15:09 ` [PATCH net-next 13/13] net: bridge: Add checks for enabling the STP Horatiu Vultur 2020-04-20 15:09 ` [Bridge] " Horatiu Vultur
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=20200420150947.30974-8-horatiu.vultur@microchip.com \ --to=horatiu.vultur@microchip.com \ --cc=UNGLinuxDriver@microchip.com \ --cc=andrew@lunn.ch \ --cc=bridge@lists.linux-foundation.org \ --cc=davem@davemloft.net \ --cc=ivecera@redhat.com \ --cc=jiri@resnulli.us \ --cc=kuba@kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.