From: Michael Dege <michael.dege@renesas.com>
To: "Yoshihiro Shimoda" <yoshihiro.shimoda.uh@renesas.com>,
"Andrew Lunn" <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
"Paul Barker" <paul@pbarker.dev>
Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
linux-kernel@vger.kernel.org,
Michael Dege <michael.dege@renesas.com>
Subject: [PATCH net-next v4 12/13] net: renesas: rswitch: add handler for FDB notification
Date: Mon, 11 May 2026 10:52:15 +0200 [thread overview]
Message-ID: <20260511-rswitch_add_vlans-v4-12-a5a225f8faae@renesas.com> (raw)
In-Reply-To: <20260511-rswitch_add_vlans-v4-0-a5a225f8faae@renesas.com>
The SWITCHDEV_FDB_ADD_TO_DEVICE notification writes the bridge MAC address
to the GWCA and adds a static rule to the MAC table.
The SWITCHDEV_FDB_DEL_TO_DEVICE removes the static rule from the MAC table.
Signed-off-by: Michael Dege <michael.dege@renesas.com>
---
drivers/net/ethernet/renesas/rswitch.h | 9 ++
drivers/net/ethernet/renesas/rswitch_l2.c | 196 ++++++++++++++++++++++++++----
2 files changed, 182 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/renesas/rswitch.h
index 949f0cb3c64e..3689463ddb1d 100644
--- a/drivers/net/ethernet/renesas/rswitch.h
+++ b/drivers/net/ethernet/renesas/rswitch.h
@@ -1213,11 +1213,20 @@ struct rswitch_private {
bool etha_no_runtime_change;
bool gwca_halt;
struct net_device *offload_brdev;
+ netdevice_tracker dev_tracker;
enum hwtstamp_tx_types tstamp_tx_ctrl;
enum hwtstamp_rx_filters tstamp_rx_ctrl;
};
+struct rswitch_switchdev_event_work {
+ struct work_struct work;
+ struct switchdev_notifier_fdb_info fdb_info;
+ struct net_device *ndev;
+ struct rswitch_private *priv;
+ unsigned long event;
+};
+
bool is_rdev(const struct net_device *ndev);
void rswitch_modify(void __iomem *addr, enum rswitch_reg reg, u32 clear, u32 set);
int rswitch_reg_wait(void __iomem *addr, u32 offs, u32 mask, u32 expected);
diff --git a/drivers/net/ethernet/renesas/rswitch_l2.c b/drivers/net/ethernet/renesas/rswitch_l2.c
index 06c61c54db72..24d659576f62 100644
--- a/drivers/net/ethernet/renesas/rswitch_l2.c
+++ b/drivers/net/ethernet/renesas/rswitch_l2.c
@@ -23,7 +23,8 @@ static bool rdev_for_l2_offload(struct rswitch_device *rdev)
static void rswitch_change_l2_hw_offloading(struct rswitch_device *rdev,
bool start, bool learning)
{
- u32 bits = learning ? FWPC0_MACSSA | FWPC0_MACHLA | FWPC0_MACHMA : FWPC0_MACDSA;
+ u32 bits = learning ? FWPC0_MACSSA | FWPC0_MACHLA | FWPC0_MACHMA | FWPC0_MACRUDA :
+ FWPC0_MACDSA;
u32 clear = start ? 0 : bits;
u32 set = start ? bits : 0;
@@ -82,8 +83,9 @@ static void rswitch_update_l2_hw_forwarding(struct rswitch_private *priv)
*
* Do not allow L2 forwarding to self for hw port.
*/
- iowrite32(FIELD_PREP(FWPC2_LTWFW, fwd_mask | BIT(rdev->port)),
- priv->addr + FWPC2(rdev->port));
+ rswitch_modify(priv->addr, FWPC2(rdev->port),
+ FIELD_PREP(FWPC2_LTWFW, ~(fwd_mask | BIT(rdev->port))),
+ 0);
}
if (new_forwarding_offload && !rdev->forwarding_offloaded)
@@ -188,7 +190,8 @@ static int rswitch_port_update_stp_state(struct net_device *ndev, u8 stp_state)
}
static int rswitch_netdevice_event(struct notifier_block *nb,
- unsigned long event, void *ptr)
+ unsigned long event,
+ void *ptr)
{
struct net_device *ndev = netdev_notifier_info_to_dev(ptr);
struct netdev_notifier_changeupper_info *info;
@@ -241,25 +244,6 @@ static int rswitch_port_attr_set(struct net_device *ndev, const void *ctx,
}
}
-static int rswitch_switchdev_event(struct notifier_block *nb,
- unsigned long event, void *ptr)
-{
- struct net_device *ndev = switchdev_notifier_info_to_dev(ptr);
- int ret;
-
- if (event == SWITCHDEV_PORT_ATTR_SET) {
- ret = switchdev_handle_port_attr_set(ndev, ptr,
- is_rdev,
- rswitch_port_attr_set);
- return notifier_from_errno(ret);
- }
-
- if (!is_rdev(ndev))
- return NOTIFY_DONE;
-
- return notifier_from_errno(-EOPNOTSUPP);
-}
-
static int rswitch_switchdev_blocking_event(struct notifier_block *nb,
unsigned long event, void *ptr)
{
@@ -285,6 +269,172 @@ static int rswitch_switchdev_blocking_event(struct notifier_block *nb,
return notifier_from_errno(ret);
}
+static int rswitch_gwca_write_mac_address(struct rswitch_private *priv, const u8 *mac)
+{
+ int err;
+
+ err = rswitch_gwca_change_mode(priv, GWMC_OPC_CONFIG);
+ if (err < 0)
+ return err;
+
+ iowrite32((mac[0] << 8) | mac[1], priv->addr + GWMAC0);
+ iowrite32((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5],
+ priv->addr + GWMAC1);
+
+ return rswitch_gwca_change_mode(priv, GWMC_OPC_OPERATION);
+}
+
+static int rswitch_add_addr_to_mactable(struct rswitch_private *priv, const u8 *mac)
+{
+ u32 index = priv->gwca.l2_shared_rx_queue->index;
+ int err;
+
+ rswitch_modify(priv->addr, FWMACTL0, FWMACTL0_ED, 0);
+ iowrite32((mac[0] << 8) | mac[1], priv->addr + FWMACTL1);
+ iowrite32((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5],
+ priv->addr + FWMACTL2);
+ iowrite32(FWMACTL3_DSLV | FWMACTL3_SSLV,
+ priv->addr + FWMACTL3);
+ iowrite32(FIELD_PREP(FWMACTL4_CSDL, index),
+ priv->addr + FWMACTL4(GWCA_INDEX));
+ iowrite32(FIELD_PREP(FWMACTL5_DV, BIT(AGENT_INDEX_GWCA)),
+ priv->addr + FWMACTL5);
+
+ err = rswitch_reg_wait(priv->addr, FWMACTLR, FWMACTLR_L, 0);
+ if (err < 0)
+ return err;
+
+ if (ioread32(priv->addr + FWMACTLR))
+ return NOTIFY_BAD;
+
+ return NOTIFY_DONE;
+}
+
+static int rswitch_del_addr_from_mactable(struct rswitch_private *priv, const u8 *mac)
+{
+ int err;
+
+ rswitch_modify(priv->addr, FWMACTL0, 0, FWMACTL0_ED);
+ iowrite32((mac[0] << 8) | mac[1], priv->addr + FWMACTL1);
+ iowrite32((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5],
+ priv->addr + FWMACTL2);
+ iowrite32(FWMACTL3_DSLV | FWMACTL3_SSLV,
+ priv->addr + FWMACTL3);
+ iowrite32(FIELD_PREP(FWMACTL4_CSDL, BIT(0)),
+ priv->addr + FWMACTL4(GWCA_INDEX));
+ iowrite32(FIELD_PREP(FWMACTL5_DV, BIT(AGENT_INDEX_GWCA)),
+ priv->addr + FWMACTL5);
+
+ err = rswitch_reg_wait(priv->addr, FWMACTLR, FWMACTLR_L, 0);
+ if (err < 0)
+ return err;
+
+ err = ioread32(priv->addr + FWMACTLR);
+ if (err)
+ return NOTIFY_BAD;
+
+ return NOTIFY_DONE;
+}
+
+static void rswitch_switchdev_bridge_fdb_event_work(struct work_struct *work)
+{
+ struct rswitch_switchdev_event_work *switchdev_work;
+ const unsigned char addr[] = {0, 0, 0, 0, 0, 0};
+ struct rswitch_device *rdev;
+ struct net_device *ndev;
+
+ switchdev_work = container_of(work, struct rswitch_switchdev_event_work, work);
+ ndev = switchdev_work->ndev;
+
+ rtnl_lock();
+
+ /* Unfortunately all net_device members point to br0, there is no simple way to check
+ * if the event was triggered by a port device setting.
+ */
+ rswitch_for_all_ports(switchdev_work->priv, rdev) {
+ if (ether_addr_equal(rdev->ndev->dev_addr, switchdev_work->fdb_info.addr))
+ goto out;
+ }
+
+ /* Handle only bridge device */
+ if (is_rdev(ndev))
+ goto out;
+
+ switch (switchdev_work->event) {
+ case SWITCHDEV_FDB_ADD_TO_DEVICE:
+ rswitch_gwca_write_mac_address(switchdev_work->priv, switchdev_work->fdb_info.addr);
+ rswitch_add_addr_to_mactable(switchdev_work->priv, switchdev_work->fdb_info.addr);
+ break;
+ case SWITCHDEV_FDB_DEL_TO_DEVICE:
+ rswitch_del_addr_from_mactable(switchdev_work->priv, switchdev_work->fdb_info.addr);
+ rswitch_gwca_write_mac_address(switchdev_work->priv, addr);
+ break;
+ default:
+ break;
+ }
+
+out:
+ rtnl_unlock();
+
+ kfree(switchdev_work->fdb_info.addr);
+ netdev_put(ndev, &switchdev_work->priv->dev_tracker);
+ kfree(switchdev_work);
+}
+
+/* called under rcu_read_lock() */
+static int rswitch_switchdev_event(struct notifier_block *nb,
+ unsigned long event,
+ void *ptr)
+{
+ struct net_device *ndev = switchdev_notifier_info_to_dev(ptr);
+ struct rswitch_switchdev_event_work *switchdev_work;
+ struct switchdev_notifier_fdb_info *fdb_info;
+ struct switchdev_notifier_info *info = ptr;
+ struct rswitch_private *priv;
+
+ priv = container_of(nb, struct rswitch_private, rswitch_switchdev_nb);
+
+ switch (event) {
+ case SWITCHDEV_FDB_ADD_TO_DEVICE:
+ fallthrough;
+ case SWITCHDEV_FDB_DEL_TO_DEVICE:
+ switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC);
+
+ if (!switchdev_work)
+ return NOTIFY_BAD;
+
+ switchdev_work->ndev = info->dev;
+ switchdev_work->priv = priv;
+ switchdev_work->event = event;
+
+ fdb_info = container_of(info,
+ struct switchdev_notifier_fdb_info,
+ info);
+
+ INIT_WORK(&switchdev_work->work, rswitch_switchdev_bridge_fdb_event_work);
+
+ memcpy(&switchdev_work->fdb_info, ptr, sizeof(switchdev_work->fdb_info));
+
+ switchdev_work->fdb_info.addr = kzalloc(ETH_ALEN, GFP_ATOMIC);
+ if (!switchdev_work->fdb_info.addr)
+ goto err_addr_alloc;
+
+ ether_addr_copy((u8 *)switchdev_work->fdb_info.addr,
+ fdb_info->addr);
+ netdev_hold(ndev, &priv->dev_tracker, GFP_ATOMIC);
+ queue_work(system_long_wq, &switchdev_work->work);
+
+ break;
+ }
+
+ return NOTIFY_DONE;
+
+err_addr_alloc:
+ kfree(switchdev_work);
+
+ return NOTIFY_BAD;
+}
+
int rswitch_register_notifiers(struct rswitch_private *priv)
{
int err;
--
2.43.0
next prev parent reply other threads:[~2026-05-11 8:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-11 8:52 [net-next PATCH v4 00/13] net: renesas: rswitch: R-Car S4 add VLAN aware switching Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 01/13] net: renesas: rswitch: improve port change mode functions Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 02/13] net: renesas: rswitch: use device instead of net_device Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 03/13] net: renesas: rswitch: fix FWPC2 register access macros Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 04/13] net: renesas: rswitch: add register definitions for vlan support Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 05/13] net: renesas: rswitch: add exception path for packets with unknown dst MAC Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 06/13] net: renesas: rswitch: add forwarding rules for gwca Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 07/13] net: renesas: rswitch: make helper functions available to whole driver Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 08/13] net: renesas: rswitch: add basic vlan init to rswitch_fwd_init Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 09/13] net: renesas: rswitch: update port HW init Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 10/13] net: renesas: rswitch: clean up is_rdev rswitch_device checking Michael Dege
2026-05-11 8:52 ` [PATCH net-next v4 11/13] net: renesas: rswitch: add passing of rswitch_private into notifiers Michael Dege
2026-05-11 8:52 ` Michael Dege [this message]
2026-05-11 8:52 ` [PATCH net-next v4 13/13] net: renesas: rswitch: add vlan aware switching Michael Dege
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=20260511-rswitch_add_vlans-v4-12-a5a225f8faae@renesas.com \
--to=michael.dege@renesas.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
--cc=pabeni@redhat.com \
--cc=paul@pbarker.dev \
--cc=yoshihiro.shimoda.uh@renesas.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox