From: Horatiu Vultur <horatiu.vultur@microchip.com> To: <nikolay@cumulusnetworks.com>, <roopa@cumulusnetworks.com>, <davem@davemloft.net>, <kuba@kernel.org>, <jiri@resnulli.us>, <ivecera@redhat.com>, <andrew@lunn.ch>, <UNGLinuxDriver@microchip.com>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <bridge@lists.linux-foundation.org> Cc: Horatiu Vultur <horatiu.vultur@microchip.com> Subject: [PATCH net-next 04/12] bridge: mrp: Extend br_mrp for MRP interconnect Date: Mon, 6 Jul 2020 11:18:34 +0200 [thread overview] Message-ID: <20200706091842.3324565-5-horatiu.vultur@microchip.com> (raw) In-Reply-To: <20200706091842.3324565-1-horatiu.vultur@microchip.com> This patch extends the 'struct br_mrp' to contain information regarding the MRP interconnect. It contains the following: - the interconnect port 'i_port', which is NULL if the node doesn't have a interconnect role - the interconnect id, which is similar with the ring id, but this field is also part of the MRP_InTest frames. - the interconnect role, which can be MIM or MIC. - the interconnect state, which can be open or closed. - the interconnect delayed_work for sending MRP_InTest frames and check for lost of continuity. Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> --- net/bridge/br_private_mrp.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/net/bridge/br_private_mrp.h b/net/bridge/br_private_mrp.h index 33b255e38ffec..5e612123c5605 100644 --- a/net/bridge/br_private_mrp.h +++ b/net/bridge/br_private_mrp.h @@ -12,8 +12,10 @@ struct br_mrp { struct net_bridge_port __rcu *p_port; struct net_bridge_port __rcu *s_port; + struct net_bridge_port __rcu *i_port; u32 ring_id; + u16 in_id; u16 prio; enum br_mrp_ring_role_type ring_role; @@ -21,6 +23,11 @@ struct br_mrp { enum br_mrp_ring_state_type ring_state; u32 ring_transitions; + enum br_mrp_in_role_type in_role; + u8 in_role_offloaded; + enum br_mrp_in_state_type in_state; + u32 in_transitions; + struct delayed_work test_work; u32 test_interval; unsigned long test_end; @@ -28,6 +35,12 @@ struct br_mrp { u32 test_max_miss; bool test_monitor; + struct delayed_work in_test_work; + u32 in_test_interval; + unsigned long in_test_end; + u32 in_test_count_miss; + u32 in_test_max_miss; + u32 seq_id; struct rcu_head rcu; -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Horatiu Vultur <horatiu.vultur@microchip.com> To: nikolay@cumulusnetworks.com, roopa@cumulusnetworks.com, davem@davemloft.net, kuba@kernel.org, jiri@resnulli.us, ivecera@redhat.com, andrew@lunn.ch, UNGLinuxDriver@microchip.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bridge@lists.linux-foundation.org Cc: Horatiu Vultur <horatiu.vultur@microchip.com> Subject: [Bridge] [PATCH net-next 04/12] bridge: mrp: Extend br_mrp for MRP interconnect Date: Mon, 6 Jul 2020 11:18:34 +0200 [thread overview] Message-ID: <20200706091842.3324565-5-horatiu.vultur@microchip.com> (raw) In-Reply-To: <20200706091842.3324565-1-horatiu.vultur@microchip.com> This patch extends the 'struct br_mrp' to contain information regarding the MRP interconnect. It contains the following: - the interconnect port 'i_port', which is NULL if the node doesn't have a interconnect role - the interconnect id, which is similar with the ring id, but this field is also part of the MRP_InTest frames. - the interconnect role, which can be MIM or MIC. - the interconnect state, which can be open or closed. - the interconnect delayed_work for sending MRP_InTest frames and check for lost of continuity. Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> --- net/bridge/br_private_mrp.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/net/bridge/br_private_mrp.h b/net/bridge/br_private_mrp.h index 33b255e38ffec..5e612123c5605 100644 --- a/net/bridge/br_private_mrp.h +++ b/net/bridge/br_private_mrp.h @@ -12,8 +12,10 @@ struct br_mrp { struct net_bridge_port __rcu *p_port; struct net_bridge_port __rcu *s_port; + struct net_bridge_port __rcu *i_port; u32 ring_id; + u16 in_id; u16 prio; enum br_mrp_ring_role_type ring_role; @@ -21,6 +23,11 @@ struct br_mrp { enum br_mrp_ring_state_type ring_state; u32 ring_transitions; + enum br_mrp_in_role_type in_role; + u8 in_role_offloaded; + enum br_mrp_in_state_type in_state; + u32 in_transitions; + struct delayed_work test_work; u32 test_interval; unsigned long test_end; @@ -28,6 +35,12 @@ struct br_mrp { u32 test_max_miss; bool test_monitor; + struct delayed_work in_test_work; + u32 in_test_interval; + unsigned long in_test_end; + u32 in_test_count_miss; + u32 in_test_max_miss; + u32 seq_id; struct rcu_head rcu; -- 2.27.0
next prev parent reply other threads:[~2020-07-06 9:20 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-06 9:18 [PATCH net-next 00/12] bridge: mrp: Add support for interconnect ring Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 01/12] switchdev: mrp: Extend switchdev API for MRP Interconnect Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-06 19:26 ` David Miller 2020-07-06 19:26 ` [Bridge] " David Miller 2020-07-07 10:38 ` Horatiu Vultur 2020-07-07 10:38 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 02/12] bridge: uapi: mrp: Extend MRP attributes for MRP interconnect Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-06 19:27 ` David Miller 2020-07-06 19:27 ` [Bridge] " David Miller 2020-07-07 10:39 ` Horatiu Vultur 2020-07-07 10:39 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 03/12] bridge: mrp: Extend bridge interface Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` Horatiu Vultur [this message] 2020-07-06 9:18 ` [Bridge] [PATCH net-next 04/12] bridge: mrp: Extend br_mrp for MRP interconnect Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 05/12] bridge: mrp: Rename br_mrp_port_open to br_mrp_ring_port_open Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 06/12] bridge: mrp: Add br_mrp_in_port_open function Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 07/12] bridge: switchdev: mrp: Extend MRP API for switchdev for MRP Interconnect Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 08/12] bridge: mrp: Implement the MRP Interconnect API Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-07 13:27 ` Nikolay Aleksandrov 2020-07-07 13:27 ` [Bridge] " Nikolay Aleksandrov 2020-07-07 14:11 ` Horatiu Vultur 2020-07-07 14:11 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 09/12] bridge: mrp: Extend MRP netlink interface for configuring MRP interconnect Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 10/12] bridge: uapi: mrp: Extend MRP_INFO attributes for interconnect status Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 11/12] bridge: mrp: Extend br_mrp_fill_info Horatiu Vultur 2020-07-06 9:18 ` [Bridge] " Horatiu Vultur 2020-07-06 9:18 ` [PATCH net-next 12/12] net: bridge: Add port attribute IFLA_BRPORT_MRP_IN_OPEN Horatiu Vultur 2020-07-06 9:18 ` [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=20200706091842.3324565-5-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=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.