From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx.denx.de (mx.denx.de [89.58.32.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27F77188596; Sun, 27 Jul 2025 10:02:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=89.58.32.78 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753610536; cv=none; b=dRRByTyFvks/fQmCRE/ERNLUVnwuzlAz/MS0f4Hp84kyZhuOjpju50hYYgYCEzdUgtyLsVXCouVkxCl1wOO1Z6Nknq29hZ+SJy6FuIFyNOXekymxGmAmiohXFCzz8afabMDKRojqxkCJLUnpm1PV/mn42nKnBmt6roo3+zniEgU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753610536; c=relaxed/simple; bh=7AIECCoTVKScP09r1QrwAKaHbG4I/jr2LztAGCwZ8n8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q6n18WU2ugly5VZFdLUn15zZ1o2ccesYkyOAAsAqsaTozLiMetZG4hkTxKVietEM/ZNzRaDFR7YrxazOXrPCLUCRrFe+Vz4TyXgF9L3lCsPSVbwSZvalKj2NkrRflOpzaaVc855bwQFJpdPJPw0f9e+CoXoxas40wAZMdqkbZlI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=denx.de; spf=pass smtp.mailfrom=denx.de; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.b=Gp2y1rDI; arc=none smtp.client-ip=89.58.32.78 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=denx.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=denx.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.b="Gp2y1rDI" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id BC8D61038C129; Sun, 27 Jul 2025 12:02:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=mx-20241105; t=1753610532; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=5xd68qgE1PjxbHksQMJ2JQD5fjF7RZ8XXrOEk94cTYQ=; b=Gp2y1rDIV8DMA7d0a/QjE4r9xvSjH6vhewfsB7pKjo+PTMLj9V1QVcKdGqIzVrJ11p7lkl /Dth7a2oXw4weE4IcdH2/DDMJTL5cwkV91unaePvEiy5cHgc+osDeowIXebyUnBrgJERcA vFuneNoUVcClPkUS06XNA1aCnd2lw4eg1RXkC55JdBNSvUSXv3P/lP0aJh0BXDBp9j3y3d cEQwcXq0USKSrhFMTFWQQHRcFp/KyvEZyv01Ef8kG1qoYE6guBaJi7MrPO6Dp5Jf41ZW5B mfZ7br2jjmskwMXmpWGX3qn/93UeMwzWhU6QVFzDM0i6ut1ER34frZ2KZcG3lQ== From: Lukasz Majewski To: Andrew Lunn , davem@davemloft.net, Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo Cc: Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Richard Cochran , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Stefan Wahren , Simon Horman , Lukasz Majewski Subject: [net-next v17 09/12] net: mtip: Extend the L2 switch driver for imx287 with bridge operations Date: Sun, 27 Jul 2025 12:01:25 +0200 Message-Id: <20250727100128.1411514-10-lukma@denx.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250727100128.1411514-1-lukma@denx.de> References: <20250727100128.1411514-1-lukma@denx.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 After this change the MTIP L2 switch can be configured as offloading device for packet switching when bridge on their interfaces is created. Signed-off-by: Lukasz Majewski --- Changes for v13: - New patch - created by excluding some code from large (i.e. v12 and earlier) MTIP driver Changes for v14 - v15: - None Changes for v16: - Enable MTIP ports to support bridge offloading Changes for v17: - None --- .../net/ethernet/freescale/mtipsw/Makefile | 2 +- .../net/ethernet/freescale/mtipsw/mtipl2sw.c | 9 +- .../net/ethernet/freescale/mtipsw/mtipl2sw.h | 2 + .../ethernet/freescale/mtipsw/mtipl2sw_br.c | 132 ++++++++++++++++++ 4 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 drivers/net/ethernet/freescale/mtipsw/mtipl2sw_br.c diff --git a/drivers/net/ethernet/freescale/mtipsw/Makefile b/drivers/net/ethernet/freescale/mtipsw/Makefile index a99aaf6ddfb2..81e2b0e03e6c 100644 --- a/drivers/net/ethernet/freescale/mtipsw/Makefile +++ b/drivers/net/ethernet/freescale/mtipsw/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_FEC_MTIP_L2SW) += nxp-mtipl2sw.o -nxp-mtipl2sw-objs := mtipl2sw.o mtipl2sw_mgnt.o +nxp-mtipl2sw-objs := mtipl2sw.o mtipl2sw_mgnt.o mtipl2sw_br.o diff --git a/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.c b/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.c index 4c9776fc5382..a67fd1f5c807 100644 --- a/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.c +++ b/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.c @@ -1887,11 +1887,15 @@ static int mtip_sw_probe(struct platform_device *pdev) if (ret) return dev_err_probe(&pdev->dev, ret, "Could not alloc IRQ\n"); + ret = mtip_register_notifiers(fep); + if (ret) + return ret; + ret = mtip_switch_dma_init(fep); if (ret) { dev_err(&pdev->dev, "%s: ethernet switch init fail (%d)!\n", __func__, ret); - return ret; + goto unregister_notifiers; } ret = mtip_mii_init(fep, pdev); @@ -1922,6 +1926,8 @@ static int mtip_sw_probe(struct platform_device *pdev) fep->bd_dma); fep->rx_bd_base = NULL; fep->tx_bd_base = NULL; + unregister_notifiers: + mtip_unregister_notifiers(fep); return ret; } @@ -1930,6 +1936,7 @@ static void mtip_sw_remove(struct platform_device *pdev) { struct switch_enet_private *fep = platform_get_drvdata(pdev); + mtip_unregister_notifiers(fep); mtip_ndev_cleanup(fep); mtip_mii_remove(fep); diff --git a/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.h b/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.h index 7e5373823d43..3dae94048917 100644 --- a/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.h +++ b/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.h @@ -643,6 +643,8 @@ int mtip_port_learning_config(struct switch_enet_private *fep, int port, int mtip_port_blocking_config(struct switch_enet_private *fep, int port, bool enable); bool mtip_is_switch_netdev_port(const struct net_device *ndev); +int mtip_register_notifiers(struct switch_enet_private *fep); +void mtip_unregister_notifiers(struct switch_enet_private *fep); int mtip_port_enable_config(struct switch_enet_private *fep, int port, bool tx_en, bool rx_en); void mtip_clear_atable(struct switch_enet_private *fep); diff --git a/drivers/net/ethernet/freescale/mtipsw/mtipl2sw_br.c b/drivers/net/ethernet/freescale/mtipsw/mtipl2sw_br.c new file mode 100644 index 000000000000..f961b9cc4e6a --- /dev/null +++ b/drivers/net/ethernet/freescale/mtipsw/mtipl2sw_br.c @@ -0,0 +1,132 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * L2 switch Controller driver for MTIP block - bridge network interface + * + * Copyright (C) 2025 DENX Software Engineering GmbH + * Lukasz Majewski + */ + +#include +#include +#include +#include + +#include "mtipl2sw.h" + +static int mtip_ndev_port_link(struct net_device *ndev, + struct net_device *br_ndev, + struct netlink_ext_ack *extack) +{ + struct mtip_ndev_priv *priv = netdev_priv(ndev), *other_priv; + struct switch_enet_private *fep = priv->fep; + struct net_device *other_ndev; + int err; + + /* Check if one port of MTIP switch is already bridged */ + if (fep->br_members && !fep->br_offload) { + /* Get the second bridge ndev */ + other_ndev = fep->ndev[fep->br_members - 1]; + other_priv = netdev_priv(other_ndev); + if (other_priv->master_dev != br_ndev) { + NL_SET_ERR_MSG_MOD(extack, + "L2 offloading only possible for the same bridge!"); + return notifier_from_errno(-EOPNOTSUPP); + } + + fep->br_offload = 1; + mtip_switch_dis_port_separation(fep); + mtip_clear_atable(fep); + } + + if (!priv->master_dev) + priv->master_dev = br_ndev; + + fep->br_members |= BIT(priv->portnum - 1); + + err = switchdev_bridge_port_offload(ndev, ndev, NULL, NULL, NULL, + false, extack); + if (err) { + dev_err(&ndev->dev, "can't offload bridge port %s [err: %d]\n", + ndev->name, err); + return err; + } + + dev_dbg(&ndev->dev, + "%s: ndev: %s br: %s fep: %p members: 0x%x offload: %d\n", + __func__, ndev->name, br_ndev->name, fep, fep->br_members, + fep->br_offload); + + return NOTIFY_DONE; +} + +static void mtip_netdevice_port_unlink(struct net_device *ndev) +{ + struct mtip_ndev_priv *priv = netdev_priv(ndev); + struct switch_enet_private *fep = priv->fep; + + dev_dbg(&ndev->dev, "%s: ndev: %s members: 0x%x\n", __func__, + ndev->name, fep->br_members); + + switchdev_bridge_port_unoffload(ndev, NULL, NULL, NULL); + + fep->br_members &= ~BIT(priv->portnum - 1); + priv->master_dev = NULL; + + if (fep->br_members && fep->br_offload) { + fep->br_offload = 0; + mtip_switch_en_port_separation(fep); + mtip_clear_atable(fep); + } +} + +/* netdev notifier */ +static int mtip_netdevice_event(struct notifier_block *unused, + unsigned long event, void *ptr) +{ + struct net_device *ndev = netdev_notifier_info_to_dev(ptr); + struct netdev_notifier_changeupper_info *info = ptr; + struct netlink_ext_ack *extack; + int ret = NOTIFY_DONE; + + if (!mtip_is_switch_netdev_port(ndev)) + return NOTIFY_DONE; + + extack = netdev_notifier_info_to_extack(&info->info); + + switch (event) { + case NETDEV_CHANGEUPPER: + if (!netif_is_bridge_master(info->upper_dev)) + break; + + if (info->linking) + ret = mtip_ndev_port_link(ndev, info->upper_dev, + extack); + else + mtip_netdevice_port_unlink(ndev); + + break; + default: + return NOTIFY_DONE; + } + + return notifier_from_errno(ret); +} + +static struct notifier_block mtip_netdevice_nb __read_mostly = { + .notifier_call = mtip_netdevice_event, +}; + +int mtip_register_notifiers(struct switch_enet_private *fep) +{ + int ret = register_netdevice_notifier(&mtip_netdevice_nb); + + if (ret) + dev_err(&fep->pdev->dev, "can't register netdevice notifier\n"); + + return ret; +} + +void mtip_unregister_notifiers(struct switch_enet_private *fep) +{ + unregister_netdevice_notifier(&mtip_netdevice_nb); +} -- 2.39.5