| Message ID | 20230322143130.1432106-7-o.rempel@pengutronix.de |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
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 <rfc822;pusanteemu@gmail.com> + 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
<rfc822;linux-kernel@vger.kernel.org>);
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 <linux-kernel@vger.kernel.org>;
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 <ore@pengutronix.de>)
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 <ore@pengutronix.de>)
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 <ore@pengutronix.de>)
id 1pezUx-0060aL-5F; Wed, 22 Mar 2023 15:31:31 +0100
From: Oleksij Rempel <o.rempel@pengutronix.de>
To: "David S. Miller" <davem@davemloft.net>,
Andrew Lunn <andrew@lunn.ch>,
Eric Dumazet <edumazet@google.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
Vladimir Oltean <olteanv@gmail.com>,
Woojung Huh <woojung.huh@microchip.com>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>, 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
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=-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: <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?1761079031008833065?=
X-GMAIL-MSGID: =?utf-8?q?1761079031008833065?=
|
| Series |
net: dsa: microchip: ksz8: fixes for stable
|
|
Commit Message
Oleksij Rempel
March 22, 2023, 2:31 p.m. UTC
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 <o.rempel@pengutronix.de>
---
drivers/net/dsa/microchip/ksz_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
A typo in subject s/MDF/MDB On Wed, Mar 22, 2023 at 03:31:30PM +0100, Oleksij Rempel wrote: > 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 <o.rempel@pengutronix.de> > --- > 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), > -- > 2.30.2 > > >
Hi Oleksij, On Wed, 2023-03-22 at 15:31 +0100, Oleksij Rempel wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you > know the content is safe > > 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 <o.rempel@pengutronix.de> > --- > 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), Cross verified the bit mask with datasheet. Patch Looks good to me. Acked-by: Arun Ramadoss <arun.ramadoss@microchip.com> > [STATIC_MAC_TABLE_OVERRIDE] = BIT(20), > [STATIC_MAC_TABLE_FWD_PORTS] = GENMASK(18, 16), > [DYNAMIC_MAC_TABLE_ENTRIES_H] = GENMASK(1, 0), > -- > 2.30.2 >
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),