mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: hsr: Add VLAN CTAG filter support

Browse Source 
This patch adds support for VLAN ctag based filtering at slave devices.
The slave ethernet device may be capable of filtering ethernet packets
based on VLAN ID. This requires that when the VLAN interface is created
over an HSR/PRP interface, it passes the VID information to the
associated slave ethernet devices so that it updates the hardware
filters to filter ethernet frames based on VID. This patch adds the
required functions to propagate the vid information to the slave
devices.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Link: https://patch.msgid.link/20241106091710.3308519-3-danishanwar@ti.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Murali Karicheri 2024-11-06 14:47:08 +05:30 committed by Jakub Kicinski
parent d977d7eb09
commit 1a8a63a530
1 changed files with 79 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
net/hsr/hsr_device.c
View File

@ -515,6 +515,77 @@ static void hsr_change_rx_flags(struct net_device *dev, int change)
} }
} }
static int hsr_ndo_vlan_rx_add_vid(struct net_device *dev,
__be16 proto, u16 vid)
{
bool is_slave_a_added = false;
bool is_slave_b_added = false;
struct hsr_port *port;
struct hsr_priv *hsr;
int ret = 0;
hsr = netdev_priv(dev);
hsr_for_each_port(hsr, port) {
if (port->type == HSR_PT_MASTER ||
port->type == HSR_PT_INTERLINK)
continue;
ret = vlan_vid_add(port->dev, proto, vid);
switch (port->type) {
case HSR_PT_SLAVE_A:
if (ret) {
/* clean up Slave-B */
netdev_err(dev, "add vid failed for Slave-A\n");
if (is_slave_b_added)
vlan_vid_del(port->dev, proto, vid);
return ret;
}
is_slave_a_added = true;
break;
case HSR_PT_SLAVE_B:
if (ret) {
/* clean up Slave-A */
netdev_err(dev, "add vid failed for Slave-B\n");
if (is_slave_a_added)
vlan_vid_del(port->dev, proto, vid);
return ret;
}
is_slave_b_added = true;
break;
default:
break;
}
}
return 0;
}
static int hsr_ndo_vlan_rx_kill_vid(struct net_device *dev,
__be16 proto, u16 vid)
{
struct hsr_port *port;
struct hsr_priv *hsr;
hsr = netdev_priv(dev);
hsr_for_each_port(hsr, port) {
switch (port->type) {
case HSR_PT_SLAVE_A:
case HSR_PT_SLAVE_B:
vlan_vid_del(port->dev, proto, vid);
break;
default:
break;
}
}
return 0;
}
static const struct net_device_ops hsr_device_ops = { static const struct net_device_ops hsr_device_ops = {
.ndo_change_mtu = hsr_dev_change_mtu, .ndo_change_mtu = hsr_dev_change_mtu,
.ndo_open = hsr_dev_open, .ndo_open = hsr_dev_open,
@ -523,6 +594,8 @@ static const struct net_device_ops hsr_device_ops = {
.ndo_change_rx_flags = hsr_change_rx_flags, .ndo_change_rx_flags = hsr_change_rx_flags,
.ndo_fix_features = hsr_fix_features, .ndo_fix_features = hsr_fix_features,
.ndo_set_rx_mode = hsr_set_rx_mode, .ndo_set_rx_mode = hsr_set_rx_mode,
.ndo_vlan_rx_add_vid = hsr_ndo_vlan_rx_add_vid,
.ndo_vlan_rx_kill_vid = hsr_ndo_vlan_rx_kill_vid,
}; };
static const struct device_type hsr_type = { static const struct device_type hsr_type = {
@ -569,7 +642,8 @@ void hsr_dev_setup(struct net_device *dev)
dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA | dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
NETIF_F_GSO_MASK | NETIF_F_HW_CSUM | NETIF_F_GSO_MASK | NETIF_F_HW_CSUM |
NETIF_F_HW_VLAN_CTAG_TX; NETIF_F_HW_VLAN_CTAG_TX |
NETIF_F_HW_VLAN_CTAG_FILTER;
dev->features = dev->hw_features; dev->features = dev->hw_features;
} }
@ -647,6 +721,10 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
(slave[1]->features & NETIF_F_HW_HSR_FWD)) (slave[1]->features & NETIF_F_HW_HSR_FWD))
hsr->fwd_offloaded = true; hsr->fwd_offloaded = true;
if ((slave[0]->features & NETIF_F_HW_VLAN_CTAG_FILTER) &&
(slave[1]->features & NETIF_F_HW_VLAN_CTAG_FILTER))
hsr_dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
res = register_netdevice(hsr_dev); res = register_netdevice(hsr_dev);
if (res) if (res)
goto err_unregister; goto err_unregister;