Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Michal Kubecek <mkubecek@suse.cz>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Rui Sousa <rui.sousa@nxp.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Pranavi Somisetty <pranavi.somisetty@amd.com>,
        Harini Katakam <harini.katakam@amd.com>,
        Colin Foster <colin.foster@in-advantage.com>,
        UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH v2 net-next 08/12] net: dsa: add plumbing for changing and getting MAC merge layer state
Date:   Wed, 11 Jan 2023 18:17:02 +0200
Message-Id: <20230111161706.1465242-9-vladimir.oltean@nxp.com>
In-Reply-To: <20230111161706.1465242-1-vladimir.oltean@nxp.com>
References: <20230111161706.1465242-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2SL44taS+m8GWwHx/El9TiPxZEmTGTmFWOJM+KyivRsdkD9DDg4Nbie7pVVF?=
 =?us-ascii?Q?jQtqE5BHKAOIn4CNpI+bigAJyTdJYtqaOqSJ5+OwPdaWMINX9EZCOsPY1B1f?=
 =?us-ascii?Q?mdTNME6FVJ92Dj5KPlndtoWx7As7tS1mIo4ebwKWwthAPALNoVink04GrdIb?=
 =?us-ascii?Q?Tea9V/Gk4KxS7dumwPY9Yeeai4k7LLPaTrqkN+Kn9FGc4hmIRPo4UuHvBFEA?=
 =?us-ascii?Q?VMJhFLJK9r0J53EIO1eWydfuIt0qe/5tyEiIew5O9A/ezOHfvy4ODvhZnUuM?=
 =?us-ascii?Q?iQ7N37F1VN9Ac7h8YE6WFnmAJOTBZXUfnDHba3c96WkaFS9R7bMUOchhYHrU?=
 =?us-ascii?Q?x6F+Nt8xBaP7ZGfLAKjuhDcwb9dJxlx9sEuCJrojOUJZWKzrVcwwysD3Apoy?=
 =?us-ascii?Q?mas4uM2EDqAFtyk73UjrK+ZcVhDqZPfZv924JpqjshpiS606OIv7VDhxjc6A?=
 =?us-ascii?Q?8SqxlETytLskPlVs6K2hQORwNu8LW+k7LWTGg/ldTjctzLC0E9tMdSufyPZm?=
 =?us-ascii?Q?LR3CWlEueb95PDnMdmi6hNIAG26//929sh4VbALbxIIdRKlRjFLI9qK6OuyI?=
 =?us-ascii?Q?6P7DyybMZ759IqtUSappgVE1VzdAdjrskE7t71YZFgwm5xc7H+O/6h3d0fi9?=
 =?us-ascii?Q?fqQXt74oBVS2mjMVPRYpyl2jULV/R5LpJ8UwjDJBawWMPKLuXOYqY0uZ88st?=
 =?us-ascii?Q?utSaltvoORoRhuW8l3NuXRtLNhF3bIgUmdZQTYVMB2LtFnja9gfMqb87jxZJ?=
 =?us-ascii?Q?SzG+H+i3IiOGHQWgcwKA4caUNIKTjkXwqS8t7CsMhljPHBq85FR4niRsgvov?=
 =?us-ascii?Q?tClQoqM3oe2uxEgby/I9tO47atN3gnoWDsjvxN4ck0PXC4Q5gwuHCjkzST4b?=
 =?us-ascii?Q?/ztzMaB4H+ly3TTsGoCNYU8r12kycTjPvxXPwuFVl9lPyRwAwQTrsOZDzmdW?=
 =?us-ascii?Q?aFZ9psIEIzPYW/oJ3yjLpI+PPtD/M5QFvNJx3iJMFJNeZ4bAf1K+uXJSbFNW?=
 =?us-ascii?Q?K3wo4A2IveqQ+jLMohypG2pMrplVU8fmHBgjsoONLMMUjuvAZ/4DqQuEi2WW?=
 =?us-ascii?Q?3dAQNsBLb13GdFUrPfL41qmS7AujspQm9TLWTnF9GEM153OvcXM59+OX3bif?=
 =?us-ascii?Q?DT+vza08pgSRg6+AWWaSoRjjYntt8uRmdBT3aRm7scjx0SQmq+KxglINrDvF?=
 =?us-ascii?Q?+39zdOINZ1h1sRx3v7pIkUzyQ6cDhqYNXlfdkvSTz20D6Y4VqwF9Ppe9ofYe?=
 =?us-ascii?Q?wZ/lpxOQGZavBtnCX76CH9sKAw1DS62dXYolfGfUkEuu9yG9SkYGAxr64Dmr?=
 =?us-ascii?Q?sv10wx6De4bTu/iVgVgI4Zzy6koZTH7Y/WHQzgKVonYFplDkb2b8E+C0w6Cy?=
 =?us-ascii?Q?7bpeJdiP37c49wO0D0JyHylScLRpD5Bp0CH+7+1u5APCK4MXZ3xne9xXs0tx?=
 =?us-ascii?Q?6ME+2dL6tMNj3TLGULPZ2av1Ngxo+sXirurV5ipx+plNCVAyGHKgav2CV6bV?=
 =?us-ascii?Q?7Lxr0asyhK2oQjkKqX9tfoAYWR2VQEH4j2BpG9TapebfPAxbQfNuMGvJ4zKd?=
 =?us-ascii?Q?3DHBSTSdDsWziiuDl1oMjl/3q9AVs/QtiFSXuJ67EMuW3kIXPTlgM+/LxS4D?=
 =?us-ascii?Q?cA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ed5a17c7-1d10-42c0-8302-08daf3ef5570
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2023 16:17:28.4391
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ULk1GWLB3EQep2+r3xqLDkHw5kZme90fnZ3/gyUHYRKFCB1OBt1VRONP+N7pYYaF6rDKu7ODe/znVLrqWKddAQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8462
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The DSA core is in charge of the ethtool_ops of the net devices
associated with switch ports, so in case a hardware driver supports the
MAC merge layer, DSA must pass the callbacks through to the driver.
Add support for precisely that.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v1->v2: patch is new

 include/net/dsa.h | 11 +++++++++++
 net/dsa/slave.c   | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 96086289aa9b..51b0dc0d0bc1 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -937,6 +937,17 @@ struct dsa_switch_ops {
 	int	(*get_ts_info)(struct dsa_switch *ds, int port,
 			       struct ethtool_ts_info *ts);
 
+	/*
+	 * ethtool MAC merge layer
+	 */
+	void	(*get_mm)(struct dsa_switch *ds, int port,
+			  struct ethtool_mm_state *state);
+	int	(*set_mm)(struct dsa_switch *ds, int port,
+			  struct ethtool_mm_cfg *cfg,
+			  struct netlink_ext_ack *extack);
+	void	(*get_mm_stats)(struct dsa_switch *ds, int port,
+				struct ethtool_mm_stats *stats);
+
 	/*
 	 * DCB ops
 	 */
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index aab79c355224..b6ed0f40a0ef 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1117,6 +1117,38 @@ static void dsa_slave_net_selftest(struct net_device *ndev,
 	net_selftest(ndev, etest, buf);
 }
 
+static void dsa_slave_get_mm(struct net_device *dev,
+			     struct ethtool_mm_state *state)
+{
+	struct dsa_port *dp = dsa_slave_to_port(dev);
+	struct dsa_switch *ds = dp->ds;
+
+	if (ds->ops->get_mm)
+		ds->ops->get_mm(ds, dp->index, state);
+}
+
+static int dsa_slave_set_mm(struct net_device *dev, struct ethtool_mm_cfg *cfg,
+			    struct netlink_ext_ack *extack)
+{
+	struct dsa_port *dp = dsa_slave_to_port(dev);
+	struct dsa_switch *ds = dp->ds;
+
+	if (!ds->ops->set_mm)
+		return -EOPNOTSUPP;
+
+	return ds->ops->set_mm(ds, dp->index, cfg, extack);
+}
+
+static void dsa_slave_get_mm_stats(struct net_device *dev,
+				   struct ethtool_mm_stats *stats)
+{
+	struct dsa_port *dp = dsa_slave_to_port(dev);
+	struct dsa_switch *ds = dp->ds;
+
+	if (ds->ops->get_mm_stats)
+		ds->ops->get_mm_stats(ds, dp->index, stats);
+}
+
 static void dsa_slave_get_wol(struct net_device *dev, struct ethtool_wolinfo *w)
 {
 	struct dsa_port *dp = dsa_slave_to_port(dev);
@@ -2205,6 +2237,9 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = {
 	.set_rxnfc		= dsa_slave_set_rxnfc,
 	.get_ts_info		= dsa_slave_get_ts_info,
 	.self_test		= dsa_slave_net_selftest,
+	.get_mm			= dsa_slave_get_mm,
+	.set_mm			= dsa_slave_set_mm,
+	.get_mm_stats		= dsa_slave_get_mm_stats,
 };
 
 static const struct dcbnl_rtnl_ops __maybe_unused dsa_slave_dcbnl_ops = {
-- 
2.34.1