include/linux/if_hsr.h | 8 ++++++++ net/hsr/hsr_device.c | 20 ++++++++++++++++++++ net/hsr/hsr_slave.c | 7 ++++--- 3 files changed, 32 insertions(+), 3 deletions(-)
If a switch device has HSR hardware ability and HSR configuration
offload to hardware. The device driver needs to get the HSR port type
when joining the port to HSR. Different port types require different
settings for the hardware, like HSR_PT_SLAVE_A, HSR_PT_SLAVE_B, and
HSR_PT_INTERLINK. Create the API hsr_get_port_type() and export it.
When the hsr_get_port_type() is called in the device driver, if the port
can be found in the HSR port list, the HSR port type can be obtained.
Therefore, before calling the device driver, we need to first add the
hsr_port to the HSR port list.
Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
---
include/linux/if_hsr.h | 8 ++++++++
net/hsr/hsr_device.c | 20 ++++++++++++++++++++
net/hsr/hsr_slave.c | 7 ++++---
3 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/include/linux/if_hsr.h b/include/linux/if_hsr.h
index d7941fd88032..4d6452ca2ac8 100644
--- a/include/linux/if_hsr.h
+++ b/include/linux/if_hsr.h
@@ -43,6 +43,8 @@ extern bool is_hsr_master(struct net_device *dev);
extern int hsr_get_version(struct net_device *dev, enum hsr_version *ver);
struct net_device *hsr_get_port_ndev(struct net_device *ndev,
enum hsr_port_type pt);
+extern int hsr_get_port_type(struct net_device *hsr_dev, struct net_device *dev,
+ enum hsr_port_type *type);
#else
static inline bool is_hsr_master(struct net_device *dev)
{
@@ -59,6 +61,12 @@ static inline struct net_device *hsr_get_port_ndev(struct net_device *ndev,
{
return ERR_PTR(-EINVAL);
}
+
+static inline int hsr_get_port_type(struct net_device *hsr_dev, struct net_device *dev,
+ enum hsr_port_type *type)
+{
+ return -EINVAL;
+}
#endif /* CONFIG_HSR */
#endif /*_LINUX_IF_HSR_H_*/
diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 88657255fec1..d4bea847527c 100644
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -679,6 +679,26 @@ struct net_device *hsr_get_port_ndev(struct net_device *ndev,
}
EXPORT_SYMBOL(hsr_get_port_ndev);
+/* Get hsr port type, return -EINVAL if not get.
+ */
+int hsr_get_port_type(struct net_device *hsr_dev, struct net_device *dev, enum hsr_port_type *type)
+{
+ struct hsr_priv *hsr;
+ struct hsr_port *port;
+
+ hsr = netdev_priv(hsr_dev);
+
+ hsr_for_each_port(hsr, port) {
+ if (port->dev == dev) {
+ *type = port->type;
+ return 0;
+ }
+ }
+
+ return -EINVAL;
+}
+EXPORT_SYMBOL(hsr_get_port_type);
+
/* Default multicast address for HSR Supervision frames */
static const unsigned char def_multicast_addr[ETH_ALEN] __aligned(2) = {
0x01, 0x15, 0x4e, 0x00, 0x01, 0x00
diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index b87b6a6fe070..e11ab1ed3320 100644
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -198,14 +198,14 @@ int hsr_add_port(struct hsr_priv *hsr, struct net_device *dev,
port->type = type;
ether_addr_copy(port->original_macaddress, dev->dev_addr);
+ list_add_tail_rcu(&port->port_list, &hsr->ports);
+
if (type != HSR_PT_MASTER) {
res = hsr_portdev_setup(hsr, dev, port, extack);
if (res)
goto fail_dev_setup;
}
- list_add_tail_rcu(&port->port_list, &hsr->ports);
-
master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
netdev_update_features(master->dev);
dev_set_mtu(master->dev, hsr_get_max_mtu(hsr));
@@ -213,7 +213,8 @@ int hsr_add_port(struct hsr_priv *hsr, struct net_device *dev,
return 0;
fail_dev_setup:
- kfree(port);
+ list_del_rcu(&port->port_list);
+ kfree_rcu(port, rcu);
return res;
}
--
2.17.1Hi Xiaoliang, On Wed, Jul 23, 2025 at 06:06:05PM +0800, Xiaoliang Yang wrote: > If a switch device has HSR hardware ability and HSR configuration > offload to hardware. The device driver needs to get the HSR port type > when joining the port to HSR. Different port types require different > settings for the hardware, like HSR_PT_SLAVE_A, HSR_PT_SLAVE_B, and > HSR_PT_INTERLINK. Create the API hsr_get_port_type() and export it. > > When the hsr_get_port_type() is called in the device driver, if the port > can be found in the HSR port list, the HSR port type can be obtained. > Therefore, before calling the device driver, we need to first add the > hsr_port to the HSR port list. > > Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com> > --- An API with no callers will never be accepted. You need to post the user together with this change, for the maintainers to have the full picture and see whether it is the best way to solve the problem.
© 2016 - 2025 Red Hat, Inc.