From patchwork Tue Mar 14 07:02:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Sit, Michael Wei Hong" X-Patchwork-Id: 69334 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1606200wrd; Tue, 14 Mar 2023 00:07:33 -0700 (PDT) X-Google-Smtp-Source: AK7set+G6ZlJpjvsi4sLeezFCixWU8ngNqhti7U9xxsAoZk89h1R3K/+u9fclpWim1vPHwcbWNFQ X-Received: by 2002:aa7:96b6:0:b0:624:c216:a88c with SMTP id g22-20020aa796b6000000b00624c216a88cmr3950440pfk.30.1678777653365; Tue, 14 Mar 2023 00:07:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678777653; cv=none; d=google.com; s=arc-20160816; b=qnQqCDGaGhe5q8y5vR0I82LacvhpkfHK2g6c5qjKk2hJ4MunyRDeI1CUrFfyfJKapW rvRvu6XB3LYugJOfvz3xEOsZDmDGnRA/l1zlxQWBrw5zufnuqP8S5SOa/hXmWPLwPj0A LPmnmdWLBGf9izxsFrZ1V2NTI6cC/ICeQzjQQ4+IB/T0ZwDSWz6qpCk4qeqrBirahXdm MYswOKH0iZiUz/rlgZnRIaRp/SIp4X0Tckoihg2wrP6/DCCNd7tJRSBbfLKxYIvgn/jj yvocWgv7WOr7fo4Z2NsRV9Cgq3Hs5jNejL0M2hNO1PfVDUhXXpnQ0ilbTZeCurpJPFUJ 04Fg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RpkwxLykuiCOyvTmYQqsXVHjAPveH1EsJkYIwjyxc5c=; b=MBy59wFg6OEQ4/TI155BkUjCNrPsQTomIdkpfbSwl9AkCQZq63QSd+z603Kq/CrRPQ RSGAYacw0SSfjN5yLrB8NLsV4hyvXE6gV5JCYCsfCSmBM+ezIgWmlLbyZ8OWJ1H/Aufu a6zJI++DgJIb7N7nRj35dJ2YjPpUNxMWm9ENb7gep/h3V0HSH7zx1lS1cXoFdnDeffDW +EU2+ZAzklNr0+Jq6HG0VEtm0493+yU58zVokJHLBbwK50Dj56/MQVphW9QFEWfVshAu GG2X+RITSj0tY/gK7x78QTSCL3JmzCQXEwP/ysvoikDaYZAzxHqQSipzxX4wGSLqEOCD Z/pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UTDPJff9; 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 e15-20020a63f54f000000b00503015b772asi1588382pgk.743.2023.03.14.00.07.19; Tue, 14 Mar 2023 00:07:33 -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=UTDPJff9; 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 S229468AbjCNHDI (ORCPT + 99 others); Tue, 14 Mar 2023 03:03:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbjCNHDF (ORCPT ); Tue, 14 Mar 2023 03:03:05 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EF7E22102; Tue, 14 Mar 2023 00:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678777383; x=1710313383; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+jXWOkuHIz7opU+/4fOqwtDaqYNzAOX5btGkyFBkb6Q=; b=UTDPJff9j10QBP0fIL6mvJ5r2wNbpLxVl9V4cWNUItw8KPut9DuWqrp2 XxJB56+aY3+DAUn9SM7V1IpZf5/pN39q2R5gFBjfjc8IRVnrOGiihgQPw ICQStGnUucMXkUVzm2DuVSmBOrdMgD/HJzzMBOFD7i1GS8E+jP8cvkGOA ZGJk82b3DW9wByR7/zNRgvGCqTNFyMdCEDdMoAubqdbDjiptd7K6h1J+k df0ZOzfci8O6aMRI8FaX+GkbsTi5jd8FCFTRp6U3oPFt5IYjR+WSgmaC0 RJ6fuDuCZaUuuDIUYjwy1D6Ph0x7Xgp2k9QTdiEn3r3hCpOIfXA9ijTko Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10648"; a="334828457" X-IronPort-AV: E=Sophos;i="5.98,259,1673942400"; d="scan'208";a="334828457" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2023 00:02:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10648"; a="656226744" X-IronPort-AV: E=Sophos;i="5.98,259,1673942400"; d="scan'208";a="656226744" Received: from mike-ilbpg1.png.intel.com ([10.88.227.76]) by orsmga006.jf.intel.com with ESMTP; 14 Mar 2023 00:02:34 -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 Cc: Looi Hong Aun , Voon Weifeng , Lai Peter Jun Ann Subject: [PATCH net v2 1/2] net: stmmac: fix PHY handle parsing Date: Tue, 14 Mar 2023 15:02:07 +0800 Message-Id: <20230314070208.3703963-2-michael.wei.hong.sit@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230314070208.3703963-1-michael.wei.hong.sit@intel.com> References: <20230314070208.3703963-1-michael.wei.hong.sit@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham 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?1760325956539262759?= X-GMAIL-MSGID: =?utf-8?q?1760325956539262759?= phylink_fwnode_phy_connect returns 0 when set to MLO_AN_INBAND. This causes the PHY handle parsing to skip and the PHY will not be attached to the MAC. Add additional check for PHY handle parsing when set to MLO_AN_INBAND. Fixes: ab21cf920928 ("net: stmmac: make mdio register skips PHY scanning for fixed-link") Signed-off-by: Michael Sit Wei Hong Signed-off-by: Lai Peter Jun Ann Tested-by: Fabian Bläse --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 8f543c3ab5c5..398adcd68ee8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1134,6 +1134,7 @@ 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 *fixed_node; struct fwnode_handle *fwnode; int ret; @@ -1141,13 +1142,16 @@ static int stmmac_init_phy(struct net_device *dev) if (!fwnode) fwnode = dev_fwnode(priv->device); - if (fwnode) + if (fwnode) { + fixed_node = fwnode_get_named_child_node(fwnode, "fixed-link"); + fwnode_handle_put(fixed_node); ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0); + } /* Some DT bindings do not set-up the PHY handle. Let's try to * manually parse it */ - if (!fwnode || ret) { + if (!fwnode || ret || !fixed_node) { int addr = priv->plat->phy_addr; struct phy_device *phydev;