[netnext,7/8] net: dsa: mt7530: put initialising PCS devices code back to original order
Message ID | 20240208-for-netnext-mt7530-improvements-3-v1-7-d7c1cfd502ca@arinc9.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-57482-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2709564dyb; Wed, 7 Feb 2024 21:54:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IHtf65ofw138TE7tuVs/08wZEZqJc13+4Km5u70mesZmum9Y9kpRKCv/Mbzudy2GwDkh64J X-Received: by 2002:a05:6808:14c7:b0:3bf:dfb3:b977 with SMTP id f7-20020a05680814c700b003bfdfb3b977mr8940586oiw.7.1707371672253; Wed, 07 Feb 2024 21:54:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707371672; cv=pass; d=google.com; s=arc-20160816; b=P7fq+BX5k9bkartC/0M8N3QFflD5OSeZCALCmeqi917a4dGWMFdUYjCvRRlsmO7PvI 6ohIeiihh7WZxvrzQrTKOtl0oNC88LFCfEc0Nt7iWinIxET5cJWVQ7n4dXUcDllhT34q fKj4PUgGMiuv63bgDsz+EMZDLAQrswdi3/PY0rR14vpwFsBQqGmxogEH+uCYPRZrEkMd m5B+/ILRiY23qZWAi2KMddoV+mitTbnmJLKqSulYCh2cmIOvtOtxXfQ7QdSYFtlVW8JZ p2EmT60ifpIYvcC2fXsrG5HqKSj90kJyqATod9HQ+HkhSqzUEEJLTNVb2bJYuxwvWYzH pA6A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=reply-to:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:subject:date:from:dkim-signature; bh=ne7hOGU2S5DStLf3lgxkOQSl3E4nSb1cKjrcJ4FWwQ0=; fh=5ustLCMb6lXHYfJ5oYa3CPvUespKO/jJVAPlpf+KLiE=; b=CkWTdFIAo5GhoY6Nghti63fA8oBN+rNF6z1Tb2ZSwqbDZUskwLhDP2Pgg98zsehTIa QbBeNeOqpFzEdIBk5OyKqW7NFe0/E39YbFQWVJ8HeedntD1O6TrYj9GmejmlaA+Y+Mhm i1AYln9EwuB0ph3kbM0kSPdT7qrk/teWQSo6asFGXDK2BjztaAFZBYzw7TI2T8Dw+8CI HSXT7lT9Pfks7QKl9K9UxFGz4uKZTo1Bm4vgVhJZLkibLF8M/Vh4SOeT8z/GnQArWkxI njg5wQWX6WwgpSBLsgxUktp4nr/0QAfxB5frM83NKAszvlZndym+dKe0XrBA8iUgvsAE qoSA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="duV/XThz"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-57482-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-57482-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=2; AJvYcCUlRMAWdCzMIveY2nweL64Li6EkNwL0Q66rvr+4q4AbHi+mF4nSehQieCBb/ZFqB3fvWNXtyIapQ/Ny+poenZlisKQ1gw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id eb23-20020a056a004c9700b006e0541d5951si3642396pfb.385.2024.02.07.21.54.32 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 21:54:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-57482-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="duV/XThz"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-57482-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-57482-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 07EC128102D for <ouuuleilei@gmail.com>; Thu, 8 Feb 2024 05:54:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C4A796BB2F; Thu, 8 Feb 2024 05:51:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="duV/XThz" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE2DC67C73; Thu, 8 Feb 2024 05:51:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707371494; cv=none; b=uqUFyOcwUicHRzu8fVAhAyhiGFQ28Mmkk435CP2Z4gP+qnFaPcRoCNMNudNw0DzKr78XvJtiamvlzgMn+xcjSoiuUAw2wAzomHZoHqLR7mX5Uld/w5CAfu8ClT8ed8As5JSJ8JlYRQt3CTYPXF6+t9l7Ubkv+64aFAPg2GfKL+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707371494; c=relaxed/simple; bh=bdj2sXbKKEcSVYU72hwdKppcUWhM0GPYmoe4dwmAPtA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dNkTVtrrvJH5VBmGHsyXkAVT2rE3ZnSOOE3ExrBwy7evVJSDANiMFNKw4dG3ySmMaWXKzhS7fj15EX1PGPuNFh6IEltLrFeM0IEu/eSeEQ4Mk46o+oC2Qp7Q1EDlaPwmghqY6qVm+w1nn3eOhb3ENERPloR/mK4CbTLMzQot6eI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=duV/XThz; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPS id 851BDC43143; Thu, 8 Feb 2024 05:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707371493; bh=bdj2sXbKKEcSVYU72hwdKppcUWhM0GPYmoe4dwmAPtA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=duV/XThzlx5FOGwO0s+gVWnEFACGOOH9JyeIdcBl2dgbcf/ZMutPwU95YUxJ4iyCY jj1N/PtkeAgrfabl4VgS6bSHcahoQKQR1s690LM9vG9D5M2WkCucG4hSZmTrpG9hOp 7BFDttsgSJeYIjSvYJNpw+9M9Ta3feM2wJLHBO2X1Gn6rp4gHpCJRG1bSDVtbCrvsx 7AUXrO6CkGcCW6GtbA0lb5EZwGt+P0xl3ZspfmD+hWuxd/pGr+uSPy8dDYf4cR4sRw gwAdJYHHmcCECDZjrKfcBCUrRM9pov30cCQY9hwJ4XgCd9UDS9WBK7p4VjVB0FUq/s /XuCaCIIlzuTg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74549C4828F; Thu, 8 Feb 2024 05:51:33 +0000 (UTC) From: =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= via B4 Relay <devnull+arinc.unal.arinc9.com@kernel.org> Date: Thu, 08 Feb 2024 08:51:35 +0300 Subject: [PATCH netnext 7/8] net: dsa: mt7530: put initialising PCS devices code back to original order Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240208-for-netnext-mt7530-improvements-3-v1-7-d7c1cfd502ca@arinc9.com> References: <20240208-for-netnext-mt7530-improvements-3-v1-0-d7c1cfd502ca@arinc9.com> In-Reply-To: <20240208-for-netnext-mt7530-improvements-3-v1-0-d7c1cfd502ca@arinc9.com> To: Daniel Golle <daniel@makrotopia.org>, DENG Qingfang <dqfext@gmail.com>, Sean Wang <sean.wang@mediatek.com>, Andrew Lunn <andrew@lunn.ch>, Florian Fainelli <f.fainelli@gmail.com>, Vladimir Oltean <olteanv@gmail.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Matthias Brugger <matthias.bgg@gmail.com>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, Russell King <linux@armlinux.org.uk> Cc: mithat.guner@xeront.com, erkin.bozoglu@xeront.com, Bartel Eerdekens <bartel.eerdekens@constell8.be>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com> X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1707371489; l=1570; i=arinc.unal@arinc9.com; s=arinc9-patatt; h=from:subject:message-id; bh=/2CkKGukm0R4V69WhBvbbIMKcr0CwYye/LAy2VcbSV0=; b=cgYWWkSZCAhdXnX66ltsxkY85bNLVeKuY+rvkDi7qWt0AaUJl007QE1+K/VOCDyRWB+gn74zR AWtK+mJWyxICShfCxhlkB4+HkAyHCmc7TQzDaC61rogpfRYrm6NcEoh X-Developer-Key: i=arinc.unal@arinc9.com; a=ed25519; pk=VmvgMWwm73yVIrlyJYvGtnXkQJy9CvbaeEqPQO9Z4kA= X-Endpoint-Received: by B4 Relay for arinc.unal@arinc9.com/arinc9-patatt with auth_id=115 X-Original-From: =?utf-8?b?QXLEsW7DpyDDnE5BTA==?= <arinc.unal@arinc9.com> Reply-To: <arinc.unal@arinc9.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790308958698957005 X-GMAIL-MSGID: 1790308958698957005 |
Series |
MT7530 DSA Subdriver Improvements Act III
|
|
Commit Message
Arınç ÜNAL via B4 Relay
Feb. 8, 2024, 5:51 a.m. UTC
From: Arınç ÜNAL <arinc.unal@arinc9.com> The commit fae463084032 ("net: dsa: mt753x: fix pcs conversion regression") fixes regression caused by cpu_port_config manually calling phylink operations. cpu_port_config was deemed useless and was removed. Therefore, put initialising PCS devices code back to its original order. Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> --- drivers/net/dsa/mt7530.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index e353c03dd1db..5c8ad41ce8cd 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2812,17 +2812,9 @@ static int mt753x_setup(struct dsa_switch *ds) { struct mt7530_priv *priv = ds->priv; - int i, ret; - - /* Initialise the PCS devices */ - for (i = 0; i < priv->ds->num_ports; i++) { - priv->pcs[i].pcs.ops = priv->info->pcs_ops; - priv->pcs[i].pcs.neg_mode = true; - priv->pcs[i].priv = priv; - priv->pcs[i].port = i; - } + int ret = priv->info->sw_setup(ds); + int i; - ret = priv->info->sw_setup(ds); if (ret) return ret; @@ -2834,6 +2826,14 @@ mt753x_setup(struct dsa_switch *ds) if (ret && priv->irq) mt7530_free_irq_common(priv); + /* Initialise the PCS devices */ + for (i = 0; i < priv->ds->num_ports; i++) { + priv->pcs[i].pcs.ops = priv->info->pcs_ops; + priv->pcs[i].pcs.neg_mode = true; + priv->pcs[i].priv = priv; + priv->pcs[i].port = i; + } + if (priv->create_sgmii) { ret = priv->create_sgmii(priv); if (ret && priv->irq)