From patchwork Fri Mar 24 08:06:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 74418 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp457530vqo; Fri, 24 Mar 2023 01:19:11 -0700 (PDT) X-Google-Smtp-Source: AK7set/7NONOfqu9Bi2XVDnooInmF7MVunmqj+SCXeFMJLW39ZHXwMboWn3eE43Xxl3T9EduzpoU X-Received: by 2002:aa7:8f3c:0:b0:627:6328:79d7 with SMTP id y28-20020aa78f3c000000b00627632879d7mr1801082pfr.34.1679645951283; Fri, 24 Mar 2023 01:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679645951; cv=none; d=google.com; s=arc-20160816; b=z8hLOH1Xx0T53j3GeE1/0co9Q1G7ueGlyIuQCo1N5CxHI40kyN+mxxcMP1Hk8+T/h6 x/G0saxKoJMcH7PMJT1DBoQSY4Pm+EpXaf17+MIn5ZiFx78HIJMtfd/ptshN2KWTwVXp wZUuY1Kp0VFKpkats/4skbZ/oDTP0rA2L5LE2My8s+jPbbT8gSVFgeulIoe43H2sxIfm GOHoCq4W2Z6QVqtaex3OPl+vo+O6fkIUJAIEsH4VaaRUa3snlkhcofwkNudNf/KeR/ZB ynwTs+0q+0u0Xh562nDtY+RPHoawtot62QRvJ4XGh38BDDcrkMNF76skHaUvKR/z51xu EGrg== 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=dimf+oRW7gXL8GlUUWr61YaKGpxrf4GRQmWLWgF7HE4=; b=qOjPx6FZXq4Dg67C1pAKCU0cEtxErvO8h/zcL+RMx6TJ6FffyRFY9J8eszpClDKVPC QgK47EtHwW/COC4cabgM7pyisFbBvUndL6cePnbq4sZ4ckzfiLyhc6Bih8umoQPs4F5Y nSm1aWvh527fpbYaPWMO3jKgXXxYJ2S2KE9od/PeMEgZkYnZpizEtK+OC9FGC6Oam4Gj 94XnbFLJBWFx5eh35Fp2uxP+A32uSiTg1zTEfHeWs8sGtC9YFPJqrVVYL32JI+qiK7Of TXf8b5b06lFufzRY4PWxHHEyzlAqlnZhb8MoyaxapbbJigAyiz079ec4p6KgR2r0SK8D AmqQ== 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 t18-20020a62d152000000b005935dae4234si21100677pfl.306.2023.03.24.01.18.58; Fri, 24 Mar 2023 01:19:11 -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 S231706AbjCXIGk (ORCPT + 99 others); Fri, 24 Mar 2023 04:06:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231281AbjCXIGX (ORCPT ); Fri, 24 Mar 2023 04:06:23 -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 06D272387B for ; Fri, 24 Mar 2023 01:06:21 -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 1pfcRB-00077P-IU; Fri, 24 Mar 2023 09:06:13 +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 1pfcR8-006KcJ-Bp; Fri, 24 Mar 2023 09:06:10 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pfcR7-00ENyy-Gw; Fri, 24 Mar 2023 09:06:09 +0100 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com Subject: [PATCH net v2 1/6] net: dsa: microchip: ksz8: fix ksz8_fdb_dump() Date: Fri, 24 Mar 2023 09:06:03 +0100 Message-Id: <20230324080608.3428714-2-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230324080608.3428714-1-o.rempel@pengutronix.de> References: <20230324080608.3428714-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?1761236432708565801?= X-GMAIL-MSGID: =?utf-8?q?1761236432708565801?= 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 Reviewed-by: Florian Fainelli --- 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 Fri Mar 24 08:06:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 74421 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp461412vqo; Fri, 24 Mar 2023 01:28:28 -0700 (PDT) X-Google-Smtp-Source: AKy350bAS3KoM8u3fUsmY76d5UnhGZi46mE9ab48T35WT3ajxOoPr4bYylO5ug0DLb7Q5w9M+D4S X-Received: by 2002:a17:90b:1809:b0:237:bf05:40b with SMTP id lw9-20020a17090b180900b00237bf05040bmr2327038pjb.20.1679646507934; Fri, 24 Mar 2023 01:28:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679646507; cv=none; d=google.com; s=arc-20160816; b=sjKC99GsSzkcbn03w/0YGZ7z2E+ozPBd/AKVwXmU3PSHLAhXlgMUVTZI7OHE65411d nTkV/nL333I9R0osXBLRbE1um7fwt5uKMSA6egKbXLaIEO6TkGahBLtkT/vE3/X+Ror5 E9CGchpJjmZ9HgXDLSCXRvwwJCcpmEIvcr4rvlMEw8Y/uLBDtXFwb+js9JhzZPQxIl/A VmgOUtKxeUnkKHAcO9dhhhZHJAwmK6Wup4r2SkKKO1Jp8k11fxEu3rbtLfb8FhJl5rJt LgVBUxuvaQGKy1mi9aokqAb4w1dt26GB1Sr/PsoMR7wZz4ddAKkEIC+0fSqYpEY4yEZX SLJA== 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=xZOrNF4/E99RgicJEWZut4ApkDuqRiNaLQtYhE8GyMY=; b=TXL75hs6/qUVInZeGhi3FJsCdaGymHR34BjmCF8h+aFqsrC7J6gaeCbClj1YjxIJuN CUBDSD16idLDRKu2stvgOpyM9deEvunW+AaO4hARbsGlDwI07UB++TtZkvdNd10lfhsy YOBOTIyeVJEZgBUP8MIVr9RiuIJRUZvbbr6dvqEdXuvFxG+oO3nhil+p0vBwit9dNwoq 8q6tbQC/KS4ujw3FpA9eVe3sRA9rgs7Lhg5QhOHVqXHvJZAfavb2j+ORKjqc7XTZKe1l irMdayoo4gmjRGH/S9YQ2u75Y2hHG02iYvCWNNqkDW+jpbc/ENrhcsNGuCv8OIEJFWBd Ivzg== 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 g130-20020a636b88000000b0050f77f21491si12946712pgc.423.2023.03.24.01.28.15; Fri, 24 Mar 2023 01:28:27 -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 S231792AbjCXIGn (ORCPT + 99 others); Fri, 24 Mar 2023 04:06:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230075AbjCXIGW (ORCPT ); Fri, 24 Mar 2023 04:06:22 -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 F39172386D for ; Fri, 24 Mar 2023 01:06:20 -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 1pfcRB-00077V-IU; Fri, 24 Mar 2023 09:06:13 +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 1pfcR9-006Kcb-M1; Fri, 24 Mar 2023 09:06:11 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pfcR7-00ENz7-Hc; Fri, 24 Mar 2023 09:06:09 +0100 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com Subject: [PATCH net v2 2/6] net: dsa: microchip: ksz8: fix ksz8_fdb_dump() to extract all 1024 entries Date: Fri, 24 Mar 2023 09:06:04 +0100 Message-Id: <20230324080608.3428714-3-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230324080608.3428714-1-o.rempel@pengutronix.de> References: <20230324080608.3428714-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?1761237016297410084?= X-GMAIL-MSGID: =?utf-8?q?1761237016297410084?= 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: 4b20a07e103f ("net: dsa: microchip: ksz8795: add support for ksz88xx chips") Signed-off-by: Oleksij Rempel Acked-by: Arun Ramadoss Reviewed-by: Florian Fainelli --- 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 Fri Mar 24 08:06:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 74426 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp465659vqo; Fri, 24 Mar 2023 01:38:39 -0700 (PDT) X-Google-Smtp-Source: AKy350YtLTu0tErtJgPqKsi1yhSGby0QEU+/zgq3s8694p1BHPMrdGxiD1HVMcg7ZStggWeqc31V X-Received: by 2002:a17:902:d481:b0:1a1:9020:f9d5 with SMTP id c1-20020a170902d48100b001a19020f9d5mr2061133plg.64.1679647119159; Fri, 24 Mar 2023 01:38:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679647119; cv=none; d=google.com; s=arc-20160816; b=oKNl0vIneLfXXeJSxjBL5vm7EyrV15mH0dhTzpp7F96CQaTAEKOQF68K7InGWWINzg Bm39mIqnvf4XKoYaHGN7Vvy7Fnuei3teNmuwX2ze89NZ+GSJWKpGAkjOqyGFomR3SaRW Q6FWQpm4FEpnOX6Uj1IV2uYdYYf/XpFYlCUYF3yh3Jylf5pdw7dFarR/6XBdp6GCGBDY lN+zlx4VntZLvSj3MofZYfg/QuSp6xaxiUCqF9N/RI1LqPTdz88LcUOhu9YYDNKrJ3W8 Sdk0XfTc9Y2DVrAtd9M3S/eibsupKsJvKl6p0nM40I5Mc4tJ/4uPqUYhyibxmw1KubIx lnvg== 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=e9Y8Ys70Xi6VQZrOouecp2/1m0XFuvsAiw+GZQcEQcw=; b=OHbVUIRPBM0cD8kHv77y0Q0z7kli8lbbGsBvpIYj7HoYfqU59yrMlh4GYNyLR9c7ev CxI90jZjtdIkHw/Qxh0FTAVFHh/xBM/dl0eZVUki1UHQXCb6rQNGF/t8Hm7RJHQsO2uZ TR0AUAg5uR0nj1Eq1c6LubN/TGwSnJ5RnUG9NTLxI06JfYM8t2Y669tfCpbWvIx9OCH9 5BLUp+dCOlt9lSdjxBqTcjjgFuYRiMbSZvWmf0d5OQXhv6wMTMx4XXBx+l/naczLscCm 687gXJM48ogR74s+pxKfnlabM0tYhci+q5XXmNpMeqPz9fyAktwqMzBPfBH42rY7SgoG L1Pg== 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 s12-20020a170902ea0c00b001960fd737b6si147573plg.330.2023.03.24.01.38.26; Fri, 24 Mar 2023 01:38:39 -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 S229938AbjCXIGh (ORCPT + 99 others); Fri, 24 Mar 2023 04:06:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231344AbjCXIGX (ORCPT ); Fri, 24 Mar 2023 04:06:23 -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 879FC2387E for ; Fri, 24 Mar 2023 01:06:21 -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 1pfcRB-00077U-IV; Fri, 24 Mar 2023 09:06:13 +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 1pfcR9-006KcW-AO; Fri, 24 Mar 2023 09:06:11 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pfcR7-00ENzG-IG; Fri, 24 Mar 2023 09:06:09 +0100 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com Subject: [PATCH net v2 3/6] net: dsa: microchip: ksz8: fix offset for the timestamp filed Date: Fri, 24 Mar 2023 09:06:05 +0100 Message-Id: <20230324080608.3428714-4-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230324080608.3428714-1-o.rempel@pengutronix.de> References: <20230324080608.3428714-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?1761237657456598639?= X-GMAIL-MSGID: =?utf-8?q?1761237657456598639?= We are using wrong offset, so we will get not a timestamp. Fixes: 4b20a07e103f ("net: dsa: microchip: ksz8795: add support for ksz88xx chips") Signed-off-by: Oleksij Rempel Acked-by: Arun Ramadoss Reviewed-by: Florian Fainelli --- 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 Fri Mar 24 08:06:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 74423 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp463224vqo; Fri, 24 Mar 2023 01:32:36 -0700 (PDT) X-Google-Smtp-Source: AKy350ZlVTnm4T3yPP/olCICLPtY0Mkc6gjcnqA/QPAw4O8unk6WhS/QcwSko5/N3M5XXyXeTKQ3 X-Received: by 2002:a17:902:c943:b0:1a1:b748:f33f with SMTP id i3-20020a170902c94300b001a1b748f33fmr1761200pla.69.1679646756252; Fri, 24 Mar 2023 01:32:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679646756; cv=none; d=google.com; s=arc-20160816; b=c2/TEJ8AWy5QuObFTA/cIsp05XMeZD0PL+lh4XuNDDZyoSVVpTc4YOeW75u9yDmBPm ht4EuAqPUmAVr2JPdcV2y+Uka4HLzaiBzk3WzuXViZMZJfkqMfF6lO/XXifsixJMe9hb /hHnKT9/KE8hZv0ZaylA2/xdIK9Teb8rCP9eSkfFUTIJB/XLYAR401Y3molM4+80IHW6 PmHjZMrXzCBG1aEtAWPuPux88kpLtIta3aJSlHKYZhdnhEuGreefjxXA+hT1HgZSh43W OMytNvcN7zXlHcgJzRnxktdGHshSGzqNx0t+Oly/atZqZrv3ldnaxSXGATym0NC3A4GC Mo7g== 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=3xNC40IG4to9Gkb3hZWy65Ic2B7B2Q6R36vCfsUTT/8=; b=XvsLrj69cUdT3xHtQTwoCtZJYFtYK14ipaEm9VQsECpeXzoQc89cTBhSy4/JcWqqcd dOnl7BwysG43UFajBqNE5FWFpPQfBf7fAyxv3ZZZ8OoefDDY26ojyZi03p0gbP9fNDO9 891eqNJwvmVmf0tay5zigLGT9HVf8LXm9b0hAxo44i5cQlC+hmFX9ZUszKpXcMSXBUcM KZlPovnuSngoAuINcCUGqM7THG2WsKyf9mdq9/VsE+/uIK7LQHRgolwC1lOJrrQ98zoS rWGhzfKYvhgcGyptFZ3gx9lbTrk1khYxoy/QiV0Qw1/YYnkrjh1g1enCt+aizaazoy2x LoYw== 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 g24-20020a63fa58000000b004dacaa17ecbsi20499860pgk.559.2023.03.24.01.32.23; Fri, 24 Mar 2023 01:32:36 -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 S231861AbjCXIGq (ORCPT + 99 others); Fri, 24 Mar 2023 04:06:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231527AbjCXIGX (ORCPT ); Fri, 24 Mar 2023 04:06:23 -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 885002387F for ; Fri, 24 Mar 2023 01:06:21 -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 1pfcRB-00077R-IS; Fri, 24 Mar 2023 09:06:13 +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 1pfcR8-006KcO-TU; Fri, 24 Mar 2023 09:06:10 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pfcR7-00ENzP-Iu; Fri, 24 Mar 2023 09:06:09 +0100 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com Subject: [PATCH net v2 4/6] net: dsa: microchip: ksz8: ksz8_fdb_dump: avoid extracting ghost entry from empty dynamic MAC table. Date: Fri, 24 Mar 2023 09:06:06 +0100 Message-Id: <20230324080608.3428714-5-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230324080608.3428714-1-o.rempel@pengutronix.de> References: <20230324080608.3428714-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?1761237277175127255?= X-GMAIL-MSGID: =?utf-8?q?1761237277175127255?= If the dynamic MAC table is empty, we will still extract one outdated entry. Fix it by using correct bit offset. Fixes: 4b20a07e103f ("net: dsa: microchip: ksz8795: add support for ksz88xx chips") Signed-off-by: Oleksij Rempel Acked-by: Arun Ramadoss Reviewed-by: Florian Fainelli --- 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 Fri Mar 24 08:06:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 74428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp466998vqo; Fri, 24 Mar 2023 01:42:02 -0700 (PDT) X-Google-Smtp-Source: AKy350a4aNDDY+do+UxIgJOMQgnJ58SLlu7GJzrigoAiLUc7raRlG086DIQlFtqb4WHtTb+790hB X-Received: by 2002:a17:903:d3:b0:1a2:12d3:e5fd with SMTP id x19-20020a17090300d300b001a212d3e5fdmr1599214plc.61.1679647322374; Fri, 24 Mar 2023 01:42:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679647322; cv=none; d=google.com; s=arc-20160816; b=aShtQRxvH3oESlE5hy5rw7pg7Fbpqfq81FENCuzp7VnXb/gpYckxZARiR4Hgy591LT JddEJWNqrBugOgQuZOKwTHRJptFMqsGKKZxhqUWyCpCxp0h+9oChVn0NyOZh0VvhBwep E5wazUefHvUgHVk5DlsKmHb9GzKfhtFvnzEZH13ERXUAO8Wd7A7XpuYMXmx731kYIrCQ xu/kylKAKVUgrbM8d+uSfqvRLexrSbFkVeeOnNJAs0/P0V5+PieKvN5gbqNHPS0A7Ieg ZkQ9eaoHLL7LdBbVcI7Zo3aJhTOUVdNnOO/qmqOFlLtuTzcgkKDjiUP9ehY0sjUWpej/ 34Uw== 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=VHn05jLg93nH8dYJvdc4XojFwWJLJuKcgrEw6D0CT2k=; b=TRMl7RslRQS1pnGxJzCd3DaAQCji4+p+rJ1QLnGxpJhCZ5klmjYyy5cgQmxpVwjg3V tMGtAe66LoFW7awu1s8jaImLfT1AE2guDPuGkXssxvxOIOGPOVMUZqPrHBOUuDtopqx6 mlxPy8iTWAWrzFUysYpAyO8wvpkEtBYBdDrt7a0+Cf1YxlwvvXY8yKuonNzM4PGSBKwS 0gNYywa5bZsbcRvmFCv3Oov5BgWRYjUJB40CIEsXi020GD6+2B3HzSU06M6e9AfV+EJL Lqim9ywpp78ZIeNv8a7QR7+qZYq7uig2D/46w7cV4JkpF4wiatJjGajAv2lxPEZH05LF yu5A== 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 s124-20020a632c82000000b00502f4be647fsi21369196pgs.641.2023.03.24.01.41.48; Fri, 24 Mar 2023 01:42:02 -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 S231579AbjCXIGY (ORCPT + 99 others); Fri, 24 Mar 2023 04:06:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229943AbjCXIGV (ORCPT ); Fri, 24 Mar 2023 04:06:21 -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 BB6A52386A for ; Fri, 24 Mar 2023 01:06:20 -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 1pfcRB-00077S-IU; Fri, 24 Mar 2023 09:06:13 +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 1pfcR9-006KcS-18; Fri, 24 Mar 2023 09:06:11 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pfcR7-00ENzY-JV; Fri, 24 Mar 2023 09:06:09 +0100 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com Subject: [PATCH net v2 5/6] net: dsa: microchip: ksz8863_smi: fix bulk access Date: Fri, 24 Mar 2023 09:06:07 +0100 Message-Id: <20230324080608.3428714-6-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230324080608.3428714-1-o.rempel@pengutronix.de> References: <20230324080608.3428714-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?1761237870460944478?= X-GMAIL-MSGID: =?utf-8?q?1761237870460944478?= 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 Reviewed-by: Florian Fainelli --- drivers/net/dsa/microchip/ksz8863_smi.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c b/drivers/net/dsa/microchip/ksz8863_smi.c index 2f4623f3bd85..3698112138b7 100644 --- a/drivers/net/dsa/microchip/ksz8863_smi.c +++ b/drivers/net/dsa/microchip/ksz8863_smi.c @@ -82,22 +82,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 +102,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 +111,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 +120,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 Fri Mar 24 08:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 74419 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp457792vqo; Fri, 24 Mar 2023 01:19:46 -0700 (PDT) X-Google-Smtp-Source: AKy350Z9ZF3AeEAgTFdUW0BPtDcXVHZjeCP6cCOutS56Ryw18hKccDELTwH5PRGzCl2TEFGAH1qO X-Received: by 2002:a62:1c04:0:b0:625:d697:c386 with SMTP id c4-20020a621c04000000b00625d697c386mr2089847pfc.22.1679645985952; Fri, 24 Mar 2023 01:19:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679645985; cv=none; d=google.com; s=arc-20160816; b=vt1FYTV7kaGQrzPvxeAc3T3/00NebZ0p3oMfGVp2+xdKa4geXs+rMGxzRBBPrBFmTV uUCEyYRBo6e3bjE/pjjrJ13YgXdHEgPOCyhKrE0szPRVQ1NyR6XmJveka3xlxz+ORY3C SfgnTIQ3ZrbsadHwTarENvqmWr9I2I1pmln7Hmbrgjl9GuHiHmfkPsTU4EMEA+SD2Qlr QTbiKv/ECFLYxrsm7wPTbRHbqf43rWchPeovgHdrV50OWCNK2pWSLj+zE4VECpkTm7zZ 0ofeRuWtU5yNoD4q8RSCEwSFCvzzgZk5miRUulzAc8MtP4AKmL2ywV3DGuIhn/vxPfZt ZetQ== 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=eL/wmCqZYceozP9i08o+0vL2IqZsVGtY/7AsGOmqP6k=; b=TE1DibYJHgfG5372nWOKR28OZFKRA7j3Abo5Yq0aEZIqD04IOiNcrt4bCQBAJ1gEY3 i6K4CQOJDdTmK6Ch4++gPYl3AhOyOHJFtm6XyZa/Kps9rPO69Qx4ULNkv1IOZDlDnkEF Z1GJkv2PbJ9WCVEiIhqHTRhhZJarhoSeIrKzdBIi9yK/mQf5M0XD5/lEtLKL/z8et27c obR3iFqA5wiG4BuxrOqGMVznW4jLLzAtPnhTVNm0LndQF6ntFbxi3YYzLtnQ/SxMxN4n 0Czr21JWBjmAHqywoK2keH0svGZNowId7UNz+dOH+4O8vPkMjlIAda47a8qWziu7ElQj Szzg== 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 d13-20020a656b8d000000b0050bf225ba32si19966608pgw.706.2023.03.24.01.19.33; Fri, 24 Mar 2023 01:19:45 -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 S231616AbjCXIG0 (ORCPT + 99 others); Fri, 24 Mar 2023 04:06:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229938AbjCXIGV (ORCPT ); Fri, 24 Mar 2023 04:06:21 -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 9E35623864 for ; Fri, 24 Mar 2023 01:06:20 -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 1pfcRB-00077T-IU; Fri, 24 Mar 2023 09:06:13 +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 1pfcR9-006KcV-8y; Fri, 24 Mar 2023 09:06:11 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pfcR7-00ENzh-K6; Fri, 24 Mar 2023 09:06:09 +0100 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com Subject: [PATCH net v2 6/6] net: dsa: microchip: ksz8: fix MDB configuration with non-zero VID Date: Fri, 24 Mar 2023 09:06:08 +0100 Message-Id: <20230324080608.3428714-7-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230324080608.3428714-1-o.rempel@pengutronix.de> References: <20230324080608.3428714-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?1761236469397963113?= X-GMAIL-MSGID: =?utf-8?q?1761236469397963113?= 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: 4b20a07e103f ("net: dsa: microchip: ksz8795: add support for ksz88xx chips") Signed-off-by: Oleksij Rempel Acked-by: Arun Ramadoss Reviewed-by: Florian Fainelli --- 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),