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; } From patchwork Wed Mar 22 14:31:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 73462 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2376212wrt; Wed, 22 Mar 2023 07:37:35 -0700 (PDT) X-Google-Smtp-Source: AK7set+5OYZHSkgGj/f2IRKvS/GswSOaxlFZ2zJ+/NCcq/GHxwMVu3w4jT+4yRZfVnoIbrwH8L2B X-Received: by 2002:a17:906:ce5c:b0:933:4184:f0d7 with SMTP id se28-20020a170906ce5c00b009334184f0d7mr7801556ejb.69.1679495855246; Wed, 22 Mar 2023 07:37:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679495855; cv=none; d=google.com; s=arc-20160816; b=VrVREO5K376c0py6V1P3+QnsA7RojwH5ducuC7HX78zC9e3nk6WHzuqaYbY9aA5akb ynZS6p7Ne9RsFtt/URUWbAkNscicJ90f5p9u8FsL/bq+YyWFPzk/b5scqVA3BMUDBwO4 5H9Es0Pyx1A2u3gPCccDTSxRl/bI2QnJmaaxcIBCu8dCbZQ7hP7FBRfEyxMJMU635qAJ YkyqrCsc5I1ZRYMDOvef8nX9QcWiS3AEueIR03x3ZvqlhArr5WbhaAKaoQTklef1RJzb fcH1kDoHNTGnKmxyvllpnWc8Wd865Wby0sIcxPiiViyZbIfiRzS0479hsJHFvDXnlpbg HDJQ== 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=hK9QKF1zTSJo3M0FBtZudbO+YN7RitbHnuzi6Kn9eyE=; b=YzSrkq2g+Glsb62RF0Y57y2B44pd+d3Vn1h6bFvyVK5cuV1lP1KS1UGv15/Hei4pKw /rG9jfbn96C2aJmObPPwPLjpq+lLwwg2uNjtbIXk9bsPY2MMqQ3WBKtYBGPP7wiYP5/w Jl/tDBq3dou+6TmE0YcCpVe5LW5GMrpOFCE3Ip/H81JVuAdBIfyApZve0FX5emXHiDR2 nbflPXx6Kp81KkJT9nEBShBgcUuYEsjwyvroqE3cm7FcJN26M7WuPMsm+NuCsm0BzEMY NxnnfE2cl7xiAhHI5MdZbdlfEhTunMaHe7sHIitKq5hER6IYLg2gBSuBJQ3OHkizdwU6 E4PA== 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 x26-20020a1709060a5a00b009314c7ae06csi16118016ejf.191.2023.03.22.07.37.12; Wed, 22 Mar 2023 07:37:35 -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 S231542AbjCVObv (ORCPT + 99 others); Wed, 22 Mar 2023 10:31:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231239AbjCVObq (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 2CD5B62B5B for ; Wed, 22 Mar 2023 07:31:45 -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-0003Os-Aq; 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 1pezUy-005wWF-Ix; Wed, 22 Mar 2023 15:31:32 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pezUx-0060Zl-2v; 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 2/6] net: dsa: microchip: ksz8: fix ksz8_fdb_dump() to extract all 1024 entries Date: Wed, 22 Mar 2023 15:31:26 +0100 Message-Id: <20230322143130.1432106-3-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?1761079045969840194?= X-GMAIL-MSGID: =?utf-8?q?1761079045969840194?= Current ksz8_fdb_dump() is able to extract only max 249 entries on the ksz8863/ksz8873 series of switches. This happened due to wrong bit mask and offset calculation. This commit corrects the issue and allows for the complete extraction of all 1024 entries. Fixes: d23a5e18606c ("net: dsa: microchip: move ksz8->masks to ksz_common") Signed-off-by: Oleksij Rempel Acked-by: Arun Ramadoss --- drivers/net/dsa/microchip/ksz_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 7fc2155d93d6..3a1afc9f4621 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -407,10 +407,10 @@ static const u32 ksz8863_masks[] = { [STATIC_MAC_TABLE_FID] = GENMASK(29, 26), [STATIC_MAC_TABLE_OVERRIDE] = BIT(20), [STATIC_MAC_TABLE_FWD_PORTS] = GENMASK(18, 16), - [DYNAMIC_MAC_TABLE_ENTRIES_H] = GENMASK(5, 0), + [DYNAMIC_MAC_TABLE_ENTRIES_H] = GENMASK(1, 0), [DYNAMIC_MAC_TABLE_MAC_EMPTY] = BIT(7), [DYNAMIC_MAC_TABLE_NOT_READY] = BIT(7), - [DYNAMIC_MAC_TABLE_ENTRIES] = GENMASK(31, 28), + [DYNAMIC_MAC_TABLE_ENTRIES] = GENMASK(31, 24), [DYNAMIC_MAC_TABLE_FID] = GENMASK(19, 16), [DYNAMIC_MAC_TABLE_SRC_PORT] = GENMASK(21, 20), [DYNAMIC_MAC_TABLE_TIMESTAMP] = GENMASK(23, 22), @@ -420,7 +420,7 @@ static u8 ksz8863_shifts[] = { [VLAN_TABLE_MEMBERSHIP_S] = 16, [STATIC_MAC_FWD_PORTS] = 16, [STATIC_MAC_FID] = 22, - [DYNAMIC_MAC_ENTRIES_H] = 3, + [DYNAMIC_MAC_ENTRIES_H] = 8, [DYNAMIC_MAC_ENTRIES] = 24, [DYNAMIC_MAC_FID] = 16, [DYNAMIC_MAC_TIMESTAMP] = 24, From patchwork Wed Mar 22 14:31:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 73488 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2389504wrt; Wed, 22 Mar 2023 08:04:04 -0700 (PDT) X-Google-Smtp-Source: AK7set+lkssPnnZLnmM/WyinA3Yv9yQKXmqePIVZzaMA0Mq5qvv5f38nt9yUzYAesZ2ReFD8FDL0 X-Received: by 2002:a17:902:e394:b0:1a1:dd2a:fe6c with SMTP id g20-20020a170902e39400b001a1dd2afe6cmr2309426ple.53.1679497444522; Wed, 22 Mar 2023 08:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679497444; cv=none; d=google.com; s=arc-20160816; b=D7bCPkEl0MxdCyHanwJxKRVcKc3t/P5Qi74/ZmgKjTke9ILlN0o/hip1k4U5M6+Z69 gyOk4iic7/wJmCLXwt2ZU4jOd22wN84DXSIQ59qFz9hwRI71l0rmMD+2fRowytROQUIe N08OQffALbJZuOXZBAF/5uFv+FJVctS46rMlyuZ4xDLmY7wEb+YlZbR0jZ6cgXNCix4m xpp0K//fvjfJv+cuJbc7AzLSGWT0ifU7Cm+O8eC+CUqNGfSxozZJEozBNul76vqECpdH pdw0Igv1vHD07FA8ex2R6v1BIdBXm/fAmBfDImjAwGtLho+pWtrq2aJ7yxHWs+5U8o4R sugA== 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=WPXfawoAPZIhrLeJjVGUO/6X1PFuKGP46KbvihpELhM=; b=Os1XnJRNYeqa+YbflNZzGRG5voca72LzheFxgZI5aIsl4+3J1v6jBkPURaxmixsskO aqxPlps8AZFswCqYjqeRIwUHBuCSTiucfHFxNqa0Z8e+RYRQa2Fi/kwlTbNv8+NXlEg7 YWwyuTH9YfHOX/EX1HQ5vYGMxcHfoP5rxF2W+3IkQwCEqgUdCEc7ynxMwJkWobSTCGGZ scbuOw9ZbYYEnm6mnKBt7IFm4eFwTNRiCXWp7Hm3ZOSAFsAp8f2RI7y/pOP8Euh54HVw m4KzH1ZVdhtWfCNN1VY16jKPTseUTZUh73kTb4hZHStVF5GKw2S5Z9zpumQ/Kv4OSWGj ObvQ== 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 bk13-20020a056a02028d00b00512fab8c401si1042732pgb.427.2023.03.22.08.03.51; Wed, 22 Mar 2023 08:04:04 -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 S231579AbjCVOcG (ORCPT + 99 others); Wed, 22 Mar 2023 10:32:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231509AbjCVObr (ORCPT ); Wed, 22 Mar 2023 10:31:47 -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 1203262B5B for ; Wed, 22 Mar 2023 07:31:47 -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-0003PF-As; 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 1pezUy-005wWO-VX; Wed, 22 Mar 2023 15:31:32 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pezUx-0060Zu-3W; 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 3/6] net: dsa: microchip: ksz8: fix offset for the timestamp filed Date: Wed, 22 Mar 2023 15:31:27 +0100 Message-Id: <20230322143130.1432106-4-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?1761080712608437743?= X-GMAIL-MSGID: =?utf-8?q?1761080712608437743?= We are using wrong offset, so we will get not a timestamp. Fixes: d23a5e18606c ("net: dsa: microchip: move ksz8->masks to ksz_common") Signed-off-by: Oleksij Rempel Acked-by: Arun Ramadoss --- drivers/net/dsa/microchip/ksz_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 3a1afc9f4621..c914449645ca 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -423,7 +423,7 @@ static u8 ksz8863_shifts[] = { [DYNAMIC_MAC_ENTRIES_H] = 8, [DYNAMIC_MAC_ENTRIES] = 24, [DYNAMIC_MAC_FID] = 16, - [DYNAMIC_MAC_TIMESTAMP] = 24, + [DYNAMIC_MAC_TIMESTAMP] = 22, [DYNAMIC_MAC_SRC_PORT] = 20, }; From patchwork Wed Mar 22 14:31:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 73484 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2386220wrt; Wed, 22 Mar 2023 07:59:00 -0700 (PDT) X-Google-Smtp-Source: AK7set9eI9sA+7yIsHMBc6Il+hRg37hxFeJQXVKrVk14l5DuGTNw8aM6l9eSN6RRuZYWQfFhVrEG X-Received: by 2002:a62:4e8f:0:b0:625:cc63:642b with SMTP id c137-20020a624e8f000000b00625cc63642bmr2846268pfb.14.1679497140332; Wed, 22 Mar 2023 07:59:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679497140; cv=none; d=google.com; s=arc-20160816; b=HUqgZt9mCpLs+SrZPmN3bkVc6GT3tw58rXPljdUCi6C+MqHwAaKQnoXue8HCvg71iX Si/y2UNNTtKRyMytSkLu5/x+jNJss2Y1SFkXvJM1eGl7o5QIrGCfGu9zLzJdZ7S7vG7T glt72HNdA0eiWqsQmzShhXP8n2lVfx0JlhKcvDlMIsydSppqFF9x0Cj9bMrSr+Gflm0h PsiTkcz0FF3KtQtQWe7SQEBste3bsIkCZiGVLz440gC/NNlCamO5jELeLCtnur8pnWcX rGJTH/MKC79G2DFlWQ2+lR5Yu3QPD4OhaimS4L0Kr/iOS7UR66asepMCUeGbfwH5F2U1 wFMg== 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=4WFugXcRop/JhBfW0Fo0osjYXMermoBlK4nMj1okSCw=; b=hHFuBFMWEdnYGpnR2Pgo4RK1+EbR/D1nrGVr28zRCnM3s4zB/FHNikSWEvYTGGGNHm ZsFsU6M9pdra0cgYinbZ27KN/FEoer9TeUF5eLQHwPL+dLbcqzq/n1iyYrTgaEEkIAQr AQGRGHyHg3bT+d32tymWnPWzrnsh177EbcnWLcYv5grhc2ZDz6IklwN4QwpGxf31eBfb hcAk+UnbgdyLH/2mSZt97Fc/kZ0GbfijNu6lnWS23XeNM1LAZRGB5v7noW98ZYamYwws 4l3DYSnag2WHjVeXGjsiGSN1ZEEXaAfjP2nDbgRk20phCxmAoVX+hv02J3BfR3Qj/Fa7 +3cQ== 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 x26-20020a63171a000000b005004b2acf6dsi16069633pgl.810.2023.03.22.07.58.47; Wed, 22 Mar 2023 07:59: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 S231564AbjCVOb6 (ORCPT + 99 others); Wed, 22 Mar 2023 10:31:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231472AbjCVObq (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 9158562B73 for ; Wed, 22 Mar 2023 07:31:45 -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-0003Op-Ar; 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 1pezUy-005wW6-7e; Wed, 22 Mar 2023 15:31:32 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pezUx-0060a3-45; 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 4/6] net: dsa: microchip: ksz8: ksz8_fdb_dump: avoid extracting ghost entry from empty dynamic MAC table. Date: Wed, 22 Mar 2023 15:31:28 +0100 Message-Id: <20230322143130.1432106-5-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?1761080393799900522?= X-GMAIL-MSGID: =?utf-8?q?1761080393799900522?= If the dynamic MAC table is empty, we will still extract one outdated entry. Fix it by using correct bit offset. Fixes: d23a5e18606c ("net: dsa: microchip: move ksz8->masks to ksz_common") Signed-off-by: Oleksij Rempel Acked-by: Arun Ramadoss --- drivers/net/dsa/microchip/ksz_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index c914449645ca..4929fb29ed06 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -408,7 +408,7 @@ static const u32 ksz8863_masks[] = { [STATIC_MAC_TABLE_OVERRIDE] = BIT(20), [STATIC_MAC_TABLE_FWD_PORTS] = GENMASK(18, 16), [DYNAMIC_MAC_TABLE_ENTRIES_H] = GENMASK(1, 0), - [DYNAMIC_MAC_TABLE_MAC_EMPTY] = BIT(7), + [DYNAMIC_MAC_TABLE_MAC_EMPTY] = BIT(2), [DYNAMIC_MAC_TABLE_NOT_READY] = BIT(7), [DYNAMIC_MAC_TABLE_ENTRIES] = GENMASK(31, 24), [DYNAMIC_MAC_TABLE_FID] = GENMASK(19, 16), From patchwork Wed Mar 22 14:31:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 73463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2376278wrt; Wed, 22 Mar 2023 07:37:42 -0700 (PDT) X-Google-Smtp-Source: AK7set8IyYn5BLHmqQcf7aP5EtiXUJWPTVzpXfiSOs97VlYGyodgD4bz6ZbbaLK7yq1c1fwOfWuT X-Received: by 2002:a17:906:abc2:b0:88d:79df:7cfc with SMTP id kq2-20020a170906abc200b0088d79df7cfcmr6922856ejb.62.1679495862392; Wed, 22 Mar 2023 07:37:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679495862; cv=none; d=google.com; s=arc-20160816; b=x0GOmeOE4HFEakJKP1P0VjcAr54iuH4bHlrCYs54unzhqHs5GpM1CKI2Rx+La5z6Yq ty2PCz8bsWdVb83iWNkzTfbiwC4zvuKVM6hQn8TI2J3KsG8LSQFimR61TVXqJ5Ro4ac3 HsBiY0F2Bhwe0xqz907bsbg7+Byz0qERLCwsDYt6JP1AnDh0HZDJybdsxaVtW/0c2j4w qhIBvlgzL3ySiDcMtFhPI0Ue00vHQRYbItrXMFKLjT6CgXfGh2Syl+ufI96vJklr0dkx /yJ8GrAMknOMLtOIvZa0bMTRTSv61Z3xSHhCyfC2wwMZ3MnkUKPfXdZZfeS5K0e5G0F1 m1iA== 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=ftyZkezow/yq/umpSr2J6hwErKUgfJMIvrS5SOy9gEA=; b=vEnV0w7AMHw/UyPNrliISVD+iC1vvRNqjkfq3ozf6i07lcXuAlpWHUmpG0nZXOH+9U 8b5BySE3/00q8TF667erQQapa/4VBChTvmVIEsQgxQa6Upt9zph6kiGvaPayWP+o5V03 kbzPYriGj3Rn2yUmxDGAB7k6jR1nQ/W1ZRjX/ucujzSjvAPHsIIU60THqiewtzUp+0fx tus5npHsh1f3cZjjLvsU9cFwMqpKTQIYwT18Y7zjXGA0GmMaIxJX85CCnJhetQKB2N7q my07R+dllfDsTeha8NDYWghLGVO9pGAFTmbKK0uXQVBhlKxzpmeb4bcMWQ5MdC4NiyFx CHPA== 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 v14-20020a170906380e00b0092ed67b5765si14247317ejc.140.2023.03.22.07.37.19; Wed, 22 Mar 2023 07:37:42 -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 S231504AbjCVObz (ORCPT + 99 others); Wed, 22 Mar 2023 10:31:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231389AbjCVObq (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 E211162B54 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-0003Ou-At; 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 1pezUy-005wWL-Oy; Wed, 22 Mar 2023 15:31:32 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pezUx-0060aC-4f; 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 5/6] net: dsa: microchip: ksz8863_smi: fix bulk access Date: Wed, 22 Mar 2023 15:31:29 +0100 Message-Id: <20230322143130.1432106-6-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?1761079053279217220?= X-GMAIL-MSGID: =?utf-8?q?1761079053279217220?= Current regmap bulk access is broken, resulting to wrong reads/writes if ksz_read64/ksz_write64 functions are used. Mostly this issue was visible by using ksz8_fdb_dump(), which returned corrupt MAC address. The reason is that regmap was configured to have max_raw_read/write, even if ksz8863_mdio_read/write functions are able to handle unlimited read/write accesses. On ksz_read64 function we are using multiple 32bit accesses by incrementing each access by 1 instead of 4. Resulting buffer had 01234567.12345678 instead of 01234567.89abcdef. We have multiple ways to fix it: - enable 4 byte alignment for 32bit accesses. Since the HW do not have this requirement. It will break driver. - disable max_raw_* limit. This patch is removing max_raw_* limit for regmap accesses in ksz8863_smi. Fixes: 60a364760002 ("net: dsa: microchip: Add Microchip KSZ8863 SMI based driver support") Signed-off-by: Oleksij Rempel --- drivers/net/dsa/microchip/ksz8863_smi.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c b/drivers/net/dsa/microchip/ksz8863_smi.c index 2f4623f3bd85..2516c9db7fec 100644 --- a/drivers/net/dsa/microchip/ksz8863_smi.c +++ b/drivers/net/dsa/microchip/ksz8863_smi.c @@ -70,6 +70,7 @@ static int ksz8863_mdio_write(void *ctx, const void *data, size_t count) tmp, val[i]); if (ret < 0) goto out; + } out: @@ -82,22 +83,16 @@ static const struct regmap_bus regmap_smi[] = { { .read = ksz8863_mdio_read, .write = ksz8863_mdio_write, - .max_raw_read = 1, - .max_raw_write = 1, }, { .read = ksz8863_mdio_read, .write = ksz8863_mdio_write, .val_format_endian_default = REGMAP_ENDIAN_BIG, - .max_raw_read = 2, - .max_raw_write = 2, }, { .read = ksz8863_mdio_read, .write = ksz8863_mdio_write, .val_format_endian_default = REGMAP_ENDIAN_BIG, - .max_raw_read = 4, - .max_raw_write = 4, } }; @@ -108,7 +103,6 @@ static const struct regmap_config ksz8863_regmap_config[] = { .pad_bits = 24, .val_bits = 8, .cache_type = REGCACHE_NONE, - .use_single_read = 1, .lock = ksz_regmap_lock, .unlock = ksz_regmap_unlock, }, @@ -118,7 +112,6 @@ static const struct regmap_config ksz8863_regmap_config[] = { .pad_bits = 24, .val_bits = 16, .cache_type = REGCACHE_NONE, - .use_single_read = 1, .lock = ksz_regmap_lock, .unlock = ksz_regmap_unlock, }, @@ -128,7 +121,6 @@ static const struct regmap_config ksz8863_regmap_config[] = { .pad_bits = 24, .val_bits = 32, .cache_type = REGCACHE_NONE, - .use_single_read = 1, .lock = ksz_regmap_lock, .unlock = ksz_regmap_unlock, } From patchwork Wed Mar 22 14:31:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 73461 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2376082wrt; Wed, 22 Mar 2023 07:37:21 -0700 (PDT) X-Google-Smtp-Source: AK7set+GtAVOzlG+gUNLdaMz17jwuf/Ox9nscOY94WRbk5PwGF/bh3RabC2HOFh/WRURrMWdm7gH X-Received: by 2002:a17:906:2488:b0:92f:ccf3:f0ce with SMTP id e8-20020a170906248800b0092fccf3f0cemr8506305ejb.45.1679495841006; Wed, 22 Mar 2023 07:37:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679495840; cv=none; d=google.com; s=arc-20160816; b=rEIUlDuZY71lYe15KWwuZI8GinY6Lszdmy2alIr9+fagdKP6eupqsg9GStzBcZtSf4 EwDXRLvEcNK6qOgCBb2Gy+3+WTZDSsgLKKevd/eS73wq4klpH8MzHZKmNWPwcIABQeyH Li/Y+Yz4SNSMOvvzpj7G/z8pgKjyaWt/ysjQPvw8E69lEF/8aP0KHeO3DkoWM6kXAu16 x6ORgXugncjC+4+qFP/06SBK7d2jDAzFJRpaJUfr0FqJtfEm1oGABbqnd0lwGHY5KVhC PFa2Fu6QU2KPj5Qv2prdNU8Z0R66T+sb84IYj6FJ9+bYENT0KQN/ZxzYlNHpN766NTla PR0A== 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=6mALEcV9zA/4z4es/IPu5h8Mipk9xWByKuXtPRiSfDM=; b=bPgAMafwLp/3IXZowqy13Qm3UXs25BSrTaX8OeNVC1mM9VPzPjgoZdCkqRW0g0fnEr GDn59JTGgZEz98R4uAd64+0X4L6sR5EhygJxSgG8r7iaC8ZlhJT+kYSFGyPFU9UyIsNv EhcAEr3OeY2nX2PhSH9XCnvK8yDoPyPT3dmwalnLZSZUFvsMFJp57pn0x5P5UIBrxRmK uYfK0y4n+jDF0wmC4kZZro5faTwz72b2Y7B+vBpeYnbyMaF99KvhSzaAqwitm+JaCq42 Ah260aTAMYSujbM5NByF0i7qe8YQ58DUmBZWtoULARfRzNkH4988wVYU70mj7sD9dGW/ WQZQ== 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 v9-20020a170906338900b0093346a7ad4esi11736550eja.1005.2023.03.22.07.36.57; Wed, 22 Mar 2023 07:37:20 -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 S231495AbjCVObr (ORCPT + 99 others); Wed, 22 Mar 2023 10:31:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230508AbjCVObp (ORCPT ); Wed, 22 Mar 2023 10:31:45 -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 81A3E62B49 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-0003Ot-Aw; 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 1pezUy-005wWG-K2; Wed, 22 Mar 2023 15:31:32 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pezUx-0060aL-5F; 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 6/6] net: dsa: microchip: ksz8: fix MDF configuration with non-zero VID Date: Wed, 22 Mar 2023 15:31:30 +0100 Message-Id: <20230322143130.1432106-7-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?1761079031008833065?= X-GMAIL-MSGID: =?utf-8?q?1761079031008833065?= FID is directly mapped to VID. However, configuring a MAC address with a VID != 0 resulted in incorrect configuration due to an incorrect bit mask. This kernel commit fixed the issue by correcting the bit mask and ensuring proper configuration of MAC addresses with non-zero VID. Fixes: d23a5e18606c ("net: dsa: microchip: move ksz8->masks to ksz_common") Signed-off-by: Oleksij Rempel Acked-by: Arun Ramadoss --- drivers/net/dsa/microchip/ksz_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 4929fb29ed06..74c56d05ab0b 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -404,7 +404,7 @@ static const u32 ksz8863_masks[] = { [VLAN_TABLE_VALID] = BIT(19), [STATIC_MAC_TABLE_VALID] = BIT(19), [STATIC_MAC_TABLE_USE_FID] = BIT(21), - [STATIC_MAC_TABLE_FID] = GENMASK(29, 26), + [STATIC_MAC_TABLE_FID] = GENMASK(25, 22), [STATIC_MAC_TABLE_OVERRIDE] = BIT(20), [STATIC_MAC_TABLE_FWD_PORTS] = GENMASK(18, 16), [DYNAMIC_MAC_TABLE_ENTRIES_H] = GENMASK(1, 0),