From patchwork Wed Mar 22 14:31:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 73474 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2382733wrt; Wed, 22 Mar 2023 07:51:00 -0700 (PDT) X-Google-Smtp-Source: AK7set/eUUp6RzcV+D8L4QnpBEjUsYT4tgtasYKRd0970TaCzp7C+ym2jSUbpLjbywBTmUkEQdnO X-Received: by 2002:aa7:cb18:0:b0:500:2e59:ffff with SMTP id s24-20020aa7cb18000000b005002e59ffffmr7305164edt.6.1679496660560; Wed, 22 Mar 2023 07:51:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679496660; cv=none; d=google.com; s=arc-20160816; b=NOLDwDdbF51rOSFC+1wXlcHaafcZCU1f0p/04iFlhgmcKSfnmHxbsCzfW+WQCxG3cg Aq087XHqoFxpZ+Y4cQgUpsotnhbo6HQOfnLyb3qWsnRmnwYS/p7LnyyNdzHlsE9+neoh nDoSvaGXvHEdWsvkp40lDkNwz6iWa/PdwDTmSPF+X4pR73udxKV9C2ZzrNFOqkbJ7D19 8gGqTa0tediKnUNSaziau4wy4bo8h9LXABjBlFkq38x8opUHCCpiw4NZXRCdtvuPZy7/ Olws17gKV0mkvZDQbGwEMJr45hY/A3YISfNLitEYL1c06l+HAqTMCH3asaiiDTULNLVs L4Dw== 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=FuazTsxa2eFc7vknsBjwJbGZuins2/IAVF/8HGUBqPk=; b=qVadZsacjmDs+2YW5/5DrysF6FqE95opVQeldRXt368w8Qaz6nc6uTWW1gk2w8QBLP gvOkMnoP3OjsCTe7bK8r9tBsb8Tk0/gpbFcKgt9CGcDmtHYm2GM6eEDweO5QOZUzer9I W6ATtZ95nb2fs+bV52tTTC346TyEGc+49b/+YuBFVOeDMSR880/HIHOWUQJtZyzNOPvh p/rvFoMHecZ+yPEEbkfpEUy6DFpKnL9kLBWtc8hoke1Mg4UOz0HYwEH+ylBogmTIlUU8 nVQ4jHBYoRwX4rbPNtcwuU/xk7Cj/2hTgw1WLyGVxU3q85fWA+7xkmNl+qdrMg2PybPg rYrQ== 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 s15-20020aa7c54f000000b004ace74aa18esi17118346edr.402.2023.03.22.07.50.35; Wed, 22 Mar 2023 07:51:00 -0700 (PDT) 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 S231536AbjCVObt (ORCPT + 99 others); Wed, 22 Mar 2023 10:31:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231146AbjCVObq (ORCPT ); Wed, 22 Mar 2023 10:31:46 -0400 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 9DB5F62B4C for ; Wed, 22 Mar 2023 07:31:44 -0700 (PDT) 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 1pezV1-0003Oo-Ay; Wed, 22 Mar 2023 15:31:35 +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 1pezUx-005wW3-ST; Wed, 22 Mar 2023 15:31:31 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pezUx-0060Zc-2B; Wed, 22 Mar 2023 15:31:31 +0100 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com Subject: [PATCH net v1 1/6] net: dsa: microchip: ksz8: fix ksz8_fdb_dump() Date: Wed, 22 Mar 2023 15:31:25 +0100 Message-Id: <20230322143130.1432106-2-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230322143130.1432106-1-o.rempel@pengutronix.de> References: <20230322143130.1432106-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=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761079890701093074?= X-GMAIL-MSGID: =?utf-8?q?1761079890701093074?= Before this patch, the ksz8_fdb_dump() function had several issues, such as uninitialized variables and incorrect usage of source port as a bit mask. These problems caused inaccurate reporting of vid information and port assignment in the bridge fdb. Fixes: e587be759e6e ("net: dsa: microchip: update fdb add/del/dump in ksz_common") Signed-off-by: Oleksij Rempel Acked-by: Arun Ramadoss --- drivers/net/dsa/microchip/ksz8795.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index 003b0ac2854c..3fffd5da8d3b 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -958,15 +958,14 @@ int ksz8_fdb_dump(struct ksz_device *dev, int port, u16 entries = 0; u8 timestamp = 0; u8 fid; - u8 member; - struct alu_struct alu; + u8 src_port; + u8 mac[ETH_ALEN]; do { - alu.is_static = false; - ret = ksz8_r_dyn_mac_table(dev, i, alu.mac, &fid, &member, + ret = ksz8_r_dyn_mac_table(dev, i, mac, &fid, &src_port, ×tamp, &entries); - if (!ret && (member & BIT(port))) { - ret = cb(alu.mac, alu.fid, alu.is_static, data); + if (!ret && port == src_port) { + ret = cb(mac, fid, false, data); if (ret) break; }