From patchwork Wed May 29 13:29:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13678843 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F2054C25B75 for ; Wed, 29 May 2024 13:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Date:Message-Id:MIME-Version:Subject:Cc :To:From:References:In-Reply-To:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Yq4+ESP/nOJpnkb15cIiuUGuGVegOLA5PDCbIC2WOhI=; b=gGuY/DKGv5tWWO mRRCfLCpMhLQ5YKroUdVBN6JmnXp//KYYRTLH4taUty6zlwo510mNPNd1IvDZJI9BhXOh2M1Biakm kuSPaCVbVlxZxQSaZJJo5qYiM5MD2qLFQg8lKz7InTTUuZeyfAmQNyQxmYqtSvEAibGp07xztR2i2 uNt6PdAORFCwNdvb2wiJZJzlOrZaH3E8vJnyP0yOP24PrN4Che9F82uW51qSY5dUG1rtYO/3sWmkS HVvjG96e9FkvIoxnfyJ/BDj26WtjxALGLqWEp/btzE3Invj/D/VX/ymiIVJvUFW5fUoh82i437Yr2 Y6HHuR911H5siv76DH5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sCJNT-00000004GPl-2XaZ; Wed, 29 May 2024 13:30:03 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sCJNN-00000004GLo-2fdk for linux-arm-kernel@lists.infradead.org; Wed, 29 May 2024 13:29:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jrnjzB7F3wcMn320kdy6SKYULM0j5Eqx/IjuBbSJc84=; b=ogYkuNg2+g9hKjYtcmQKKp04S6 sAtKeuWv++oaMXKeKURi9geL9JBaLw52BoAs6YJIeD1r1+bkgchYCwsz1Zj2iYMWePBhbt131BIZN Y16+kbLwQ60AHOaaqi/IzM+80aw6eWGjFgFxwSZnIbUlAx1TNrYUfBm3fZXmCLF1XJPaAM+5HjXio k1lfyrqThJOtc6cipODgtNThHZeGQubcLSy3KQ8KXej4x1culHBRlLCl0cgFK1PY5gcIvlcTa6Pp8 Mrb6dQs2sjhDTSSmnkfvGtDjU4OgrzXVtLzcBcTXIdyvyYI3firRPwrPTZZhFiAo7B+IqU/moRK5E ARpa+KIg==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:44828 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sCJN8-0006B4-23; Wed, 29 May 2024 14:29:42 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1sCJNB-00EcrJ-7L; Wed, 29 May 2024 14:29:45 +0100 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn , Heiner Kallweit Cc: Andrew Halaney , Serge Semin , Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH net-next 6/6] net: stmmac: dwmac-intel: remove checking for fixed link MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Wed, 29 May 2024 14:29:45 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240529_062957_749302_E383078D X-CRM114-Status: GOOD ( 10.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org With the new default_an_inband functionality in phylink, there is no need to check for a fixed link when this flag is set, since a fixed link will now override default_an_inband. Signed-off-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 5e96146b8bd9..56649edb18cd 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -589,17 +589,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, plat->mdio_bus_data->default_an_inband = true; } - /* For fixed-link setup, we clear default_an_inband */ - if (fwnode) { - struct fwnode_handle *fixed_node; - - fixed_node = fwnode_get_named_child_node(fwnode, "fixed-link"); - if (fixed_node) - plat->mdio_bus_data->default_an_inband = false; - - fwnode_handle_put(fixed_node); - } - /* Ensure mdio bus scan skips intel serdes and pcs-xpcs */ plat->mdio_bus_data->phy_mask = 1 << INTEL_MGBE_ADHOC_ADDR; plat->mdio_bus_data->phy_mask |= 1 << INTEL_MGBE_XPCS_ADDR;