From nobody Tue Apr 7 01:05:26 2026 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E315F3A382C; Tue, 17 Mar 2026 09:42:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773740557; cv=none; b=DDrx/ROpJij52CQ3hI1WTsEI5UVpJCIJZ8RjFsBLGSxUd7EdIB3ligfdU4zwTVBZoxuiOccFUEODRsEzvc/b4s8HA57FL0fS2Qbgof0OumQf/zjuV9GO497ansNkb1vy5X5yQRsqzWKKqr6/DLKJdFp9NKyNoxxl63gTDlfWXoQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773740557; c=relaxed/simple; bh=g1Jcx3HF+zw7LyqJCYhw8ODgE7FX68duppwcZpBHa80=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NJHyHmGygP9p20msA7xB8MGAj9VZ4wUeZ8qIuF01mcYGl+XOv7BBBAg4/O6xXTdlgynM0sM2THW+g5tznfQFOy9cYGEcDcHcpMKkle27nF8AgRxDYywjDAfmiMxX6QkjXo3AA3dIyJ6bj/rNB6O00y1SIYMlDYbFwc8/WqC0Wko= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; arc=none smtp.client-ip=210.160.252.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com X-CSE-ConnectionGUID: dd5fFX+sS02HCxenReA3qw== X-CSE-MsgGUID: k9korBmxQkicvHo64oXrwg== Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 17 Mar 2026 18:42:35 +0900 Received: from [127.0.1.1] (unknown [10.226.78.135]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 0A9A54016D6A; Tue, 17 Mar 2026 18:42:32 +0900 (JST) From: Michael Dege Date: Tue, 17 Mar 2026 10:42:04 +0100 Subject: [PATCH net-next 11/13] net: renesas: rswitch: add passing of rswitch_private into notifiers Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260317-rswitch_add_vlans-v1-11-3a57bfa0f2d1@renesas.com> References: <20260317-rswitch_add_vlans-v1-0-3a57bfa0f2d1@renesas.com> In-Reply-To: <20260317-rswitch_add_vlans-v1-0-3a57bfa0f2d1@renesas.com> To: Yoshihiro Shimoda , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Dege X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773740518; l=5516; i=michael.dege@renesas.com; s=20251023; h=from:subject:message-id; bh=g1Jcx3HF+zw7LyqJCYhw8ODgE7FX68duppwcZpBHa80=; b=Ep0HxeKUXHJb6WnWwLPhRSA3TR+BRPkiU4ABoXeCYW2fLq8qfDeaiTFQYGOMhAb/OJBxECikc NPaTUAoLgN2APVTIrv/8Zg5+RBNjhYkBf2Um1+I+nAc75D5QIZdWr7f X-Developer-Key: i=michael.dege@renesas.com; a=ed25519; pk=gu1rwIcCrAxNMv2I8fIfiQvt51xzZwnQy4Ua/DscQt8= Provide struct rswitch_private to notifiers. This will be needed to access the HW in the notification handlers. Signed-off-by: Michael Dege --- drivers/net/ethernet/renesas/rswitch.h | 5 ++++ drivers/net/ethernet/renesas/rswitch_l2.c | 45 ++++++++++++-------------= ---- drivers/net/ethernet/renesas/rswitch_l2.h | 6 ++-- drivers/net/ethernet/renesas/rswitch_main.c | 4 +-- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/= renesas/rswitch.h index 42c8bbafa27d..6dfc53c6b985 100644 --- a/drivers/net/ethernet/renesas/rswitch.h +++ b/drivers/net/ethernet/renesas/rswitch.h @@ -1199,6 +1199,11 @@ struct rswitch_private { struct rswitch_etha etha[RSWITCH_NUM_PORTS]; struct rswitch_mfwd mfwd; =20 + /* Notifiers */ + struct notifier_block rswitch_netdevice_nb; + struct notifier_block rswitch_switchdev_nb; + struct notifier_block rswitch_switchdev_blocking_nb; + struct list_head port_list; =20 spinlock_t lock; /* lock interrupt registers' control */ diff --git a/drivers/net/ethernet/renesas/rswitch_l2.c b/drivers/net/ethern= et/renesas/rswitch_l2.c index da8c04dd65e4..596a9fe2c086 100644 --- a/drivers/net/ethernet/renesas/rswitch_l2.c +++ b/drivers/net/ethernet/renesas/rswitch_l2.c @@ -289,48 +289,39 @@ static int rswitch_switchdev_blocking_event(struct no= tifier_block *nb, return notifier_from_errno(ret); } =20 -static struct notifier_block rswitch_netdevice_nb =3D { - .notifier_call =3D rswitch_netdevice_event, -}; - -static struct notifier_block rswitch_switchdev_nb =3D { - .notifier_call =3D rswitch_switchdev_event, -}; - -static struct notifier_block rswitch_switchdev_blocking_nb =3D { - .notifier_call =3D rswitch_switchdev_blocking_event, -}; - -int rswitch_register_notifiers(void) +int rswitch_register_notifiers(struct rswitch_private *priv) { - int ret; + int err; =20 - ret =3D register_netdevice_notifier(&rswitch_netdevice_nb); - if (ret) + priv->rswitch_netdevice_nb.notifier_call =3D rswitch_netdevice_event; + err =3D register_netdevice_notifier(&priv->rswitch_netdevice_nb); + if (err) goto register_netdevice_notifier_failed; =20 - ret =3D register_switchdev_notifier(&rswitch_switchdev_nb); - if (ret) + priv->rswitch_switchdev_nb.notifier_call =3D rswitch_switchdev_event; + err =3D register_switchdev_notifier(&priv->rswitch_switchdev_nb); + if (err) goto register_switchdev_notifier_failed; =20 - ret =3D register_switchdev_blocking_notifier(&rswitch_switchdev_blocking_= nb); - if (ret) + priv->rswitch_switchdev_blocking_nb.notifier_call =3D rswitch_switchdev_b= locking_event; + err =3D register_switchdev_blocking_notifier(&priv->rswitch_switchdev_blo= cking_nb); + if (err) goto register_switchdev_blocking_notifier_failed; =20 return 0; =20 register_switchdev_blocking_notifier_failed: - unregister_switchdev_notifier(&rswitch_switchdev_nb); + unregister_switchdev_notifier(&priv->rswitch_switchdev_nb); register_switchdev_notifier_failed: - unregister_netdevice_notifier(&rswitch_netdevice_nb); + unregister_netdevice_notifier(&priv->rswitch_netdevice_nb); register_netdevice_notifier_failed: =20 - return ret; + return err; } =20 -void rswitch_unregister_notifiers(void) +void rswitch_unregister_notifiers(struct rswitch_private *priv) { - unregister_switchdev_blocking_notifier(&rswitch_switchdev_blocking_nb); - unregister_switchdev_notifier(&rswitch_switchdev_nb); - unregister_netdevice_notifier(&rswitch_netdevice_nb); + unregister_switchdev_blocking_notifier(&priv->rswitch_switchdev_blocking_= nb); + unregister_switchdev_notifier(&priv->rswitch_switchdev_nb); + unregister_netdevice_notifier(&priv->rswitch_netdevice_nb); } diff --git a/drivers/net/ethernet/renesas/rswitch_l2.h b/drivers/net/ethern= et/renesas/rswitch_l2.h index 57050ede8f31..af9780c63c9a 100644 --- a/drivers/net/ethernet/renesas/rswitch_l2.h +++ b/drivers/net/ethernet/renesas/rswitch_l2.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Renesas Ethernet Switch device driver * - * Copyright (C) 2025 Renesas Electronics Corporation + * Copyright (C) 2025 - 2026 Renesas Electronics Corporation */ =20 #ifndef __RSWITCH_L2_H__ @@ -9,7 +9,7 @@ =20 void rswitch_update_l2_offload(struct rswitch_private *priv); =20 -int rswitch_register_notifiers(void); -void rswitch_unregister_notifiers(void); +int rswitch_register_notifiers(struct rswitch_private *priv); +void rswitch_unregister_notifiers(struct rswitch_private *priv); =20 #endif /* #ifndef __RSWITCH_L2_H__ */ diff --git a/drivers/net/ethernet/renesas/rswitch_main.c b/drivers/net/ethe= rnet/renesas/rswitch_main.c index da984027239c..4e0a481ef403 100644 --- a/drivers/net/ethernet/renesas/rswitch_main.c +++ b/drivers/net/ethernet/renesas/rswitch_main.c @@ -2272,7 +2272,7 @@ static int renesas_eth_sw_probe(struct platform_devic= e *pdev) if (list_empty(&priv->port_list)) dev_warn(&pdev->dev, "could not initialize any ports\n"); =20 - ret =3D rswitch_register_notifiers(); + ret =3D rswitch_register_notifiers(priv); if (ret) { dev_err(&pdev->dev, "could not register notifiers\n"); return ret; @@ -2311,7 +2311,7 @@ static void renesas_eth_sw_remove(struct platform_dev= ice *pdev) { struct rswitch_private *priv =3D platform_get_drvdata(pdev); =20 - rswitch_unregister_notifiers(); + rswitch_unregister_notifiers(priv); rswitch_deinit(priv); =20 pm_runtime_put(&pdev->dev); --=20 2.43.0