Received: by 2002:a05:6a10:2785:0:0:0:0 with SMTP id ia5csp2675340pxb; Mon, 11 Jan 2021 16:52:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJy6jre0GscSPhgRTwpIuarFnpziMBu2qGn4Aa9ioHZRhiNDOgH5jovuXcuy09Qso+smcxLe X-Received: by 2002:a17:906:1288:: with SMTP id k8mr1365572ejb.206.1610412763247; Mon, 11 Jan 2021 16:52:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610412763; cv=none; d=google.com; s=arc-20160816; b=UF5DydPB+ThrKctVDNi8xNearjbBSF7GmIK9ATJwLs2Wn7hjPWoOQ+CLz/MX2A/VXM PzXbBl6/1Vn2g6tqjqk94zyOhSYGpXBayv3JwrKCgq94Wm/D2zRic9WM+i5QWTDth5fl bHr1sFj1INdXI4EiPg8h8cTEnF+ub0h1LiwbHutlEH0avgsa3G4hC7GGF1s5i7JIfFYy Ukae13U6ReNajOMsGEvRlA0ay5CkgqslrxngwjYIh1jEIsvuEQq/KBZUCPb7ZV5UMEPA 6YPHHQtF4aKaVFnSdhO2cXeERTsUFR2rS49G64MxPVqk3QyvZ8v+wm/bbX8NgmeVk1Vv 6z7w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JbVOcmoa1GlqnZLosGlZoF9OrqSwo4NGAdLQvKYb6dI=; b=gZK5nXDfceMoy+ZXWQFOFZOFHYoEedqdQAno4MzZViAYB1j6LNiki+dnNJ2xVcbAKX TO2Yc4lSZxBg8z2X+/tEPa3Bdt6LxVIt2MwazXFQcEvhuG3kHPfCyVRlk89lRN7YlgRO uMDtLTvTAtZp+7I979ypGcQWhfCpWQeXFfoZK1hM8qN+qjwiv82Rj+KvjCMxRAqjlrYV 0JRkKvcrm6EBYc9I5wdX5RjFV8wiGH0EYApHctLs0cMHe//paW2Ds1Rz4mDLbFKN3nQd fkH7kTxMWlsdxRhLuIGVY4NE8yKD9rq4yf/E/jT1Um8WHwTnoPo8TzAzlHGiDM586wwN kPdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=00T9dFR7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t20si170037edt.395.2021.01.11.16.52.19; Mon, 11 Jan 2021 16:52:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=00T9dFR7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731412AbhAKNLb (ORCPT + 99 others); Mon, 11 Jan 2021 08:11:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:57856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729045AbhAKNKp (ORCPT ); Mon, 11 Jan 2021 08:10:45 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id BEECE21973; Mon, 11 Jan 2021 13:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1610370604; bh=GBnuyhv+xTOA/Q3+Ul00Wf4GB1SWcWwNZ5P9pjPKjQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=00T9dFR7YR20l+EkAShFROuMnMxADWWxwKFVGPQvLnO+Mo2fmVtIvTOg5OYuFDk/q EWUzLjTmE0hESX6I4qaqMHDR1ZcUe+H7BE5hreC2KybdzG/HGc7K8YSaEmen9yaqi7 sOAN6A3FdIKjNhwlN3ZQFwUZsG9GIN99kfM+GdFM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marcin Wojtas , Stefan Chulski , Jakub Kicinski Subject: [PATCH 5.4 18/92] net: mvpp2: Fix GoP port 3 Networking Complex Control configurations Date: Mon, 11 Jan 2021 14:01:22 +0100 Message-Id: <20210111130040.037429097@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210111130039.165470698@linuxfoundation.org> References: <20210111130039.165470698@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Chulski [ Upstream commit 2575bc1aa9d52a62342b57a0b7d0a12146cf6aed ] During GoP port 2 Networking Complex Control mode of operation configurations, also GoP port 3 mode of operation was wrongly set. Patch removes these configurations. Fixes: f84bf386f395 ("net: mvpp2: initialize the GoP") Acked-by: Marcin Wojtas Signed-off-by: Stefan Chulski Link: https://lore.kernel.org/r/1608462149-1702-1-git-send-email-stefanc@marvell.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -1129,7 +1129,7 @@ static void mvpp22_gop_init_rgmii(struct regmap_read(priv->sysctrl_base, GENCONF_CTRL0, &val); if (port->gop_id == 2) - val |= GENCONF_CTRL0_PORT0_RGMII | GENCONF_CTRL0_PORT1_RGMII; + val |= GENCONF_CTRL0_PORT0_RGMII; else if (port->gop_id == 3) val |= GENCONF_CTRL0_PORT1_RGMII_MII; regmap_write(priv->sysctrl_base, GENCONF_CTRL0, val);