From patchwork Fri Mar 24 08:16:56 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: 74429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp467439vqo; Fri, 24 Mar 2023 01:43:05 -0700 (PDT) X-Google-Smtp-Source: AKy350Ye+NHROCAnU/FaZzbNANVQoJltXbCzjMwWsDsDjWZasmWm8LTllWaO0Ubq4yjkVR9lOnsE X-Received: by 2002:aa7:9797:0:b0:628:650:4835 with SMTP id o23-20020aa79797000000b0062806504835mr2339196pfp.13.1679647385602; Fri, 24 Mar 2023 01:43:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679647385; cv=none; d=google.com; s=arc-20160816; b=xkk0XCEPKB14uNhnQ4N2bZLKjQK0WGlwpi2Ph2I0t0bE4n0VXgwj+KlPPiC09fS946 kvGPe7Lp+VDPUnfPoMn9gEBN4XMK2zRMV5UFGsJa5JHqnqyPGgpslQqiswEYjSbc/sJf 9BLoG8c0/dJ/5A7X7tPNTfiI4qZ2Wz58G3O5iMG7X5ZYphNiHH2FKaq1qyHRntwaLVKj GQ3Ii45T40S2hw5t85wk4HZOteBU4cvtOr+02qXMX9ld+tblBfG8Oxn3FWMk5cKA5OIV knB7Ruf8cWJjmMtDZYZQHDRpMg7WYTrmOs2+UBIPz43Vz9d10uc4kpl3kA4WWeg8OH8l nLQA== 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=RIXUamFTabsJ9GI0Keorr5vtGYZbNfdHxfqWmAQV6olvnXZ+KU1m9oIXCdgJpdOcGE tKKpHU89vjIWDaQQxFUGfRZQj66eDuPw73D3yyz2/o4m32BtdqONXI1hgsB4O6G3Z7wm k5ZgVs67xvqVVUkKFxe9y+0cCCsv3y8BaeObfvwcVZ0h1AMDImlG7T3sxgp4CCp/BVo7 CUNpXXanaLW4sb822rLiKuwDKT1g42pelUZqet4xWOOvJsVoER0+drTfBzpg8jnxriae Ny65A1j/NHGsXwxQHvQnjqpDgLSg0BhGdNMQVmL0iOn7XyXizfoSXUfbpoZpGgBrdeDh EUVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mwZ2mHOa; 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 w1-20020a056a0014c100b006236c3fed1esi21749030pfu.304.2023.03.24.01.42.52; Fri, 24 Mar 2023 01:43:05 -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=mwZ2mHOa; 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 S231681AbjCXISF (ORCPT + 99 others); Fri, 24 Mar 2023 04:18:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231438AbjCXIRx (ORCPT ); Fri, 24 Mar 2023 04:17:53 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 860C4252A9; Fri, 24 Mar 2023 01:17:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679645869; x=1711181869; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=huOgNrOBcSC1/tjpitYzPeEN/HeYkrzn2WanLt9fM1M=; b=mwZ2mHOajToQtBkqit/Zizuknis3rRMx+YWLAy23lNS91OqfNHVap31n 8osDZP4gSa/D+AHu1K2//gyy+N4x4eCNMEfa4pPs4tl9lEEZ6dGQzbwKw cfgkTqjxPdvYHe6ZB9ooAmk3ncWOxzgncicGE6b/pLpmu3YjxmdDKTHYV n7WFNv2iuZjfIwTIsBHEtmn3l6qVAwTaLuYr2oX086QQO0GLXqJHt8eqo AUFrf3DXUXHXnW1GDQfmp5Y4Q5e1uEYpyA9ag7hUWfc+xN9/9SVZ6IEbq qIgU11oytcOuXlOYqrxk0+2DgYDq7M00D06cvX2hcZkUWTtKaU/vYfbdT A==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="320116160" X-IronPort-AV: E=Sophos;i="5.98,287,1673942400"; d="scan'208";a="320116160" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2023 01:17:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="928574755" X-IronPort-AV: E=Sophos;i="5.98,287,1673942400"; d="scan'208";a="928574755" Received: from mike-ilbpg1.png.intel.com ([10.88.227.76]) by fmsmga006.fm.intel.com with ESMTP; 24 Mar 2023 01:17:45 -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 Cc: Looi Hong Aun , Voon Weifeng , Lai Peter Jun Ann Subject: [PATCH net v3 3/3] net: stmmac: remove redundant fixup to support fixed-link mode Date: Fri, 24 Mar 2023 16:16:56 +0800 Message-Id: <20230324081656.2969663-4-michael.wei.hong.sit@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324081656.2969663-1-michael.wei.hong.sit@intel.com> References: <20230324081656.2969663-1-michael.wei.hong.sit@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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?1761237936980525995?= X-GMAIL-MSGID: =?utf-8?q?1761237936980525995?= 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; } }