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 3DD88C4167B for ; Wed, 6 Dec 2023 21:46:36 +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=TdhlxKvyaeYB6ir+1nVi9xuJHx/6UDPn2sgPqolT5BE=; b=1K/iU0b6aSYQDcduilyJYYi/vM 5lB5lzi2bQxF0G9r2mxPDwLJKHrechPEBV0Fj/QIhKgbjvhV3AXkUGOwORa3DXrmmcmaiYYk0yBC/ cbVNXHieVWVK365oupFJKNsNhXSMgYhgZHp/hFzU/+rmuMFY6D6h4pCni0m45fawLqWtOwOtsRjt2 jcle5M9rjCVfBFNbbs5dzRSOvWvcRnhYDat670UTop+MqKRwigU2J/Dr3yXitODtunHlQFfrjXF5l 5hLlz9S3mKoOT5Ul27jsgr79iQ/lVDvKLQs9FHB77841y3ohxLWN1B7rCjaF9h47jmB8Xfm/hejwH 9E1Jue3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAziz-00BLuD-1w; Wed, 06 Dec 2023 21:46:33 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAziw-00BLtV-0K; Wed, 06 Dec 2023 21:46:31 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 00F4861EAE; Wed, 6 Dec 2023 21:46:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC91FC433C7; Wed, 6 Dec 2023 21:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701899186; bh=l9pQaQbgUHALJ2vwCHkcZ5rSYRY+yqrXuiys54WpdbA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=N8AYDgbg++krTc8tjjB8RpnQd7Yrt6x0Pcge39vjGdGIY3snjbEkRTAHFFzpklmIo 9wduIe9htoEzofQoyPvuyoWNuel0lHWApJ8aSFkeznVm5hW/mEupMpEZcpzOMVt1X6 yAMRgImg3E/yS8PcSarjq/YDedj82AL25TDQmylR5VsjMGK05rKlNEOl6V+1adP7HE XNat0wDA1ByzwGroVpM9RVscXUMwEewqVcHhNDKdbwNuE2QIq8wot0/r9H5SuDiixB r98Z1TMxeGbMDewSo2RG0Sczfpssl+GxLKlGupRVinvaDoPEXHZtwsyCwCc1gB3YnI gMjRh9920Dg/Q== Date: Wed, 6 Dec 2023 21:46:18 +0000 From: Simon Horman To: =?utf-8?B?QXLEsW7DpyDDnE5BTA==?= Subject: Re: [PATCH net-next 07/15] net: dsa: mt7530: do not run mt7530_setup_port5() if port 5 is disabled Message-ID: <20231206214618.GC50400@kernel.org> References: <20231118123205.266819-1-arinc.unal@arinc9.com> <20231118123205.266819-8-arinc.unal@arinc9.com> <20231121185358.GA16629@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231206_134630_247266_9F27FCC8 X-CRM114-Status: GOOD ( 31.63 ) 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 , linux-kernel@vger.kernel.org, Eric Dumazet , erkin.bozoglu@xeront.com, Dan Carpenter , Florian Fainelli , mithat.guner@xeront.com, Russell King , Jakub Kicinski , Paolo Abeni , Landen Chao , Sean Wang , DENG Qingfang , linux-mediatek@lists.infradead.org, Bartel Eerdekens , Matthias Brugger , linux-arm-kernel@lists.infradead.org, AngeloGioacchino Del Regno , netdev@vger.kernel.org, Daniel Golle , Vladimir Oltean , "David S. Miller" Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org + Dan Carpenter On Sat, Dec 02, 2023 at 11:45:42AM +0300, Arınç ÜNAL wrote: > Hi Simon. > > On 21.11.2023 21:53, Simon Horman wrote: > > On Sat, Nov 18, 2023 at 03:31:57PM +0300, Arınç ÜNAL wrote: > > > There's no need to run all the code on mt7530_setup_port5() if port 5 is > > > disabled. The only case for calling mt7530_setup_port5() from > > > mt7530_setup() is when PHY muxing is enabled. That is because port 5 is not > > > defined as a port on the devicetree, therefore, it cannot be controlled by > > > phylink. > > > > > > Because of this, run mt7530_setup_port5() if priv->p5_intf_sel is > > > P5_INTF_SEL_PHY_P0 or P5_INTF_SEL_PHY_P4. Remove the P5_DISABLED case from > > > mt7530_setup_port5(). > > > > > > Stop initialising the interface variable as the remaining cases will always > > > call mt7530_setup_port5() with it initialised. > > > > > > Signed-off-by: Arınç ÜNAL > > > Reviewed-by: Vladimir Oltean > > > --- > > > drivers/net/dsa/mt7530.c | 9 +++------ > > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c > > > index fc87ec817672..1aab4c3f28b0 100644 > > > --- a/drivers/net/dsa/mt7530.c > > > +++ b/drivers/net/dsa/mt7530.c > > > @@ -942,9 +942,6 @@ static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface) > > > /* MT7530_P5_MODE_GMAC: P5 -> External phy or 2nd GMAC */ > > > val &= ~MHWTRAP_P5_DIS; > > > break; > > > - case P5_DISABLED: > > > - interface = PHY_INTERFACE_MODE_NA; > > > - break; > > > default: > > > dev_err(ds->dev, "Unsupported p5_intf_sel %d\n", > > > priv->p5_intf_sel); > > > @@ -2313,8 +2310,6 @@ mt7530_setup(struct dsa_switch *ds) > > > * Set priv->p5_intf_sel to the appropriate value if PHY muxing > > > * is detected. > > > */ > > > - interface = PHY_INTERFACE_MODE_NA; > > > - > > > for_each_child_of_node(dn, mac_np) { > > > if (!of_device_is_compatible(mac_np, > > > "mediatek,eth-mac")) > > > @@ -2346,7 +2341,9 @@ mt7530_setup(struct dsa_switch *ds) > > > break; > > > } > > > - mt7530_setup_port5(ds, interface); > > > + if (priv->p5_intf_sel == P5_INTF_SEL_PHY_P0 || > > > + priv->p5_intf_sel == P5_INTF_SEL_PHY_P4) > > > + mt7530_setup_port5(ds, interface); > > > > Hi Arınç, > > > > It appears that interface is now uninitialised here. > > > > Flagged by Smatch. > > I'm not sure why it doesn't catch that for mt7530_setup_port5() to run > here, priv->p5_intf_sel must be either P5_INTF_SEL_PHY_P0 or > P5_INTF_SEL_PHY_P4. And for that to happen, the interface variable will be > initialised. Yes, I see your point now. At a guess, perhaps it because: 1. It doesn't know that of_get_phy_mode will set the value of interface 2. It doesn't know if the loop will run (more than zero times) I CCed Dan Carpenter, who is surely more knowledgeable about this than I, in case he wants to add anything. > for_each_child_of_node(dn, mac_np) { > if (!of_device_is_compatible(mac_np, > "mediatek,eth-mac")) > continue; > > ret = of_property_read_u32(mac_np, "reg", &id); > if (ret < 0 || id != 1) > continue; > > phy_node = of_parse_phandle(mac_np, "phy-handle", 0); > if (!phy_node) > continue; > > if (phy_node->parent == priv->dev->of_node->parent) { > ret = of_get_phy_mode(mac_np, &interface); > if (ret && ret != -ENODEV) { > of_node_put(mac_np); > of_node_put(phy_node); > return ret; > } > id = of_mdio_parse_addr(ds->dev, phy_node); > if (id == 0) > priv->p5_intf_sel = P5_INTF_SEL_PHY_P0; > if (id == 4) > priv->p5_intf_sel = P5_INTF_SEL_PHY_P4; > } > of_node_put(mac_np); > of_node_put(phy_node); > break; > } > > if (priv->p5_intf_sel == P5_INTF_SEL_PHY_P0 || > priv->p5_intf_sel == P5_INTF_SEL_PHY_P4) > mt7530_setup_port5(ds, interface); > > Arınç 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 E094BC4167B for ; Wed, 6 Dec 2023 21:46:57 +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=PzN9RCg3F6zzSjYkKNyFVTEmLdvRXiNG446VTURBZgw=; b=L/O/XhnoJSh0SX YtsCQxQrrOXl95JyS+ah5hZ5sh2Vn6hk9ekE7qE83I+ozXXWOVcIpo+WS9zS7U0sY43pK0oGM1+BI PjNoDNPe20u6TvYun1IQ4ajg9W/qzZV/D6wLESVU5zjsXf0b7wjqX0A89XEfAURc7HP1z29dgup2R KQLznh+LAw9XvQLAxsj023wv6aC5juXq18fTHmeEUsqLFPvYY4bHQTrCHil/Hx/T293SjiPQPpsYa WpDnGpkqYxp9NmyPc49RxXNqAO48qZJLYbNab7pg5KjtoQ2S/8+PEcHwZe5LhfUf7QsfjBtM3uJ/3 bNmQU7eKGiX327CgBqZw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAziz-00BLu5-0N; Wed, 06 Dec 2023 21:46:33 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAziw-00BLtV-0K; Wed, 06 Dec 2023 21:46:31 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 00F4861EAE; Wed, 6 Dec 2023 21:46:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC91FC433C7; Wed, 6 Dec 2023 21:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701899186; bh=l9pQaQbgUHALJ2vwCHkcZ5rSYRY+yqrXuiys54WpdbA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=N8AYDgbg++krTc8tjjB8RpnQd7Yrt6x0Pcge39vjGdGIY3snjbEkRTAHFFzpklmIo 9wduIe9htoEzofQoyPvuyoWNuel0lHWApJ8aSFkeznVm5hW/mEupMpEZcpzOMVt1X6 yAMRgImg3E/yS8PcSarjq/YDedj82AL25TDQmylR5VsjMGK05rKlNEOl6V+1adP7HE XNat0wDA1ByzwGroVpM9RVscXUMwEewqVcHhNDKdbwNuE2QIq8wot0/r9H5SuDiixB r98Z1TMxeGbMDewSo2RG0Sczfpssl+GxLKlGupRVinvaDoPEXHZtwsyCwCc1gB3YnI gMjRh9920Dg/Q== Date: Wed, 6 Dec 2023 21:46:18 +0000 From: Simon Horman To: =?utf-8?B?QXLEsW7DpyDDnE5BTA==?= Cc: Daniel Golle , Landen Chao , DENG Qingfang , Sean Wang , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno , Russell King , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Frank Wunderlich , Bartel Eerdekens , mithat.guner@xeront.com, erkin.bozoglu@xeront.com, Dan Carpenter Subject: Re: [PATCH net-next 07/15] net: dsa: mt7530: do not run mt7530_setup_port5() if port 5 is disabled Message-ID: <20231206214618.GC50400@kernel.org> References: <20231118123205.266819-1-arinc.unal@arinc9.com> <20231118123205.266819-8-arinc.unal@arinc9.com> <20231121185358.GA16629@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231206_134630_247266_9F27FCC8 X-CRM114-Status: GOOD ( 31.63 ) 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 KyBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQGxpbmFyby5vcmc+CgpPbiBTYXQsIERlYyAw MiwgMjAyMyBhdCAxMTo0NTo0MkFNICswMzAwLCBBcsSxbsOnIMOcTkFMIHdyb3RlOgo+IEhpIFNp bW9uLgo+IAo+IE9uIDIxLjExLjIwMjMgMjE6NTMsIFNpbW9uIEhvcm1hbiB3cm90ZToKPiA+IE9u IFNhdCwgTm92IDE4LCAyMDIzIGF0IDAzOjMxOjU3UE0gKzAzMDAsIEFyxLFuw6cgw5xOQUwgd3Jv dGU6Cj4gPiA+IFRoZXJlJ3Mgbm8gbmVlZCB0byBydW4gYWxsIHRoZSBjb2RlIG9uIG10NzUzMF9z ZXR1cF9wb3J0NSgpIGlmIHBvcnQgNSBpcwo+ID4gPiBkaXNhYmxlZC4gVGhlIG9ubHkgY2FzZSBm b3IgY2FsbGluZyBtdDc1MzBfc2V0dXBfcG9ydDUoKSBmcm9tCj4gPiA+IG10NzUzMF9zZXR1cCgp IGlzIHdoZW4gUEhZIG11eGluZyBpcyBlbmFibGVkLiBUaGF0IGlzIGJlY2F1c2UgcG9ydCA1IGlz IG5vdAo+ID4gPiBkZWZpbmVkIGFzIGEgcG9ydCBvbiB0aGUgZGV2aWNldHJlZSwgdGhlcmVmb3Jl LCBpdCBjYW5ub3QgYmUgY29udHJvbGxlZCBieQo+ID4gPiBwaHlsaW5rLgo+ID4gPiAKPiA+ID4g QmVjYXVzZSBvZiB0aGlzLCBydW4gbXQ3NTMwX3NldHVwX3BvcnQ1KCkgaWYgcHJpdi0+cDVfaW50 Zl9zZWwgaXMKPiA+ID4gUDVfSU5URl9TRUxfUEhZX1AwIG9yIFA1X0lOVEZfU0VMX1BIWV9QNC4g UmVtb3ZlIHRoZSBQNV9ESVNBQkxFRCBjYXNlIGZyb20KPiA+ID4gbXQ3NTMwX3NldHVwX3BvcnQ1 KCkuCj4gPiA+IAo+ID4gPiBTdG9wIGluaXRpYWxpc2luZyB0aGUgaW50ZXJmYWNlIHZhcmlhYmxl IGFzIHRoZSByZW1haW5pbmcgY2FzZXMgd2lsbCBhbHdheXMKPiA+ID4gY2FsbCBtdDc1MzBfc2V0 dXBfcG9ydDUoKSB3aXRoIGl0IGluaXRpYWxpc2VkLgo+ID4gPiAKPiA+ID4gU2lnbmVkLW9mZi1i eTogQXLEsW7DpyDDnE5BTCA8YXJpbmMudW5hbEBhcmluYzkuY29tPgo+ID4gPiBSZXZpZXdlZC1i eTogVmxhZGltaXIgT2x0ZWFuIDxvbHRlYW52QGdtYWlsLmNvbT4KPiA+ID4gLS0tCj4gPiA+ICAg ZHJpdmVycy9uZXQvZHNhL210NzUzMC5jIHwgOSArKystLS0tLS0KPiA+ID4gICAxIGZpbGUgY2hh bmdlZCwgMyBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQo+ID4gPiAKPiA+ID4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvbmV0L2RzYS9tdDc1MzAuYyBiL2RyaXZlcnMvbmV0L2RzYS9tdDc1MzAu Ywo+ID4gPiBpbmRleCBmYzg3ZWM4MTc2NzIuLjFhYWI0YzNmMjhiMCAxMDA2NDQKPiA+ID4gLS0t IGEvZHJpdmVycy9uZXQvZHNhL210NzUzMC5jCj4gPiA+ICsrKyBiL2RyaXZlcnMvbmV0L2RzYS9t dDc1MzAuYwo+ID4gPiBAQCAtOTQyLDkgKzk0Miw2IEBAIHN0YXRpYyB2b2lkIG10NzUzMF9zZXR1 cF9wb3J0NShzdHJ1Y3QgZHNhX3N3aXRjaCAqZHMsIHBoeV9pbnRlcmZhY2VfdCBpbnRlcmZhY2Up Cj4gPiA+ICAgCQkvKiBNVDc1MzBfUDVfTU9ERV9HTUFDOiBQNSAtPiBFeHRlcm5hbCBwaHkgb3Ig Mm5kIEdNQUMgKi8KPiA+ID4gICAJCXZhbCAmPSB+TUhXVFJBUF9QNV9ESVM7Cj4gPiA+ICAgCQli cmVhazsKPiA+ID4gLQljYXNlIFA1X0RJU0FCTEVEOgo+ID4gPiAtCQlpbnRlcmZhY2UgPSBQSFlf SU5URVJGQUNFX01PREVfTkE7Cj4gPiA+IC0JCWJyZWFrOwo+ID4gPiAgIAlkZWZhdWx0Ogo+ID4g PiAgIAkJZGV2X2Vycihkcy0+ZGV2LCAiVW5zdXBwb3J0ZWQgcDVfaW50Zl9zZWwgJWRcbiIsCj4g PiA+ICAgCQkJcHJpdi0+cDVfaW50Zl9zZWwpOwo+ID4gPiBAQCAtMjMxMyw4ICsyMzEwLDYgQEAg bXQ3NTMwX3NldHVwKHN0cnVjdCBkc2Ffc3dpdGNoICpkcykKPiA+ID4gICAJCSAqIFNldCBwcml2 LT5wNV9pbnRmX3NlbCB0byB0aGUgYXBwcm9wcmlhdGUgdmFsdWUgaWYgUEhZIG11eGluZwo+ID4g PiAgIAkJICogaXMgZGV0ZWN0ZWQuCj4gPiA+ICAgCQkgKi8KPiA+ID4gLQkJaW50ZXJmYWNlID0g UEhZX0lOVEVSRkFDRV9NT0RFX05BOwo+ID4gPiAtCj4gPiA+ICAgCQlmb3JfZWFjaF9jaGlsZF9v Zl9ub2RlKGRuLCBtYWNfbnApIHsKPiA+ID4gICAJCQlpZiAoIW9mX2RldmljZV9pc19jb21wYXRp YmxlKG1hY19ucCwKPiA+ID4gICAJCQkJCQkgICAgICJtZWRpYXRlayxldGgtbWFjIikpCj4gPiA+ IEBAIC0yMzQ2LDcgKzIzNDEsOSBAQCBtdDc1MzBfc2V0dXAoc3RydWN0IGRzYV9zd2l0Y2ggKmRz KQo+ID4gPiAgIAkJCWJyZWFrOwo+ID4gPiAgIAkJfQo+ID4gPiAtCQltdDc1MzBfc2V0dXBfcG9y dDUoZHMsIGludGVyZmFjZSk7Cj4gPiA+ICsJCWlmIChwcml2LT5wNV9pbnRmX3NlbCA9PSBQNV9J TlRGX1NFTF9QSFlfUDAgfHwKPiA+ID4gKwkJICAgIHByaXYtPnA1X2ludGZfc2VsID09IFA1X0lO VEZfU0VMX1BIWV9QNCkKPiA+ID4gKwkJCW10NzUzMF9zZXR1cF9wb3J0NShkcywgaW50ZXJmYWNl KTsKPiA+IAo+ID4gSGkgQXLEsW7DpywKPiA+IAo+ID4gSXQgYXBwZWFycyB0aGF0IGludGVyZmFj ZSBpcyBub3cgdW5pbml0aWFsaXNlZCBoZXJlLgo+ID4gCj4gPiBGbGFnZ2VkIGJ5IFNtYXRjaC4K PiAKPiBJJ20gbm90IHN1cmUgd2h5IGl0IGRvZXNuJ3QgY2F0Y2ggdGhhdCBmb3IgbXQ3NTMwX3Nl dHVwX3BvcnQ1KCkgdG8gcnVuCj4gaGVyZSwgcHJpdi0+cDVfaW50Zl9zZWwgbXVzdCBiZSBlaXRo ZXIgUDVfSU5URl9TRUxfUEhZX1AwIG9yCj4gUDVfSU5URl9TRUxfUEhZX1A0LiBBbmQgZm9yIHRo YXQgdG8gaGFwcGVuLCB0aGUgaW50ZXJmYWNlIHZhcmlhYmxlIHdpbGwgYmUKPiBpbml0aWFsaXNl ZC4KClllcywgSSBzZWUgeW91ciBwb2ludCBub3cuIEF0IGEgZ3Vlc3MsIHBlcmhhcHMgaXQgYmVj YXVzZToKCjEuIEl0IGRvZXNuJ3Qga25vdyB0aGF0IG9mX2dldF9waHlfbW9kZSB3aWxsIHNldCB0 aGUgdmFsdWUgb2YgaW50ZXJmYWNlCjIuIEl0IGRvZXNuJ3Qga25vdyBpZiB0aGUgbG9vcCB3aWxs IHJ1biAobW9yZSB0aGFuIHplcm8gdGltZXMpCgpJIENDZWQgRGFuIENhcnBlbnRlciwgd2hvIGlz IHN1cmVseSBtb3JlIGtub3dsZWRnZWFibGUgYWJvdXQgdGhpcyB0aGFuIEksCmluIGNhc2UgaGUg d2FudHMgdG8gYWRkIGFueXRoaW5nLgoKPiBmb3JfZWFjaF9jaGlsZF9vZl9ub2RlKGRuLCBtYWNf bnApIHsKPiAJaWYgKCFvZl9kZXZpY2VfaXNfY29tcGF0aWJsZShtYWNfbnAsCj4gCQkJCSAgICAg Im1lZGlhdGVrLGV0aC1tYWMiKSkKPiAJCWNvbnRpbnVlOwo+IAo+IAlyZXQgPSBvZl9wcm9wZXJ0 eV9yZWFkX3UzMihtYWNfbnAsICJyZWciLCAmaWQpOwo+IAlpZiAocmV0IDwgMCB8fCBpZCAhPSAx KQo+IAkJY29udGludWU7Cj4gCj4gCXBoeV9ub2RlID0gb2ZfcGFyc2VfcGhhbmRsZShtYWNfbnAs ICJwaHktaGFuZGxlIiwgMCk7Cj4gCWlmICghcGh5X25vZGUpCj4gCQljb250aW51ZTsKPiAKPiAJ aWYgKHBoeV9ub2RlLT5wYXJlbnQgPT0gcHJpdi0+ZGV2LT5vZl9ub2RlLT5wYXJlbnQpIHsKPiAJ CXJldCA9IG9mX2dldF9waHlfbW9kZShtYWNfbnAsICZpbnRlcmZhY2UpOwo+IAkJaWYgKHJldCAm JiByZXQgIT0gLUVOT0RFVikgewo+IAkJCW9mX25vZGVfcHV0KG1hY19ucCk7Cj4gCQkJb2Zfbm9k ZV9wdXQocGh5X25vZGUpOwo+IAkJCXJldHVybiByZXQ7Cj4gCQl9Cj4gCQlpZCA9IG9mX21kaW9f cGFyc2VfYWRkcihkcy0+ZGV2LCBwaHlfbm9kZSk7Cj4gCQlpZiAoaWQgPT0gMCkKPiAJCQlwcml2 LT5wNV9pbnRmX3NlbCA9IFA1X0lOVEZfU0VMX1BIWV9QMDsKPiAJCWlmIChpZCA9PSA0KQo+IAkJ CXByaXYtPnA1X2ludGZfc2VsID0gUDVfSU5URl9TRUxfUEhZX1A0Owo+IAl9Cj4gCW9mX25vZGVf cHV0KG1hY19ucCk7Cj4gCW9mX25vZGVfcHV0KHBoeV9ub2RlKTsKPiAJYnJlYWs7Cj4gfQo+IAo+ IGlmIChwcml2LT5wNV9pbnRmX3NlbCA9PSBQNV9JTlRGX1NFTF9QSFlfUDAgfHwKPiAgICAgcHJp di0+cDVfaW50Zl9zZWwgPT0gUDVfSU5URl9TRUxfUEhZX1A0KQo+IAltdDc1MzBfc2V0dXBfcG9y dDUoZHMsIGludGVyZmFjZSk7Cj4gCj4gQXLEsW7DpwoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGlu dXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQu b3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= 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 525D1C4167B for ; Wed, 6 Dec 2023 21:46:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377221AbjLFVqW (ORCPT ); Wed, 6 Dec 2023 16:46:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230383AbjLFVqU (ORCPT ); Wed, 6 Dec 2023 16:46:20 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1810612F for ; Wed, 6 Dec 2023 13:46:27 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC91FC433C7; Wed, 6 Dec 2023 21:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701899186; bh=l9pQaQbgUHALJ2vwCHkcZ5rSYRY+yqrXuiys54WpdbA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=N8AYDgbg++krTc8tjjB8RpnQd7Yrt6x0Pcge39vjGdGIY3snjbEkRTAHFFzpklmIo 9wduIe9htoEzofQoyPvuyoWNuel0lHWApJ8aSFkeznVm5hW/mEupMpEZcpzOMVt1X6 yAMRgImg3E/yS8PcSarjq/YDedj82AL25TDQmylR5VsjMGK05rKlNEOl6V+1adP7HE XNat0wDA1ByzwGroVpM9RVscXUMwEewqVcHhNDKdbwNuE2QIq8wot0/r9H5SuDiixB r98Z1TMxeGbMDewSo2RG0Sczfpssl+GxLKlGupRVinvaDoPEXHZtwsyCwCc1gB3YnI gMjRh9920Dg/Q== Date: Wed, 6 Dec 2023 21:46:18 +0000 From: Simon Horman To: =?utf-8?B?QXLEsW7DpyDDnE5BTA==?= Cc: Daniel Golle , Landen Chao , DENG Qingfang , Sean Wang , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno , Russell King , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Frank Wunderlich , Bartel Eerdekens , mithat.guner@xeront.com, erkin.bozoglu@xeront.com, Dan Carpenter Subject: Re: [PATCH net-next 07/15] net: dsa: mt7530: do not run mt7530_setup_port5() if port 5 is disabled Message-ID: <20231206214618.GC50400@kernel.org> References: <20231118123205.266819-1-arinc.unal@arinc9.com> <20231118123205.266819-8-arinc.unal@arinc9.com> <20231121185358.GA16629@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org + Dan Carpenter On Sat, Dec 02, 2023 at 11:45:42AM +0300, Arınç ÜNAL wrote: > Hi Simon. > > On 21.11.2023 21:53, Simon Horman wrote: > > On Sat, Nov 18, 2023 at 03:31:57PM +0300, Arınç ÜNAL wrote: > > > There's no need to run all the code on mt7530_setup_port5() if port 5 is > > > disabled. The only case for calling mt7530_setup_port5() from > > > mt7530_setup() is when PHY muxing is enabled. That is because port 5 is not > > > defined as a port on the devicetree, therefore, it cannot be controlled by > > > phylink. > > > > > > Because of this, run mt7530_setup_port5() if priv->p5_intf_sel is > > > P5_INTF_SEL_PHY_P0 or P5_INTF_SEL_PHY_P4. Remove the P5_DISABLED case from > > > mt7530_setup_port5(). > > > > > > Stop initialising the interface variable as the remaining cases will always > > > call mt7530_setup_port5() with it initialised. > > > > > > Signed-off-by: Arınç ÜNAL > > > Reviewed-by: Vladimir Oltean > > > --- > > > drivers/net/dsa/mt7530.c | 9 +++------ > > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c > > > index fc87ec817672..1aab4c3f28b0 100644 > > > --- a/drivers/net/dsa/mt7530.c > > > +++ b/drivers/net/dsa/mt7530.c > > > @@ -942,9 +942,6 @@ static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface) > > > /* MT7530_P5_MODE_GMAC: P5 -> External phy or 2nd GMAC */ > > > val &= ~MHWTRAP_P5_DIS; > > > break; > > > - case P5_DISABLED: > > > - interface = PHY_INTERFACE_MODE_NA; > > > - break; > > > default: > > > dev_err(ds->dev, "Unsupported p5_intf_sel %d\n", > > > priv->p5_intf_sel); > > > @@ -2313,8 +2310,6 @@ mt7530_setup(struct dsa_switch *ds) > > > * Set priv->p5_intf_sel to the appropriate value if PHY muxing > > > * is detected. > > > */ > > > - interface = PHY_INTERFACE_MODE_NA; > > > - > > > for_each_child_of_node(dn, mac_np) { > > > if (!of_device_is_compatible(mac_np, > > > "mediatek,eth-mac")) > > > @@ -2346,7 +2341,9 @@ mt7530_setup(struct dsa_switch *ds) > > > break; > > > } > > > - mt7530_setup_port5(ds, interface); > > > + if (priv->p5_intf_sel == P5_INTF_SEL_PHY_P0 || > > > + priv->p5_intf_sel == P5_INTF_SEL_PHY_P4) > > > + mt7530_setup_port5(ds, interface); > > > > Hi Arınç, > > > > It appears that interface is now uninitialised here. > > > > Flagged by Smatch. > > I'm not sure why it doesn't catch that for mt7530_setup_port5() to run > here, priv->p5_intf_sel must be either P5_INTF_SEL_PHY_P0 or > P5_INTF_SEL_PHY_P4. And for that to happen, the interface variable will be > initialised. Yes, I see your point now. At a guess, perhaps it because: 1. It doesn't know that of_get_phy_mode will set the value of interface 2. It doesn't know if the loop will run (more than zero times) I CCed Dan Carpenter, who is surely more knowledgeable about this than I, in case he wants to add anything. > for_each_child_of_node(dn, mac_np) { > if (!of_device_is_compatible(mac_np, > "mediatek,eth-mac")) > continue; > > ret = of_property_read_u32(mac_np, "reg", &id); > if (ret < 0 || id != 1) > continue; > > phy_node = of_parse_phandle(mac_np, "phy-handle", 0); > if (!phy_node) > continue; > > if (phy_node->parent == priv->dev->of_node->parent) { > ret = of_get_phy_mode(mac_np, &interface); > if (ret && ret != -ENODEV) { > of_node_put(mac_np); > of_node_put(phy_node); > return ret; > } > id = of_mdio_parse_addr(ds->dev, phy_node); > if (id == 0) > priv->p5_intf_sel = P5_INTF_SEL_PHY_P0; > if (id == 4) > priv->p5_intf_sel = P5_INTF_SEL_PHY_P4; > } > of_node_put(mac_np); > of_node_put(phy_node); > break; > } > > if (priv->p5_intf_sel == P5_INTF_SEL_PHY_P0 || > priv->p5_intf_sel == P5_INTF_SEL_PHY_P4) > mt7530_setup_port5(ds, interface); > > Arınç