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; } }