From patchwork Tue Mar 26 13:32:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Gantois X-Patchwork-Id: 13604152 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 D52CFCD1280 for ; Tue, 26 Mar 2024 13:32:15 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Njt/pDvL6oFZyTuKxS7lDoVlTUH0o9x9HaQVUu0/YYw=; b=NmBphOqVe3tF3l baQSoZNTno+H9FjHwPI/dSIRNhGX2u7K7qHTOSh6rYcd9thrKEZ01j9vaaDCY0USh5iTo5uB2LwJN UW0cDsjpixcr1MNAbZPBwqcrklh5Wsag54S94o2I2Y5ppqbnAO9Fs8eY2u5z3XeK32P9v1pymH/9/ QHezJjB+pOFESQ+ADSFchQowlQwsnSoC2OLn9rCaURkxAElPB7aY87WdxbYmaZfwyTi0hgwCbpcOs wGtKIfK/FFqnRv2+1xriEfHLFLQv4E/U10afyKMQMRvHQS6ytwbh1DGsMvpAbLh+TIanYGHpWCa9O QoDPyrLjsOn10XRhOGjw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rp6uL-00000004fpO-0M94; Tue, 26 Mar 2024 13:32:05 +0000 Received: from relay6-d.mail.gandi.net ([217.70.183.198]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rp6ty-00000004fgK-3NAP for linux-arm-kernel@lists.infradead.org; Tue, 26 Mar 2024 13:31:49 +0000 Received: by mail.gandi.net (Postfix) with ESMTPSA id 8919AC0008; Tue, 26 Mar 2024 13:31:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1711459898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8Hre9/21LZl4mrXvR33ftuCbpilsmjMQ6zHliMO3IS8=; b=ZzxUrww+kGSKdqTJ+jOk+6hDUVcJnoVkJ28iqCs5SXg5WIoydidTasGddWtqgEjQ8q6uA4 /CSUUPOIpI2feeBsUXHvWx7tW3XeOpvv8U3DHCFNuWf1g7o+EPdKDL8YaE+KhjFOKTm/yQ 2h4r7Nqdc+iFuOAtaZbiizbmSgikJTrmxLRyEFoZZ9rF0WR+cqtL/I/7niYlDYzzNuHcmZ V/IOx8lEGN2nMEBXLIi/Lu8vuISwdblLcm261gE1y5W/Gl2uva7IKUKwFHYSD9VXoH4peo 1KKfPW33ym+3kUneeCF6DltS1gH7NqiyF+DNbD/x0v6zKXqS/hSoO9QdCPj7CA== From: Romain Gantois Date: Tue, 26 Mar 2024 14:32:09 +0100 Subject: [PATCH RESEND net-next v6 3/7] net: stmmac: don't rely on lynx_pcs presence to check for a PHY MIME-Version: 1.0 Message-Id: <20240326-rxc_bugfix-v6-3-24a74e5c761f@bootlin.com> References: <20240326-rxc_bugfix-v6-0-24a74e5c761f@bootlin.com> In-Reply-To: <20240326-rxc_bugfix-v6-0-24a74e5c761f@bootlin.com> To: Russell King , Andrew Lunn , Heiner Kallweit , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , =?utf-8?b?Q2zDqW1lbnQgTMOp?= =?utf-8?b?Z2Vy?= Cc: Maxime Chevallier , Miquel Raynal , Thomas Petazzoni , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, Romain Gantois X-Mailer: b4 0.13.0 X-GND-Sasl: romain.gantois@bootlin.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240326_063146_279676_0CE2AC57 X-CRM114-Status: GOOD ( 11.67 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Maxime Chevallier When initializing attached PHYs, there are some cases where we don't expect any PHY to be connected. The logic uses conditions based on various local PCS configuration, but also calls-in phylink_expects_phy() via stmmac_init_phy(), which is enough to ensure we don't try to initialize a PHY when using a Lynx PCS, as long as we have the phy_interface set to a 802.3z mode and are using inband negociation. Drop the lynx check, making the stmmac generic code more pcs_lynx-agnostic. Signed-off-by: Maxime Chevallier [rgantois: commit log] Signed-off-by: Romain Gantois Reviewed-by: Andrew Lunn --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 24cd80490d19..d78c625d33eb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3960,8 +3960,7 @@ static int __stmmac_open(struct net_device *dev, if (priv->hw->pcs != STMMAC_PCS_TBI && priv->hw->pcs != STMMAC_PCS_RTBI && (!priv->hw->xpcs || - xpcs_get_an_mode(priv->hw->xpcs, mode) != DW_AN_C73) && - !priv->hw->lynx_pcs) { + xpcs_get_an_mode(priv->hw->xpcs, mode) != DW_AN_C73)) { ret = stmmac_init_phy(dev); if (ret) { netdev_err(priv->dev,