From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (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 CE841385EF0; Sat, 31 Jan 2026 23:36:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769902563; cv=none; b=hsolNgbfYnZtuLzzC1AQiuVfd7zk+S6VMmJSgZOb55JaVqox3KRFMW/l4ATNX/5phet4OhHLN9+kJ0imwmQ8CV6itW3hbUcwL3zE10E4dMq6cMW1/bWUScnwbshmOliUqGLu6qC9XsECPD+uRfPYcV0eRn5NMEV8wwqLGAUxF8c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769902563; c=relaxed/simple; bh=X0qAXFoeKKkNE7e5IWdpWRbrFsvExI0lhAQudJ9z/UU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pm9Y67oZ8Mqk7IKiLx4g64JJyK0ZyL4h0jo/JIeLGwSFPM5ZrcwK0BtL+MM3ScsXlnAGmcsOGBulMu0ME9MfW9YUj9HSOy4JybNq4n4j4doQ10RD2TxlqFs/re0VVNvX/tAm3+jMbu4l5LFBEqpR1KjRhm493wvs/ws4U1e8Ipw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=mailbox.org; spf=pass smtp.mailfrom=mailbox.org; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b=TA+sxQti; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b=t/+Kz5O9; arc=none smtp.client-ip=80.241.56.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mailbox.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="TA+sxQti"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="t/+Kz5O9" Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4f3Tlh18y7z9tmf; Sun, 1 Feb 2026 00:36:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1769902560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=raWHLzH2DhkmSipO6r6I8wlLMN2egX6bQDFFsapx5Ts=; b=TA+sxQtiTYaAneUZpsbKWOjHgv+xmPjlEGTCnzM7oRNGGRWo2lLuRgJ1wGWnW0KL9Q8AI8 tnv6aTnP0SHubNAL+xVFdTFIy9KGQI6KiaOCqKd55YGYWdYHTvXd5DRJA896yYEqiUfwFu NwRz/zm66BpJMNxx3PophQql7jWForW0hFDE1WMA0d+gSLOWQIsd5Mzu8vZX5T/Er1jl3R v1DwdJzYoTLbpW5VQlyUvLIYJ+vFB3vP+Gw/Xjz+pf2nTukPkD/AIXbvbjompxWq6wOHO0 KoBzwkdDgFAMlhtmwzn3ciku0QM6zPrQfj112QnQljrVWeje3Vrr9hBPx75uHQ== From: Lukasz Majewski DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1769902558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=raWHLzH2DhkmSipO6r6I8wlLMN2egX6bQDFFsapx5Ts=; b=t/+Kz5O9xv6l+BTnvs0DC/1q5hEJz6rjAF6SYhp6F80LwUyq3OnAOCAaYzh8ONxLXaohXZ eFVvpvFcme8x7pwJGfBTELotzXff37xycEdxH+VIfh8qJsZDNHYMlFs8Rm9bpqIfn1f2DO PgUSddZeZOOAn3SpMVwaVSugiS97tD+xZQGm5G/kwqZCbLRKl8B7jAYBkGXKORmFvhU+pO /dZQMIXSsUJQb0oVHPSf3GXmE6U+sohrO5yRIDbRuW5BYWj+OOqQV7VXoMe/zlhnplo60r PjjjLRToC3aX8kqnq+q+f/qzKS8utIZRTs22xZUUg5s6eyFzFKQDCjP7dVnguw== 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 v22 7/7] net: mtip: Extend the L2 switch driver for imx287 with bridge operations Date: Sun, 1 Feb 2026 00:34:59 +0100 Message-Id: <20260131233459.1625279-8-lukasz.majewski@mailbox.org> In-Reply-To: <20260131233459.1625279-1-lukasz.majewski@mailbox.org> References: <20260131233459.1625279-1-lukasz.majewski@mailbox.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-RS-META: osnig3xo4nbq5nocg7oir1bwa91ao6ee X-MBO-RS-ID: 7d7cf797d3bce7622ac After this change the MTIP L2 switch can be configured as offloading device for packet switching when bridge on its 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 - v20: - None Changes for v21: - Avoid double call of notifier_from_errno() on -EOPNOTSUPP - Rollback changes to driver state when switchdev_bridge_port_offload() fails Changes for v22: - Reorder setting of br_members and master_dev to successful call of switchdev_bridge_port_offload() --- .../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 b46b587c0823..52dc434ec344 100644 --- a/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.c +++ b/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.c @@ -1933,11 +1933,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); @@ -1969,6 +1973,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; } @@ -1977,6 +1983,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 4054415d39f9..449eca41e6b6 100644 --- a/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.h +++ b/drivers/net/ethernet/freescale/mtipsw/mtipl2sw.h @@ -640,6 +640,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..1fdc95a600e8 --- /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 -EOPNOTSUPP; + } + + fep->br_offload = 1; + mtip_switch_dis_port_separation(fep); + mtip_clear_atable(fep); + } + + 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; + } + + if (!priv->master_dev) + priv->master_dev = br_ndev; + + fep->br_members |= BIT(priv->portnum - 1); + + 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