From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4606C2BBCD for ; Fri, 18 Dec 2020 03:35:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7852B2071E for ; Fri, 18 Dec 2020 03:35:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732749AbgLRDfC (ORCPT ); Thu, 17 Dec 2020 22:35:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732716AbgLRDe4 (ORCPT ); Thu, 17 Dec 2020 22:34:56 -0500 Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AA6EC0617B0 for ; Thu, 17 Dec 2020 19:34:16 -0800 (PST) Received: by mail-qt1-x832.google.com with SMTP id h19so442216qtq.13 for ; Thu, 17 Dec 2020 19:34:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=IDx9TaTlrtlIy3LwyY3v6JTSWWKD8mwpXaG0JjxaS24=; b=SlMzwF0y6pOpcqPiZCbUWErI2aJ4Qec2sOSWj1qThCJmeTCYXwmNW1SFma2DLd1cGu f3X90sAphnaOMPe74Xo4CZ1HKqkZcVz0vOm7R4rsp2dagpU7Q9E3YzX3Xx8bYUxjVrWy YxLvJxt/KVgiTZzKN9M/a5oW1BJK3y6/xD+x0EmHQzRFkB8cu802/c3uaepNFVYHfRX2 UotS8HmyySy66MOMexpg5TqubSpwd+ErS/ICJppgEAMixpTRcoKzgaT3WAzMvXue21tZ eqCsElsHkUYH9F946WjnnJpNPrUQUQJBWJqjGHNGWGV792v9GOkr0mft2VoTxGVBch75 neMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=IDx9TaTlrtlIy3LwyY3v6JTSWWKD8mwpXaG0JjxaS24=; b=uN1jL44xM1CpWjqyYAjeowgZuBg1+mBmLPiqcDhGwYVKldRAe5bpk7pP+7/eC7xr1F 1MV5LH/+sTM8uiqCFCb5sCoYkpJNVVoioK7Iacg7z0ZOob8RSngcNmSH1De8Ckn7pohP KBt2JXhvAxR21kEOcbxgauOda/hmzewTwzHkVmY5o+8bbD/QmrJ3c6Iw1MsB+TS0oAwN FQsEMQBZ5YGPhMhpMBAtwbcQMH/iVgg/K1xVAFgYGiz14RGxSM9raOLnr4qsSwME4qIk 6gBCfTlqmqgh3ROriOn4HhmcBP+SCWgWK57WcTutBY7KIihRMHXIRfAqsoNNelPQLRx2 VARQ== X-Gm-Message-State: AOAM531fIQ3COXJeHa0wsAMWUO/vjt5nh6YyJGoDUmF1cbe/+yhcLVEs +Ct3W5TxDkRlG2WglgaHVmgXjYgR5UnupikytMY1bQ== X-Google-Smtp-Source: ABdhPJwZtCEoVgZKzc5N0KEbf32ptMfnyARzBYf+ZL81LWijXKO96aKnogXClrO8QrPsrwnDkTyOFsSD5GhOjtHB0BM= X-Received: by 2002:a05:622a:18d:: with SMTP id s13mr2121237qtw.306.1608262455132; Thu, 17 Dec 2020 19:34:15 -0800 (PST) MIME-Version: 1.0 References: <1608208648-13710-1-git-send-email-stefanc@marvell.com> In-Reply-To: <1608208648-13710-1-git-send-email-stefanc@marvell.com> From: Marcin Wojtas Date: Fri, 18 Dec 2020 04:34:03 +0100 Message-ID: Subject: Re: [PATCH net v3] net: mvpp2: Fix GoP port 3 Networking Complex Control configurations To: Stefan Chulski Cc: netdev , Thomas Petazzoni , "David S. Miller" , nadavh@marvell.com, Yan Markman , Linux Kernel Mailing List , Jakub Kicinski , Russell King - ARM Linux , Andrew Lunn , Russell King , stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stefan, czw., 17 gru 2020 o 13:40 napisa=C5=82(a): > > From: Stefan Chulski > > During GoP port 2 Networking Complex Control mode of operation configurat= ions, > also GoP port 3 mode of operation was wrongly set. > Patch removes these configurations. > GENCONF_CTRL0_PORTX naming also fixed. > > Cc: stable@vger.kernel.org > Fixes: f84bf386f395 ("net: mvpp2: initialize the GoP") > Signed-off-by: Stefan Chulski > --- > > Changes in v3: > - Added cc stable@vger.kernel.org > Changes in v2: > - Added Fixes tag. > > drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 6 +++--- > drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 8 ++++---- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/eth= ernet/marvell/mvpp2/mvpp2.h > index 6bd7e40..39c4e5c 100644 > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h > @@ -651,9 +651,9 @@ > #define GENCONF_PORT_CTRL1_EN(p) BIT(p) > #define GENCONF_PORT_CTRL1_RESET(p) (BIT(p) <= < 28) > #define GENCONF_CTRL0 0x1120 > -#define GENCONF_CTRL0_PORT0_RGMII BIT(0) > -#define GENCONF_CTRL0_PORT1_RGMII_MII BIT(1) > -#define GENCONF_CTRL0_PORT1_RGMII BIT(2) > +#define GENCONF_CTRL0_PORT2_RGMII BIT(0) > +#define GENCONF_CTRL0_PORT3_RGMII_MII BIT(1) > +#define GENCONF_CTRL0_PORT3_RGMII BIT(2) > > /* Various constants */ > > diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/ne= t/ethernet/marvell/mvpp2/mvpp2_main.c > index d64dc12..d2b0506 100644 > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > @@ -1231,9 +1231,9 @@ static void mvpp22_gop_init_rgmii(struct mvpp2_port= *port) > > regmap_read(priv->sysctrl_base, GENCONF_CTRL0, &val); > if (port->gop_id =3D=3D 2) > - val |=3D GENCONF_CTRL0_PORT0_RGMII | GENCONF_CTRL0_PORT1_= RGMII; > + val |=3D GENCONF_CTRL0_PORT2_RGMII; > else if (port->gop_id =3D=3D 3) > - val |=3D GENCONF_CTRL0_PORT1_RGMII_MII; > + val |=3D GENCONF_CTRL0_PORT3_RGMII_MII; > regmap_write(priv->sysctrl_base, GENCONF_CTRL0, val); > } > > @@ -1250,9 +1250,9 @@ static void mvpp22_gop_init_sgmii(struct mvpp2_port= *port) > if (port->gop_id > 1) { > regmap_read(priv->sysctrl_base, GENCONF_CTRL0, &val); > if (port->gop_id =3D=3D 2) > - val &=3D ~GENCONF_CTRL0_PORT0_RGMII; > + val &=3D ~GENCONF_CTRL0_PORT2_RGMII; > else if (port->gop_id =3D=3D 3) > - val &=3D ~GENCONF_CTRL0_PORT1_RGMII_MII; > + val &=3D ~GENCONF_CTRL0_PORT3_RGMII_MII; > regmap_write(priv->sysctrl_base, GENCONF_CTRL0, val); > } > } > -- I tested the patch and LGTM. Acked-by: Marcin Wojtas Thanks, Marcin