Message ID | 20221128115958.4049431-11-o.rempel@pengutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5609234wrr; Mon, 28 Nov 2022 04:03:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf63IiS88XWEn9KkL5qgK2AyuwdBiO5/dAh6ZEWTv8kCXxlSdADL28gg0BQY67W3Xmu+z9nx X-Received: by 2002:a63:ae01:0:b0:478:936:3380 with SMTP id q1-20020a63ae01000000b0047809363380mr7608696pgf.266.1669637006960; Mon, 28 Nov 2022 04:03:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669637006; cv=none; d=google.com; s=arc-20160816; b=FmVeOIUbq9Dd3PWElSM2QJs6I046q5O6XwoWYhXGKRemY6n+2VZpEdFN7r+xxYn3lj 5WsbzNEtALqRcLdNdaTsBp4I5v5smOvgcANeCLtIvV9xgBecStNGu3Gls2I/zppr/Cwn z9Nzuhue1CDZn8VCSo20BkbCk3A3gWgpgqj2u+uPpIAHfVlqsGSwX94pNu2IoR1GHtnZ 5fiQ3H9xuJ5s2or6RlEKrS2XzOeyUupRJj/lwLiOJhpDfBOX/L8UoZUdb6EJziNxE5yy VlTYQYWY+RbR04TkPBwf6jYorRK7jF/vQvaVMmUQCwJ7yzgRcE5DhspIvdxm4dN+JwgL C+mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=QEgGnvrDryrPysEdaCNy+1rRcV7C1RPVjxuwdO9cK48=; b=Qv4fI0CiJDCP+PAygo0c/AcdWNAJFPdyFZgX2wUZ1EsTsrsZ3tIf2SBprYuLLaxYQH vvvb+BCZftUIiLdw4WyjuwGsh7Jy0xQSK2Y5mvHM1qZztVWh4d0U3R6qw9xSqaoVVKdI UDU72Ameqt6csYZcx1MVgyj9a5BuuOVIASawNwHB+gWs0/CeCk9tbjZFmCl3b5mn3p3y 0ciaKIN1JZHTz1yNEkJlrqg8P4vRbqerKt7Z5kXt0LvhitQhh0TCPbsxQS+vegxQvJiH lt5ZpIkm71fYhWfJMiPcbTSQJdDaI5EeOJuWQw+bCjBcK52hFjWMTM8X+zs1QY7Co+jk XGfg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id iz13-20020a170902ef8d00b0018929930a0bsi11167782plb.414.2022.11.28.04.03.04; Mon, 28 Nov 2022 04:03:26 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231613AbiK1MBY (ORCPT <rfc822;gah0developer@gmail.com> + 99 others); Mon, 28 Nov 2022 07:01:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231360AbiK1MAQ (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 28 Nov 2022 07:00:16 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80C5818E03 for <linux-kernel@vger.kernel.org>; Mon, 28 Nov 2022 04:00:14 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <ore@pengutronix.de>) id 1ozcns-0003pN-P3; Mon, 28 Nov 2022 13:00:04 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from <ore@pengutronix.de>) id 1ozcnr-000o9F-52; Mon, 28 Nov 2022 13:00:03 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from <ore@pengutronix.de>) id 1ozcnn-00Gzdu-RN; Mon, 28 Nov 2022 12:59:59 +0100 From: Oleksij Rempel <o.rempel@pengutronix.de> To: Woojung Huh <woojung.huh@microchip.com>, UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>, Vivien Didelot <vivien.didelot@gmail.com>, Florian Fainelli <f.fainelli@gmail.com>, Vladimir Oltean <olteanv@gmail.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com> Cc: Oleksij Rempel <o.rempel@pengutronix.de>, kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Arun.Ramadoss@microchip.com Subject: [PATCH v1 10/26] net: dsa: microchip: ksz8: refactor ksz8_fdb_dump() Date: Mon, 28 Nov 2022 12:59:42 +0100 Message-Id: <20221128115958.4049431-11-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221128115958.4049431-1-o.rempel@pengutronix.de> References: <20221128115958.4049431-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750741294628124666?= X-GMAIL-MSGID: =?utf-8?q?1750741294628124666?= |
Series |
net: dsa: microchip: stats64, fdb, error
|
|
Commit Message
Oleksij Rempel
Nov. 28, 2022, 11:59 a.m. UTC
After fixing different bugs we can refactor this function:
- be paranoid - read only max possibly amount of entries supported by
the HW.
- pass error values returned by regmap
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/dsa/microchip/ksz8795.c | 41 ++++++++++++++-----------
drivers/net/dsa/microchip/ksz8795_reg.h | 1 +
2 files changed, 24 insertions(+), 18 deletions(-)
Comments
Hi Oleksij, On Mon, 2022-11-28 at 12:59 +0100, Oleksij Rempel wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you > know the content is safe > > After fixing different bugs we can refactor this function: > - be paranoid - read only max possibly amount of entries supported by > the HW. > - pass error values returned by regmap > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > drivers/net/dsa/microchip/ksz8795.c | 41 ++++++++++++++--------- > -- > drivers/net/dsa/microchip/ksz8795_reg.h | 1 + > 2 files changed, 24 insertions(+), 18 deletions(-) > > diff --git a/drivers/net/dsa/microchip/ksz8795.c > b/drivers/net/dsa/microchip/ksz8795.c > index 736cf4e54333..308b46bb2ce5 100644 > --- a/drivers/net/dsa/microchip/ksz8795.c > +++ b/drivers/net/dsa/microchip/ksz8795.c > @@ -949,26 +949,31 @@ void ksz8_flush_dyn_mac_table(struct ksz_device > *dev, int port) > int ksz8_fdb_dump(struct ksz_device *dev, int port, > dsa_fdb_dump_cb_t *cb, void *data) > { > - int ret = 0; > - u16 i = 0; > - u16 entries = 0; > - u8 src_port; > - u8 mac[ETH_ALEN]; > + u16 i, entries = 0; > + int ret; > > - do { > - ret = ksz8_r_dyn_mac_table(dev, i, mac, &src_port, > - &entries); > - if (!ret && port == src_port) { > - ret = cb(mac, 0, false, data); > - if (ret) > - break; > - } > - i++; > - } while (i < entries); > - if (i >= entries) > - ret = 0; > + for (i = 0; i < KSZ8_DYN_MAC_ENTRIES; i++) { > + u8 mac[ETH_ALEN]; > + u8 src_port; Any specific reason for declaring variable within for loop instead of outside. > > - return ret; > + ret = ksz8_r_dyn_mac_table(dev, i, mac, &src_port, > &entries); > + if (ret == -ENXIO) > + return 0; > + if (ret) > + return ret; > + > + if (i >= entries) > + return 0; > + > + if (port != src_port) > + continue; > + > + ret = cb(mac, 0, false, data); > + if (ret) > + return ret; > + } > + > + return 0; > } > > int ksz8_mdb_add(struct ksz_device *dev, int port, > diff --git a/drivers/net/dsa/microchip/ksz8795_reg.h > b/drivers/net/dsa/microchip/ksz8795_reg.h > index 7a57c6088f80..0bdceb534192 100644 > --- a/drivers/net/dsa/microchip/ksz8795_reg.h > +++ b/drivers/net/dsa/microchip/ksz8795_reg.h > @@ -811,5 +811,6 @@ > #define TAIL_TAG_LOOKUP BIT(7) > > #define FID_ENTRIES 128 > +#define KSZ8_DYN_MAC_ENTRIES 1024 > > #endif > -- > 2.30.2 >
On Tue, Nov 29, 2022 at 08:29:47AM +0000, Arun.Ramadoss@microchip.com wrote: > Hi Oleksij, > > On Mon, 2022-11-28 at 12:59 +0100, Oleksij Rempel wrote: > > EXTERNAL EMAIL: Do not click links or open attachments unless you > > know the content is safe > > > > After fixing different bugs we can refactor this function: > > - be paranoid - read only max possibly amount of entries supported by > > the HW. > > - pass error values returned by regmap > > > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > > --- > > drivers/net/dsa/microchip/ksz8795.c | 41 ++++++++++++++--------- > > -- > > drivers/net/dsa/microchip/ksz8795_reg.h | 1 + > > 2 files changed, 24 insertions(+), 18 deletions(-) > > > > diff --git a/drivers/net/dsa/microchip/ksz8795.c > > b/drivers/net/dsa/microchip/ksz8795.c > > index 736cf4e54333..308b46bb2ce5 100644 > > --- a/drivers/net/dsa/microchip/ksz8795.c > > +++ b/drivers/net/dsa/microchip/ksz8795.c > > @@ -949,26 +949,31 @@ void ksz8_flush_dyn_mac_table(struct ksz_device > > *dev, int port) > > int ksz8_fdb_dump(struct ksz_device *dev, int port, > > dsa_fdb_dump_cb_t *cb, void *data) > > { > > - int ret = 0; > > - u16 i = 0; > > - u16 entries = 0; > > - u8 src_port; > > - u8 mac[ETH_ALEN]; > > + u16 i, entries = 0; > > + int ret; > > > > - do { > > - ret = ksz8_r_dyn_mac_table(dev, i, mac, &src_port, > > - &entries); > > - if (!ret && port == src_port) { > > - ret = cb(mac, 0, false, data); > > - if (ret) > > - break; > > - } > > - i++; > > - } while (i < entries); > > - if (i >= entries) > > - ret = 0; > > + for (i = 0; i < KSZ8_DYN_MAC_ENTRIES; i++) { > > + u8 mac[ETH_ALEN]; > > + u8 src_port; > > Any specific reason for declaring variable within for loop instead of > outside. No. It is personal preference to declare variables within the scope where variable is used.
diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index 736cf4e54333..308b46bb2ce5 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -949,26 +949,31 @@ void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port) int ksz8_fdb_dump(struct ksz_device *dev, int port, dsa_fdb_dump_cb_t *cb, void *data) { - int ret = 0; - u16 i = 0; - u16 entries = 0; - u8 src_port; - u8 mac[ETH_ALEN]; + u16 i, entries = 0; + int ret; - do { - ret = ksz8_r_dyn_mac_table(dev, i, mac, &src_port, - &entries); - if (!ret && port == src_port) { - ret = cb(mac, 0, false, data); - if (ret) - break; - } - i++; - } while (i < entries); - if (i >= entries) - ret = 0; + for (i = 0; i < KSZ8_DYN_MAC_ENTRIES; i++) { + u8 mac[ETH_ALEN]; + u8 src_port; - return ret; + ret = ksz8_r_dyn_mac_table(dev, i, mac, &src_port, &entries); + if (ret == -ENXIO) + return 0; + if (ret) + return ret; + + if (i >= entries) + return 0; + + if (port != src_port) + continue; + + ret = cb(mac, 0, false, data); + if (ret) + return ret; + } + + return 0; } int ksz8_mdb_add(struct ksz_device *dev, int port, diff --git a/drivers/net/dsa/microchip/ksz8795_reg.h b/drivers/net/dsa/microchip/ksz8795_reg.h index 7a57c6088f80..0bdceb534192 100644 --- a/drivers/net/dsa/microchip/ksz8795_reg.h +++ b/drivers/net/dsa/microchip/ksz8795_reg.h @@ -811,5 +811,6 @@ #define TAIL_TAG_LOOKUP BIT(7) #define FID_ENTRIES 128 +#define KSZ8_DYN_MAC_ENTRIES 1024 #endif