From patchwork Thu Mar 30 09:14:02 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: 76987 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp995402vqo; Thu, 30 Mar 2023 02:32:13 -0700 (PDT) X-Google-Smtp-Source: AKy350Y5+C2bR1TrHL3bd0tFJrFuXe2hzz6Dvq5viHqeH/EqFAHWdo8B7hM2lH2gjD+v4o0lb27I X-Received: by 2002:a17:906:1514:b0:92b:ae6c:23e7 with SMTP id b20-20020a170906151400b0092bae6c23e7mr22310149ejd.56.1680168733176; Thu, 30 Mar 2023 02:32:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680168733; cv=none; d=google.com; s=arc-20160816; b=PPEjWEaYfHPbrzsoCWNN5hQRU337nzGnDcehxJmw89J8nZq6LrSMjEsqGHavfpJ6jM CxDJqcmQRqHp+aRsV8hXFOtemZAgxTGnoz4MzNOXaOrS1TpXRAlovjXKY9X8gWL/mVOE Vw4IwczCJ0vvARh2PzYNCF37eQCvggwonQjMTsNJjrFTLYGkL0TqwQyW+pMa/w80qHuc aj8tygMlp5KE26YDfwW+KoApmSct7+cF9Js8koeLus3ecXbfY5ZxM1k3kre9SSVuolOh 0+a8ax1VKYv3JGEMzwlHkDUOVDmSqTkQF8ndX4LvHbO6ngt53xv2Q4/E//h33F6/PTLn Nvtw== 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=4HPaR5A53quMi2uxB6Lwfp7K0MJyZzMxL3dhXe+02Rw=; b=LVEdUQwWcMPyJL1hfNqCn6S4cJ0ru68RoNYMjY9tyd514YDMfofusTW2NcqxYrhEBL WuWX8wMuCGMYCM5C4M4JJf3g+i642fbxieviCl1xuUTbOOJOdQJnf6O1au/3989YboTU pU4VTuFAAcgWyE+/f5hRiwhz1ehzzA/1XXybaHht9RcGj6RfIhTq0dI7gC4442suKbte Mg0TR6nQr0ayMBe+H6GCpDwNnzmFxg10YntFYOwIe26wK7caH1LYxoURd751nHy3gpBc Fp94lIr10OvGG7H+px5KHWPwXVRLhUtK4iHQql8xTsPFeCK8VaAWEjojvluzBeVRIDJu MbCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gVOX11q6; 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 qf7-20020a1709077f0700b00947335f538asi70765ejc.211.2023.03.30.02.31.48; Thu, 30 Mar 2023 02:32:13 -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=gVOX11q6; 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 S229862AbjC3JPS (ORCPT + 99 others); Thu, 30 Mar 2023 05:15:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229639AbjC3JPG (ORCPT ); Thu, 30 Mar 2023 05:15:06 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 476F21738; Thu, 30 Mar 2023 02:15:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680167705; x=1711703705; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EQDSnthQ5cFmTJaAo9m1vejrcveOKhLU44+A2MCijjk=; b=gVOX11q6H70AC9mktoatnHzTOk5Bjd35ksjMv06igVEsKFK6TrnGj5Sq 1qPpKKvIuN9D/DDM/gGmk+TVq3R7OHBehVXJsZhxG8PM5EPaI5Vt1c2Pj k3OUA8n9rlsJkeWxyUmtIc/HUwN7bywGW42VtiKuIlwZ57+bc5IPwIy8l sJ0ndKQiPJwZZ8lYDiQDpx6NXgL2O0cSxDrcKlPu7it6MlGeooiVGJCjI zYRtSNb+inpryjWPVwH55flBCJ6wpyjaSg8sx2FI4TPcD+GA4TzyQkEnf KZoxuVASUBLILcDKr7shdeegvgvJoU41aZyJ/JDQLoIElA1Dsw5VKOGUr A==; X-IronPort-AV: E=McAfee;i="6600,9927,10664"; a="325038866" X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208";a="325038866" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2023 02:15:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10664"; a="678125408" X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208";a="678125408" Received: from mike-ilbpg1.png.intel.com ([10.88.227.76]) by orsmga007.jf.intel.com with ESMTP; 30 Mar 2023 02:14:52 -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 Cc: Looi Hong Aun , Voon Weifeng , Lai Peter Jun Ann Subject: [PATCH net v5 1/3] net: phylink: add phylink_expects_phy() method Date: Thu, 30 Mar 2023 17:14:02 +0800 Message-Id: <20230330091404.3293431-2-michael.wei.hong.sit@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330091404.3293431-1-michael.wei.hong.sit@intel.com> References: <20230330091404.3293431-1-michael.wei.hong.sit@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761784609358345574?= X-GMAIL-MSGID: =?utf-8?q?1761784609358345574?= Provide phylink_expects_phy() to allow MAC drivers to check if it is expecting a PHY to attach to. Since fixed-linked setups do not need to attach to a PHY. Provides a boolean value as to if the MAC should expect a PHY. Returns true if a PHY is expected. Reviewed-by: Russell King (Oracle) Signed-off-by: Michael Sit Wei Hong --- drivers/net/phy/phylink.c | 19 +++++++++++++++++++ include/linux/phylink.h | 1 + 2 files changed, 20 insertions(+) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 1a2f074685fa..30c166b33468 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1586,6 +1586,25 @@ void phylink_destroy(struct phylink *pl) } EXPORT_SYMBOL_GPL(phylink_destroy); +/** + * phylink_expects_phy() - Determine if phylink expects a phy to be attached + * @pl: a pointer to a &struct phylink returned from phylink_create() + * + * When using fixed-link mode, or in-band mode with 1000base-X or 2500base-X, + * no PHY is needed. + * + * Returns true if phylink will be expecting a PHY. + */ +bool phylink_expects_phy(struct phylink *pl) +{ + if (pl->cfg_link_an_mode == MLO_AN_FIXED || + (pl->cfg_link_an_mode == MLO_AN_INBAND && + phy_interface_mode_is_8023z(pl->link_config.interface))) + return false; + return true; +} +EXPORT_SYMBOL_GPL(phylink_expects_phy); + static void phylink_phy_change(struct phy_device *phydev, bool up) { struct phylink *pl = phydev->phylink; diff --git a/include/linux/phylink.h b/include/linux/phylink.h index c492c26202b5..637698ed5cb6 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -574,6 +574,7 @@ struct phylink *phylink_create(struct phylink_config *, struct fwnode_handle *, phy_interface_t iface, const struct phylink_mac_ops *mac_ops); void phylink_destroy(struct phylink *); +bool phylink_expects_phy(struct phylink *pl); int phylink_connect_phy(struct phylink *, struct phy_device *); int phylink_of_phy_connect(struct phylink *, struct device_node *, u32 flags); From patchwork Thu Mar 30 09:14:03 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: 76988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp995552vqo; Thu, 30 Mar 2023 02:32:30 -0700 (PDT) X-Google-Smtp-Source: AKy350ZDeIMgEIToOpbj9zA6rz9cxVYb4jeAtzNx13qvZOFOZkJF45/szH3Bu/4kkhd8PI1L4y5H X-Received: by 2002:a17:907:c788:b0:922:446b:105a with SMTP id tz8-20020a170907c78800b00922446b105amr6503570ejc.19.1680168750364; Thu, 30 Mar 2023 02:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680168750; cv=none; d=google.com; s=arc-20160816; b=wMuvNyWHvr6HkMpy26oQsKgmE8oxcDTlS0BV1FhbmCz4bRuqTG9XRrCuzd6GbV1ndG Cqa1Ze/T4lYoqZ4J8E8uyr0FwfpT6vnSSzawyXcQ+meQ4kaESyycP2N51yG0VO8xDWX3 mp9RqAy185/gQiW35MJFYFqSh5QXnOEtrGxKec2Nwn8Q4AcbVa3Er36hG6qA5n9rYyPC WbkRp2zAPjtrZtWK53xXE5m8/dj5raY/IyQ+u+pfOjOfyvKpqFu31Ie/mG8zNXgR6MTt PcgxCnGDyPjlNm84VZKbnFXsQVz6eomHazlFN9skV4gkzRetTSKtAnE3h9mdHVGvnHY6 YhkQ== 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=XhG+QY03aph/EtJ/DGwDMKQnpUE78yOrQ3THTyFaJjs=; b=yWH8A7oIePSbqm/zuAiMHPFrTJ37tliqIjnVez4c16KFqMoC9IxzDb5NYa9Tc2CH8E tdXD4UYWWXicHAiujkT9+sBKJ9Kj1MmGlG0ULsZ3U+EjoT3W8Q4/OdX35qKGx5KgMt5n iigkgrw5ykTezJieZTq4jIbqLE7hGfNHgZGQZIsz7v91++hVC22qUau/gywtQiqp3Nhh gIFVkkXDvcVbGTsonpMayNCA7FX2oJ6b3W2TapJmChbua1/M7xLh7J6CyTUFEYH8qGAh HGD3iyeNZ2O3AEVN+OjutlJ6Vi4s932Gd5DEIE1TruaK+AZgDpmN9519v2WJ3LxpRZqB NvfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JuIE2QXD; 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 y14-20020a170906914e00b0093331b35aaasi27152567ejw.813.2023.03.30.02.32.06; Thu, 30 Mar 2023 02:32:30 -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=JuIE2QXD; 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 S230060AbjC3JPW (ORCPT + 99 others); Thu, 30 Mar 2023 05:15:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229724AbjC3JPI (ORCPT ); Thu, 30 Mar 2023 05:15:08 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3CDF4680; Thu, 30 Mar 2023 02:15:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680167706; x=1711703706; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h7HA31Ype249VhePLWHGaLt81vSRMT92v7O/eTwjq3g=; b=JuIE2QXD6Wm59qjDoFr4Z+PiaJZo6vRF0R3ll/hnC7qjtAblu9wqfGOu 5Db5f+cQ6RTX//VmgtQ3zRcA+qfT8HItcxtxcaCHwAgaykKoua0QlhEHS hNWz3f4mUpi8UEzEKVThg/Kr3m0r0Kd+AGCWG35WuTYiG+LxP6dpxJFKM F/ivrGoD5iz018EHvYXSE3phkBNHasxl+4XC/k+LpFilr140MBEbHQVmM EzpjetgwQsZPtT3L6/Z8ZZVo8LM5YBLXHHAtMDRbHDXgVkkaj3W5qbs84 noCyGd3y9+mpAE+3slwgSG4XGkQexvrV7PVvMHZWd/XVIUcT93IribXpE w==; X-IronPort-AV: E=McAfee;i="6600,9927,10664"; a="325038889" X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208";a="325038889" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2023 02:15:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10664"; a="678125420" X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208";a="678125420" Received: from mike-ilbpg1.png.intel.com ([10.88.227.76]) by orsmga007.jf.intel.com with ESMTP; 30 Mar 2023 02:14:57 -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 Cc: Looi Hong Aun , Voon Weifeng , Lai Peter Jun Ann Subject: [PATCH net v5 2/3] net: stmmac: check if MAC needs to attach to a PHY Date: Thu, 30 Mar 2023 17:14:03 +0800 Message-Id: <20230330091404.3293431-3-michael.wei.hong.sit@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330091404.3293431-1-michael.wei.hong.sit@intel.com> References: <20230330091404.3293431-1-michael.wei.hong.sit@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761784627410199610?= X-GMAIL-MSGID: =?utf-8?q?1761784627410199610?= After the introduction of the fixed-link support, the MAC driver no longer attempt to scan for a PHY to attach to. This causes the non fixed-link setups to stop working. Using the phylink_expects_phy() to check and determine if the MAC should expect and attach a PHY. 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 --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 8f543c3ab5c5..41f0f3b74933 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1135,6 +1135,7 @@ static int stmmac_init_phy(struct net_device *dev) { struct stmmac_priv *priv = netdev_priv(dev); struct fwnode_handle *fwnode; + bool phy_needed; int ret; fwnode = of_fwnode_handle(priv->plat->phylink_node); @@ -1144,10 +1145,11 @@ static int stmmac_init_phy(struct net_device *dev) if (fwnode) ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0); + 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 || ret) { + if (!fwnode || phy_needed || ret) { int addr = priv->plat->phy_addr; struct phy_device *phydev; From patchwork Thu Mar 30 09:14:04 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: 76989 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp996132vqo; Thu, 30 Mar 2023 02:33:42 -0700 (PDT) X-Google-Smtp-Source: AKy350Ycgz/qH0J1RY4Lg9RvXnab/VcNocGaRinFivMhAlcndg4ad+q2doX/uVxsE7ctN0/5XmuG X-Received: by 2002:a17:907:7246:b0:944:43e:7983 with SMTP id ds6-20020a170907724600b00944043e7983mr18662795ejc.67.1680168822627; Thu, 30 Mar 2023 02:33:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680168822; cv=none; d=google.com; s=arc-20160816; b=Ufk9YjAMHoS/mp1YJ8bDOMD69NR9xeC5Z+iDDPq/Ua2WWmPbv5s1/IRBO/6Jednp+7 0e0YDD/H9xL1T3MbxKbDuLy3geOltomEIP2uxDQw0KrJ398FNxrdiNzP+cL+NrtcU2tx 1buJXaB1Ykq11GHc1JH5OzrC8xqCT3XgtRtHU/n98F62Hyg1d/h10IZCVXruw3PV36B7 W6PexX6uVtkOT/Gmb/G3XAhPc37xPq/JKy7MZf1p39yayWdwQeKSHSlk18Ws/UqjFpxg wRHUoeSq9Ts0i3q8AXRLm63p5Bsvob4nSWyRcw/5g6tiAkbkQLcNm0W5nxy++QiqHFq7 AyMQ== 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=1/mGgq4fRXIjvRf8lJ9GLRn1/VXZ9mfmqXxW/WMiFkI=; b=jBPhO039HafTKhxPnZeJKdlTi+DaGIc/WyupfI6pwMsJWlFYQxHLN9krWeAPIJEbAS p5V8bO98p3jTU/frf2pRlv9tmPJBLe9DmlKJuq8cu7OGDrN+dbPZqanLjkxmiA6YYjL/ R/1/IuhczLveUHhX0oPryWZ8xVrdBFjkqCyL3ELmGGcWuD+tRCsVXIKmAdnoBObR8AJm XfoabsOibRJyMR+W+UviAnLriJ54fS6r+tpfGXqBzgtpV6QQkSGijMfi9Bsq+zJCznuX cOHAgoU6pUMke2qb79W3i3ZBvIlhk+H29Pvj0XUg2oxFlvXseKGc/RKmAjxXAyooJfFL /c7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IpTEKYwG; 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 ke24-20020a17090798f800b008b178585afcsi32083720ejc.250.2023.03.30.02.33.18; Thu, 30 Mar 2023 02:33:42 -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=IpTEKYwG; 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 S230210AbjC3JPZ (ORCPT + 99 others); Thu, 30 Mar 2023 05:15:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229770AbjC3JPL (ORCPT ); Thu, 30 Mar 2023 05:15:11 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01D181725; Thu, 30 Mar 2023 02:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680167711; x=1711703711; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=huOgNrOBcSC1/tjpitYzPeEN/HeYkrzn2WanLt9fM1M=; b=IpTEKYwGsNCmDfvRJ4l+2fKVPpam/IbzdwD9tH+xoWfO11WzLcfoc0DK 3scx2rSn7TnxxYHaOrACjqBdBJMyksUccWfmx6fehFP5V0Rj9DdEVGtBr LeP1JNuPnAOxRPMWoo7QW2H3UIX/m1j42gd0/VGcK2whMEkDg1OjImL0D 6f1J13trAZeEIO1HH2/IDb1RcphzBkFrPq8hVbLLjbGxUrotCLw/ilGbk wuFqPxRvDa7rGavcqi1rjANQBXEEXvUXoLLMXHXsXlAkIx6yMQ88xvmaG oNEzth/eZtGQbYg3JqXSoao+Ip3hQDl1pNKVB+gc67uwSbXtIH6DPLQvx Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10664"; a="325038919" X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208";a="325038919" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2023 02:15:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10664"; a="678125447" X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208";a="678125447" Received: from mike-ilbpg1.png.intel.com ([10.88.227.76]) by orsmga007.jf.intel.com with ESMTP; 30 Mar 2023 02:15:04 -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 Cc: Looi Hong Aun , Voon Weifeng , Lai Peter Jun Ann Subject: [PATCH net v5 3/3] net: stmmac: remove redundant fixup to support fixed-link mode Date: Thu, 30 Mar 2023 17:14:04 +0800 Message-Id: <20230330091404.3293431-4-michael.wei.hong.sit@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330091404.3293431-1-michael.wei.hong.sit@intel.com> References: <20230330091404.3293431-1-michael.wei.hong.sit@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761784703263186413?= X-GMAIL-MSGID: =?utf-8?q?1761784703263186413?= Currently, intel_speed_mode_2500() will fix-up xpcs_an_inband to 1 if the underlying controller has a max speed of 1000Mbps. The value has been initialized and modified if it is a fixed-linked setup earlier. This patch removes the fix-up to allow for fixed-linked setup support. In stmmac_phy_setup(), ovr_an_inband is set based on the value of xpcs_an_inband. Which in turn will return an error in phylink_parse_mode() where MLO_AN_FIXED and ovr_an_inband are both set. Fixes: c82386310d95 ("stmmac: intel: prepare to support 1000BASE-X phy interface setting") Signed-off-by: Michael Sit Wei Hong --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 7deb1f817dac..6db87184bf75 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -251,7 +251,6 @@ static void intel_speed_mode_2500(struct net_device *ndev, void *intel_data) priv->plat->mdio_bus_data->xpcs_an_inband = false; } else { priv->plat->max_speed = 1000; - priv->plat->mdio_bus_data->xpcs_an_inband = true; } }