From patchwork Mon Nov 28 12:00:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 26719 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5613426wrr; Mon, 28 Nov 2022 04:08:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf47XFn/Q3g+AOwtQAE5NYFurYiVbAhD7EVRz2GmEkNSiAmaw7uP8sdfFCrnnY4uyy3scC6R X-Received: by 2002:a17:90a:ee87:b0:218:bb14:ba3a with SMTP id i7-20020a17090aee8700b00218bb14ba3amr36605569pjz.119.1669637319211; Mon, 28 Nov 2022 04:08:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669637319; cv=none; d=google.com; s=arc-20160816; b=urhH5BuNwVjU0pLHz423Bqytee4kb7NsV3WVAQQ868BQC0wiLwLVSEF9mACH9vTX98 9b9ezDomIURhXUObv/iuplXftwP8QJaQqsROtJhgu48zWm0lW4hAPv/FX3XQQeF2i4oz U6ej92Q75AUlnwUXGydFAS54eyxrTb1OkluO+I6Yj+DmlLHDVhz3JQdfoHZHDQF722A4 57jKjC+zaymic/Jhp9R7gmTRsNPRY9SOMfmjhW5RbfF1EBGTpCVqk5g9bxzHmkp4trx3 pSTp5bzktVPB+B1b4EhrndNfpVMS/GrNI8R+sp/xnHreTj7uTZxUeO8zvDNlwCntSnWG 8KQQ== 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=AI4vgLMokSFtXuhS/fU19VOQmg+maEjayXr2vgpwBcU0PDUTdEcgSJfK0CuJI3fwvI I7ubuxJjIqCKyTS7Xx3AsSDar7yuraJkvJ2GCnUF+6wCCdmbMhPj9sAuSOiPyUJ5A8TD uK3ps7Bfq+Cc9kvplq93bGJeBdPPEMUnlY0xdMXIqrYKfR9DiaCU/mbwp7h7woeN3nzX fa/h97JBwfk/T13RtUufDoAS1DYEYnfrv85sbFpLgrEwOorJXOPVtRnJdCsphf9KECq3 3986UkrgfjjngWCdOuJ0drlGA8ySEwp9ENEIrA3N4YGO3LJ7wELDt2sncyu6W6ysTKrK ZDhA== 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 d10-20020a170903230a00b00186b697ec66si12892964plh.399.2022.11.28.04.08.25; Mon, 28 Nov 2022 04:08:39 -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 S231488AbiK1MEX (ORCPT + 99 others); Mon, 28 Nov 2022 07:04:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231528AbiK1MAt (ORCPT ); Mon, 28 Nov 2022 07:00:49 -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 873A5186F8 for ; Mon, 28 Nov 2022 04:00:48 -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 ) id 1ozcoU-0005Nn-DB; Mon, 28 Nov 2022 13:00:42 +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 ) id 1ozcoS-000oC6-OT; Mon, 28 Nov 2022 13:00:41 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ozcoN-00H6OH-P1; Mon, 28 Nov 2022 13:00:35 +0100 From: Oleksij Rempel To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Oleksij Rempel , 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 13:00:18 +0100 Message-Id: <20221128120034.4075562-11-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221128120034.4075562-1-o.rempel@pengutronix.de> References: <20221128120034.4075562-1-o.rempel@pengutronix.de> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750741621602978116?= X-GMAIL-MSGID: =?utf-8?q?1750741621602978116?= 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 --- 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; - 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