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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A4E63C77B76 for ; Fri, 21 Apr 2023 18:42:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To: Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9hyVc455qwkTDVodAeGWe5yxYiZFrLt4dr7LjiuaDwY=; b=YwsehGz4VZjuZzCH16/21nM2Oe hSLmBD7i7AJAykXBrXq/deh3AiJA9A2rGckHuN0uQ4fc8eyCyleJrDSTvgjbkJYfzvjsI30Z66DOP 7B2cTTFBicKNbc49i+Gqod/hBgTNZ7v2EDMbYAH2ht2EcwKuuecesaoSZaHNkjAxAu/PW+Fy9NTXD gv1e7RQMA6bdNsfhWkGhgGoTVu7cwdfC1Q2hFT++i7ligVbDTnEnFHbrDWrQfxqHvoPrPYmBjSgJg 7EsrwiTMmw6tli0a2yxfY0JRWt7EYJSdptlJZBw/viyz7+SJowcnatY+RwoaZZnCpP5nCYSK/gTLG BM/JkvKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1ppviX-00BeFL-1g; Fri, 21 Apr 2023 18:42:45 +0000 Received: from fudo.makrotopia.org ([2a07:2ec0:3002::71]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1ppviT-00BeEZ-10; Fri, 21 Apr 2023 18:42:42 +0000 Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1ppvi0-0002fM-1F; Fri, 21 Apr 2023 20:42:12 +0200 Date: Fri, 21 Apr 2023 19:42:09 +0100 From: Daniel Golle To: arinc9.unal@gmail.com Subject: Re: [RFC PATCH net-next 20/22] net: dsa: mt7530: force link-down on MACs before reset on MT7530 Message-ID: References: <20230421143648.87889-1-arinc.unal@arinc9.com> <20230421143648.87889-21-arinc.unal@arinc9.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230421143648.87889-21-arinc.unal@arinc9.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230421_114241_366398_C3D6D8F4 X-CRM114-Status: GOOD ( 18.97 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Eric Dumazet , erkin.bozoglu@xeront.com, Florian Fainelli , Russell King , Richard van Schagen , Jakub Kicinski , Paolo Abeni , Landen Chao , Richard van Schagen , Sean Wang , DENG Qingfang , linux-mediatek@lists.infradead.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org, AngeloGioacchino Del Regno , =?utf-8?B?QXLEsW7DpyDDnE5BTA==?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Vladimir Oltean , "David S. Miller" Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Fri, Apr 21, 2023 at 05:36:46PM +0300, arinc9.unal@gmail.com wrote: > From: Arınç ÜNAL > > Force link-down on all MACs before internal reset. Let's follow suit commit > 728c2af6ad8c ("net: mt7531: ensure all MACs are powered down before > reset"). > > Tested-by: Arınç ÜNAL > Signed-off-by: Arınç ÜNAL > --- > drivers/net/dsa/mt7530.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c > index ac1e3c58aaac..8ece3d0d820c 100644 > --- a/drivers/net/dsa/mt7530.c > +++ b/drivers/net/dsa/mt7530.c > @@ -2203,6 +2203,10 @@ mt7530_setup(struct dsa_switch *ds) > return -EINVAL; > } > > + /* Force link-down on all MACs before internal reset */ > + for (i = 0; i < MT7530_NUM_PORTS; i++) > + mt7530_write(priv, MT7530_PMCR_P(i), PMCR_FORCE_LNK); > + Moving this part to mt753x_setup just before calling priv->info->sw_setup(ds); is probably better. Though it isn't documented I assume that the requirement to have the ports in force-link-down may also apply to MT7988, and for sure it doesn't do any harm. Hence I suggest to squash this change: diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index a2cb7e296165e..998c4e8930cd3 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2203,10 +2203,6 @@ mt7530_setup(struct dsa_switch *ds) return -EINVAL; } - /* Force link-down on all MACs before internal reset */ - for (i = 0; i < MT7530_NUM_PORTS; i++) - mt7530_write(priv, MT7530_PMCR_P(i), PMCR_FORCE_LNK); - /* Reset the switch through internal reset */ mt7530_write(priv, MT7530_SYS_CTRL, SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST | @@ -2423,10 +2419,6 @@ mt7531_setup(struct dsa_switch *ds) dev_info(priv->dev, "found MT7531BE\n"); } - /* all MACs must be forced link-down before sw reset */ - for (i = 0; i < MT7530_NUM_PORTS; i++) - mt7530_write(priv, MT7530_PMCR_P(i), MT7531_FORCE_LNK); - /* Reset the switch through internal reset */ mt7530_write(priv, MT7530_SYS_CTRL, SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST | @@ -2907,6 +2899,10 @@ mt753x_setup(struct dsa_switch *ds) priv->pcs[i].port = i; } + /* Force link-down on all MACs before setup */ + for (i = 0; i < MT7530_NUM_PORTS; i++) + mt7530_write(priv, MT7530_PMCR_P(i), PMCR_FORCE_LNK); + ret = priv->info->sw_setup(ds); if (ret) return ret; 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D9EB9C7618E for ; Fri, 21 Apr 2023 18:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=11quYJ+x93ejgngYKZDeyHhuA0NP9HjL/8c8qLYnGrI=; b=h0XfCWljrr6MUr QkvFL7F5A+Wqz4ydtm4bIuJfPypeMVJagBoY1XFFR9PYKLhPGVY1w36Dl07vOhqQ5tDBNv9+gQSGB avosOBSjN3iUzEeeG8t19AaIYjf/OPH2hlKIyya9DKwlN5tSPXhtsQh62KyEZAUEw9r78wLv3mDeX yOmZrqhoUsQvcJDVH0Ni5+sdzgGUGbfbQbMvH2UmsI3lfZ2pyhQUqpIVU0fY97g+M2Wo+h2zV6aDA vR/Bia0rKFWDw/DtFGWZ8dXm2fJCzaoIgaSQpmDfP/D+86RJrCQkMxiisl0uO7mBi236chH6o1yEG CyDSb3vhZjiU58Bep/LQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1ppviW-00BeFF-2J; Fri, 21 Apr 2023 18:42:44 +0000 Received: from fudo.makrotopia.org ([2a07:2ec0:3002::71]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1ppviT-00BeEZ-10; Fri, 21 Apr 2023 18:42:42 +0000 Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1ppvi0-0002fM-1F; Fri, 21 Apr 2023 20:42:12 +0200 Date: Fri, 21 Apr 2023 19:42:09 +0100 From: Daniel Golle To: arinc9.unal@gmail.com Cc: Sean Wang , Landen Chao , DENG Qingfang , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno , Russell King , =?utf-8?B?QXLEsW7DpyDDnE5BTA==?= , Richard van Schagen , Richard van Schagen , Frank Wunderlich , erkin.bozoglu@xeront.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: Re: [RFC PATCH net-next 20/22] net: dsa: mt7530: force link-down on MACs before reset on MT7530 Message-ID: References: <20230421143648.87889-1-arinc.unal@arinc9.com> <20230421143648.87889-21-arinc.unal@arinc9.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230421143648.87889-21-arinc.unal@arinc9.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230421_114241_366398_C3D6D8F4 X-CRM114-Status: GOOD ( 18.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gRnJpLCBBcHIgMjEsIDIwMjMgYXQgMDU6MzY6NDZQTSArMDMwMCwgYXJpbmM5LnVuYWxAZ21h aWwuY29tIHdyb3RlOgo+IEZyb206IEFyxLFuw6cgw5xOQUwgPGFyaW5jLnVuYWxAYXJpbmM5LmNv bT4KPiAKPiBGb3JjZSBsaW5rLWRvd24gb24gYWxsIE1BQ3MgYmVmb3JlIGludGVybmFsIHJlc2V0 LiBMZXQncyBmb2xsb3cgc3VpdCBjb21taXQKPiA3MjhjMmFmNmFkOGMgKCJuZXQ6IG10NzUzMTog ZW5zdXJlIGFsbCBNQUNzIGFyZSBwb3dlcmVkIGRvd24gYmVmb3JlCj4gcmVzZXQiKS4KPiAKPiBU ZXN0ZWQtYnk6IEFyxLFuw6cgw5xOQUwgPGFyaW5jLnVuYWxAYXJpbmM5LmNvbT4KPiBTaWduZWQt b2ZmLWJ5OiBBcsSxbsOnIMOcTkFMIDxhcmluYy51bmFsQGFyaW5jOS5jb20+Cj4gLS0tCj4gIGRy aXZlcnMvbmV0L2RzYS9tdDc1MzAuYyB8IDQgKysrKwo+ICAxIGZpbGUgY2hhbmdlZCwgNCBpbnNl cnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L2RzYS9tdDc1MzAuYyBiL2Ry aXZlcnMvbmV0L2RzYS9tdDc1MzAuYwo+IGluZGV4IGFjMWUzYzU4YWFhYy4uOGVjZTNkMGQ4MjBj IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvbmV0L2RzYS9tdDc1MzAuYwo+ICsrKyBiL2RyaXZlcnMv bmV0L2RzYS9tdDc1MzAuYwo+IEBAIC0yMjAzLDYgKzIyMDMsMTAgQEAgbXQ3NTMwX3NldHVwKHN0 cnVjdCBkc2Ffc3dpdGNoICpkcykKPiAgCQlyZXR1cm4gLUVJTlZBTDsKPiAgCX0KPiAgCj4gKwkv KiBGb3JjZSBsaW5rLWRvd24gb24gYWxsIE1BQ3MgYmVmb3JlIGludGVybmFsIHJlc2V0ICovCj4g Kwlmb3IgKGkgPSAwOyBpIDwgTVQ3NTMwX05VTV9QT1JUUzsgaSsrKQo+ICsJCW10NzUzMF93cml0 ZShwcml2LCBNVDc1MzBfUE1DUl9QKGkpLCBQTUNSX0ZPUkNFX0xOSyk7Cj4gKwoKTW92aW5nIHRo aXMgcGFydCB0byBtdDc1M3hfc2V0dXAganVzdCBiZWZvcmUgY2FsbGluZyBwcml2LT5pbmZvLT5z d19zZXR1cChkcyk7CmlzIHByb2JhYmx5IGJldHRlci4gVGhvdWdoIGl0IGlzbid0IGRvY3VtZW50 ZWQgSSBhc3N1bWUgdGhhdCB0aGUgcmVxdWlyZW1lbnQKdG8gaGF2ZSB0aGUgcG9ydHMgaW4gZm9y Y2UtbGluay1kb3duIG1heSBhbHNvIGFwcGx5IHRvIE1UNzk4OCwgYW5kIGZvciBzdXJlCml0IGRv ZXNuJ3QgZG8gYW55IGhhcm0uCgpIZW5jZSBJIHN1Z2dlc3QgdG8gc3F1YXNoIHRoaXMgY2hhbmdl OgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvZHNhL210NzUzMC5jIGIvZHJpdmVycy9uZXQvZHNh L210NzUzMC5jCmluZGV4IGEyY2I3ZTI5NjE2NWUuLjk5OGM0ZTg5MzBjZDMgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvbmV0L2RzYS9tdDc1MzAuYworKysgYi9kcml2ZXJzL25ldC9kc2EvbXQ3NTMwLmMK QEAgLTIyMDMsMTAgKzIyMDMsNiBAQCBtdDc1MzBfc2V0dXAoc3RydWN0IGRzYV9zd2l0Y2ggKmRz KQogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQkvKiBGb3JjZSBsaW5rLWRvd24gb24gYWxsIE1B Q3MgYmVmb3JlIGludGVybmFsIHJlc2V0ICovCi0JZm9yIChpID0gMDsgaSA8IE1UNzUzMF9OVU1f UE9SVFM7IGkrKykKLQkJbXQ3NTMwX3dyaXRlKHByaXYsIE1UNzUzMF9QTUNSX1AoaSksIFBNQ1Jf Rk9SQ0VfTE5LKTsKLQogCS8qIFJlc2V0IHRoZSBzd2l0Y2ggdGhyb3VnaCBpbnRlcm5hbCByZXNl dCAqLwogCW10NzUzMF93cml0ZShwcml2LCBNVDc1MzBfU1lTX0NUUkwsCiAJCSAgICAgU1lTX0NU UkxfUEhZX1JTVCB8IFNZU19DVFJMX1NXX1JTVCB8CkBAIC0yNDIzLDEwICsyNDE5LDYgQEAgbXQ3 NTMxX3NldHVwKHN0cnVjdCBkc2Ffc3dpdGNoICpkcykKIAkJZGV2X2luZm8ocHJpdi0+ZGV2LCAi Zm91bmQgTVQ3NTMxQkVcbiIpOwogCX0KIAotCS8qIGFsbCBNQUNzIG11c3QgYmUgZm9yY2VkIGxp bmstZG93biBiZWZvcmUgc3cgcmVzZXQgKi8KLQlmb3IgKGkgPSAwOyBpIDwgTVQ3NTMwX05VTV9Q T1JUUzsgaSsrKQotCQltdDc1MzBfd3JpdGUocHJpdiwgTVQ3NTMwX1BNQ1JfUChpKSwgTVQ3NTMx X0ZPUkNFX0xOSyk7Ci0KIAkvKiBSZXNldCB0aGUgc3dpdGNoIHRocm91Z2ggaW50ZXJuYWwgcmVz ZXQgKi8KIAltdDc1MzBfd3JpdGUocHJpdiwgTVQ3NTMwX1NZU19DVFJMLAogCQkgICAgIFNZU19D VFJMX1BIWV9SU1QgfCBTWVNfQ1RSTF9TV19SU1QgfApAQCAtMjkwNyw2ICsyODk5LDEwIEBAIG10 NzUzeF9zZXR1cChzdHJ1Y3QgZHNhX3N3aXRjaCAqZHMpCiAJCXByaXYtPnBjc1tpXS5wb3J0ID0g aTsKIAl9CiAKKwkvKiBGb3JjZSBsaW5rLWRvd24gb24gYWxsIE1BQ3MgYmVmb3JlIHNldHVwICov CisJZm9yIChpID0gMDsgaSA8IE1UNzUzMF9OVU1fUE9SVFM7IGkrKykKKwkJbXQ3NTMwX3dyaXRl KHByaXYsIE1UNzUzMF9QTUNSX1AoaSksIFBNQ1JfRk9SQ0VfTE5LKTsKKwogCXJldCA9IHByaXYt PmluZm8tPnN3X3NldHVwKGRzKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBt YWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9s aXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6BD4C77B76 for ; Fri, 21 Apr 2023 18:42:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230472AbjDUSmq (ORCPT ); Fri, 21 Apr 2023 14:42:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232592AbjDUSmj (ORCPT ); Fri, 21 Apr 2023 14:42:39 -0400 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B7B810C; Fri, 21 Apr 2023 11:42:36 -0700 (PDT) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1ppvi0-0002fM-1F; Fri, 21 Apr 2023 20:42:12 +0200 Date: Fri, 21 Apr 2023 19:42:09 +0100 From: Daniel Golle To: arinc9.unal@gmail.com Cc: Sean Wang , Landen Chao , DENG Qingfang , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno , Russell King , =?utf-8?B?QXLEsW7DpyDDnE5BTA==?= , Richard van Schagen , Richard van Schagen , Frank Wunderlich , erkin.bozoglu@xeront.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: Re: [RFC PATCH net-next 20/22] net: dsa: mt7530: force link-down on MACs before reset on MT7530 Message-ID: References: <20230421143648.87889-1-arinc.unal@arinc9.com> <20230421143648.87889-21-arinc.unal@arinc9.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230421143648.87889-21-arinc.unal@arinc9.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Apr 21, 2023 at 05:36:46PM +0300, arinc9.unal@gmail.com wrote: > From: Arınç ÜNAL > > Force link-down on all MACs before internal reset. Let's follow suit commit > 728c2af6ad8c ("net: mt7531: ensure all MACs are powered down before > reset"). > > Tested-by: Arınç ÜNAL > Signed-off-by: Arınç ÜNAL > --- > drivers/net/dsa/mt7530.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c > index ac1e3c58aaac..8ece3d0d820c 100644 > --- a/drivers/net/dsa/mt7530.c > +++ b/drivers/net/dsa/mt7530.c > @@ -2203,6 +2203,10 @@ mt7530_setup(struct dsa_switch *ds) > return -EINVAL; > } > > + /* Force link-down on all MACs before internal reset */ > + for (i = 0; i < MT7530_NUM_PORTS; i++) > + mt7530_write(priv, MT7530_PMCR_P(i), PMCR_FORCE_LNK); > + Moving this part to mt753x_setup just before calling priv->info->sw_setup(ds); is probably better. Though it isn't documented I assume that the requirement to have the ports in force-link-down may also apply to MT7988, and for sure it doesn't do any harm. Hence I suggest to squash this change: diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index a2cb7e296165e..998c4e8930cd3 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2203,10 +2203,6 @@ mt7530_setup(struct dsa_switch *ds) return -EINVAL; } - /* Force link-down on all MACs before internal reset */ - for (i = 0; i < MT7530_NUM_PORTS; i++) - mt7530_write(priv, MT7530_PMCR_P(i), PMCR_FORCE_LNK); - /* Reset the switch through internal reset */ mt7530_write(priv, MT7530_SYS_CTRL, SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST | @@ -2423,10 +2419,6 @@ mt7531_setup(struct dsa_switch *ds) dev_info(priv->dev, "found MT7531BE\n"); } - /* all MACs must be forced link-down before sw reset */ - for (i = 0; i < MT7530_NUM_PORTS; i++) - mt7530_write(priv, MT7530_PMCR_P(i), MT7531_FORCE_LNK); - /* Reset the switch through internal reset */ mt7530_write(priv, MT7530_SYS_CTRL, SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST | @@ -2907,6 +2899,10 @@ mt753x_setup(struct dsa_switch *ds) priv->pcs[i].port = i; } + /* Force link-down on all MACs before setup */ + for (i = 0; i < MT7530_NUM_PORTS; i++) + mt7530_write(priv, MT7530_PMCR_P(i), PMCR_FORCE_LNK); + ret = priv->info->sw_setup(ds); if (ret) return ret;