From patchwork Thu Apr 6 02:45:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sit, Michael Wei Hong" X-Patchwork-Id: 80039 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp732597vqo; Wed, 5 Apr 2023 19:56:02 -0700 (PDT) X-Google-Smtp-Source: AKy350bjsHJyMF4tJ1UXmX77XDKpGpzFQqaDfEPpj14gYt2HLX58dX0gqVQ5KPYWCY35q5XhHaR6 X-Received: by 2002:a17:907:78cf:b0:93e:9362:7602 with SMTP id kv15-20020a17090778cf00b0093e93627602mr4379249ejc.50.1680749762435; Wed, 05 Apr 2023 19:56:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680749762; cv=none; d=google.com; s=arc-20160816; b=OL2UL0/fg87cxru9ScwxP2VjEQa4aNLs6bhY+tkv7tpaRCvnGxNeD8uV0MB0It+vH2 iJOYw6RwTS92td7qNKnwYukd8gkCksYYv+K4DRuDm6YJePrqU2in+EiGI1fvPpACL0hq bZeu/WKdHqLrkZhDC175JRWiwbLJmiW+6HtiF09PgI2RumIDptoGhGwPxhGbfI6KEBga 8oI35UFoejbzghR1CUQd0G27FzgQMd9sIVuO6GIJI1xbFMJQ3C9VU+o1Y/ZOyLh7bQh/ C20zKjB1YTpFcIX3Nsz2X8005bAkv1K8rvZRUddW9AWzl/ffQL4oyHFfHSYgCPNN6O3f 8vkg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=2LDpqe8ZqM6BBP3HnRTo6AHZaXoOjaThuh1lp6wWpAw=; b=MVxm7oV8ZPu+rIaWEPZycvthrJeiZyBjrldq0Nb4mILdQswNlmd7aQ4XcdTW4hM8RT /7bUI/HurY8d6PQlLaEIXo5qoeO7v6fhVUYOvo0J9lvm2OiYXYu6rzQYuNC5pz+QABNt byXsbelXXMX+eKqmfGcta29OeJo/Y+l/ts5rY0on5DRVSmab2V4CUu3u/YqiCa7lDeCS s5GHPNubUkqEvTm8pQ+UTPWwBXVefkfaaVAdhWGX6QvK6dSNhZZ47gBtWbdznmHZ642R 4A054Rl6+3lgm0Y7n5dIE2fOdjvXG5xMmpk8LP34jx2+wJy9CJzDQL5nV2Kf6zkLfEEi 6HgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Cyabcphv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ne14-20020a1709077b8e00b008dc76bf3a69si325602ejc.735.2023.04.05.19.55.38; Wed, 05 Apr 2023 19:56:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Cyabcphv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235061AbjDFCt7 (ORCPT + 99 others); Wed, 5 Apr 2023 22:49:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234692AbjDFCth (ORCPT ); Wed, 5 Apr 2023 22:49:37 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05C69AD3A; Wed, 5 Apr 2023 19:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680749204; x=1712285204; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=OYFGzpPYLI2q69hmtLhmRnE7jbvoO6JpkJESOEl3xDA=; b=CyabcphvFd/lpg25lY7l0vdTe4qDlNWr2NqJjYhNyMdp4070WZnEJ2Rw rrVj/N/ZsYajjterDP9gY2bt/6giOUng89fsgt1I/U9OHJmP1+X6Ja8Ec 9mDHFYOlLApILSUgZG5XfzzHkeJGthMvQ1ztrWuTdOhmDQvEzJ0sUUwL6 Z5OAxlicBe9RtBDLeM0H8cizw5/9v4/3kYhcG3EDWSmlzsNUFPfnFCROY 9/MEPrkQnTtZSUbriwMXvn0SbLRn/FdwRpoZXHc60xLMVJnVetu/B1jPc BWZNrfvo4uvshgjlP+CPOqPQYdsC4y/AfQldSj3EDggYOugpGwSSyA5tl Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10671"; a="345217309" X-IronPort-AV: E=Sophos;i="5.98,322,1673942400"; d="scan'208";a="345217309" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2023 19:46:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10671"; a="810830733" X-IronPort-AV: E=Sophos;i="5.98,322,1673942400"; d="scan'208";a="810830733" Received: from mike-ilbpg1.png.intel.com ([10.88.227.76]) by orsmga004.jf.intel.com with ESMTP; 05 Apr 2023 19:46:37 -0700 From: Michael Sit Wei Hong To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Ong Boon Leong , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux@armlinux.org.uk, hkallweit1@gmail.com, andrew@lunn.ch, Martin Blumenstingl , Shahab Vahedi , Marek Szyprowski Cc: Looi Hong Aun , Voon Weifeng , Lai Peter Jun Ann , Zulkifli Muhammad Husaini , Tan Tee Min , hock.leong.kweh@intel.com Subject: [RESEND PATCH net 1/1] net: stmmac: check fwnode for phy device before scanning for phy Date: Thu, 6 Apr 2023 10:45:41 +0800 Message-Id: <20230406024541.3556305-1-michael.wei.hong.sit@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=0.5 required=5.0 tests=AC_FROM_MANY_DOTS, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762393862884340737?= X-GMAIL-MSGID: =?utf-8?q?1762393862884340737?= Some DT devices already have phy device configured in the DT/ACPI. Current implementation scans for a phy unconditionally even though there is a phy listed in the DT/ACPI and already attached. We should check the fwnode if there is any phy device listed in fwnode and decide whether to scan for a phy to attach to. Fixes: fe2cfbc96803 ("net: stmmac: check if MAC needs to attach to a PHY") Reported-by: Martin Blumenstingl Link: https://lore.kernel.org/lkml/20230403212434.296975-1-martin.blumenstingl@googlemail.com/ Tested-by: Guenter Roeck Tested-by: Shahab Vahedi Tested-by: Marek Szyprowski Tested-by: Martin Blumenstingl Suggested-by: Russell King (Oracle) Signed-off-by: Michael Sit Wei Hong --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index d41a5f92aee7..7ca9be7bec06 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1134,22 +1134,26 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv) static int stmmac_init_phy(struct net_device *dev) { struct stmmac_priv *priv = netdev_priv(dev); + struct fwnode_handle *phy_fwnode; struct fwnode_handle *fwnode; - bool phy_needed; int ret; + if (!phylink_expects_phy(priv->phylink)) + return 0; + fwnode = of_fwnode_handle(priv->plat->phylink_node); if (!fwnode) fwnode = dev_fwnode(priv->device); if (fwnode) - ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0); + phy_fwnode = fwnode_get_phy_node(fwnode); + else + phy_fwnode = NULL; - phy_needed = phylink_expects_phy(priv->phylink); /* Some DT bindings do not set-up the PHY handle. Let's try to * manually parse it */ - if (!fwnode || phy_needed || ret) { + if (!phy_fwnode || IS_ERR(phy_fwnode)) { int addr = priv->plat->phy_addr; struct phy_device *phydev; @@ -1165,6 +1169,9 @@ static int stmmac_init_phy(struct net_device *dev) } ret = phylink_connect_phy(priv->phylink, phydev); + } else { + fwnode_handle_put(phy_fwnode); + ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0); } if (!priv->plat->pmt) {