From patchwork Thu Feb 27 14:37:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13995067 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 B3B1BC197BF for ; Thu, 27 Feb 2025 19:37:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Date: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-Owner; bh=V4xItPbtlJ5lsuoyRDac1DDkraw/yUeUUl9JhlRmrgI=; b=L8Rywy7T6Rm27KGg6g0DlEUNJ4 W9Jky2vJJJ2wgQ0SuSINnMgP6HVJhsEw+5upAbiAkcpzFqXojSc2uA1ZDHEccCgy4Cr2uvZTunc+6 93Oykl7fNmXvd5mHLd/MrmxrBCHNyYSm+fPrd8KI920/N8lzm6tm5WGJFCAJ4jZND/+6yvYMz4u+/ bhtlAaJDuLHpzVrdft2AZxC9s6JsfN13H77t1KKT5tBhxs8422Xnt50uw7nXOcL2sYMxHWj7qsy5f LCSQRiwZhE2M0CytdzN3gICgnsm1fkJJap2qoYVmMsRHIQgC3LahlvQPvzJBcZ/3QjxWuLLVGwxr2 dWescTLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tnjh1-00000008Tdz-0UPZ; Thu, 27 Feb 2025 19:37:11 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tnf1t-00000007lgo-3kNu for linux-arm-kernel@bombadil.infradead.org; Thu, 27 Feb 2025 14:38:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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; bh=V4xItPbtlJ5lsuoyRDac1DDkraw/yUeUUl9JhlRmrgI=; b=EC/0fuTDjPtwwutyLsDikiaHV0 DYBdYWkHwhuiv2fZKAanwJSCYO7eC9B6VWfGy6639b9Kcx1vGW6UyStV8CzpD9QEOeBmSmO6J/xwy 0enOyH7Vj7UA4mE2qZEaoIKJsZxmP0lO3ztZE/iqpgrIGbdxk8YYCZZZNJYQFvm9FgLpeNJYtMxcF BG4NOsNxmRl0W82qBZ25SgJ7SzE45GiqVTtPUXBLRg6bjobPDs8RFEWh+Erd7627Zk6HIDcLU8Ijj eNvJ/r6djvfjlOLlwttWVEZKgWAMawtYa+atPokEXxWqTJyXDcvdCxwsa+UA3V9SdWmzVMuU3gJWM 7t4XBUFQ==; Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tnf1r-00000003oRv-0UIr for linux-arm-kernel@lists.infradead.org; Thu, 27 Feb 2025 14:38:24 +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=V4xItPbtlJ5lsuoyRDac1DDkraw/yUeUUl9JhlRmrgI=; b=x0HUPSHXQRzD5834rCGUklnfSa VbkJ7FDJAGW9Kx08gSeKw2RZ3xhHd8AboKDkYmvt0q5GyAYWdoTGYSa/EP2mtXgNsoA5oNlOq4KG0 qwMAS5JjJhdsw0c/9sXSmzbPhQsmNbbFUku9tVjpZU86LxQ1rbSMSpw2I4NL2p81cMX0muNBM6vUX 9BT5RwN+dAhjzaKkCpDQOx58FnZU2CBj6pw3rIhz2ffTZX3Kv/Y4FrJCfrQl8iB5RBBLaZ2OYYH+9 4cbJrq9Naar2NfYY+RcNku5HAWBUdJmk6mDQiWjA9kwMByLnXeOqShv5C+jHS5KaD58ckUEQfjNCS mYKlsmqw==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:40472 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 1tnf1m-0007Qe-19; Thu, 27 Feb 2025 14:38:18 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1tnf1S-0056LC-6H; Thu, 27 Feb 2025 14:37:58 +0000 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn , Heiner Kallweit Cc: Alexandre Torgue , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jon Hunter , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, Paolo Abeni , Thierry Reding Subject: [PATCH RFC net-next 3/5] net: stmmac: simplify phylink_suspend() and phylink_resume() calls MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Thu, 27 Feb 2025 14:37:58 +0000 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250227_143823_306074_F324F9F0 X-CRM114-Status: GOOD ( 10.01 ) 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 Currently, the calls to phylink's suspend and resume functions are inside overly complex tests, and boil down to: if (device_may_wakeup(priv->device) && priv->plat->pmt) { call phylink } else { call phylink and if (device_may_wakeup(priv->device)) do something else } This results in phylink always being called, possibly with differing arguments for phylink_suspend(). Simplify this code, noting that each site is slightly different due to the order in which phylink is called and the "something else". Signed-off-by: Russell King (Oracle) Reviewed-by: Andrew Lunn --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index aec230353ac4..fbcba6c71f12 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -7831,13 +7831,11 @@ int stmmac_suspend(struct device *dev) mutex_unlock(&priv->lock); rtnl_lock(); - if (device_may_wakeup(priv->device) && priv->plat->pmt) { - phylink_suspend(priv->phylink, true); - } else { - if (device_may_wakeup(priv->device)) - phylink_speed_down(priv->phylink, false); - phylink_suspend(priv->phylink, false); - } + if (device_may_wakeup(priv->device) && !priv->plat->pmt) + phylink_speed_down(priv->phylink, false); + + phylink_suspend(priv->phylink, + device_may_wakeup(priv->device) && priv->plat->pmt); rtnl_unlock(); if (stmmac_fpe_supported(priv)) @@ -7927,13 +7925,9 @@ int stmmac_resume(struct device *dev) } rtnl_lock(); - if (device_may_wakeup(priv->device) && priv->plat->pmt) { - phylink_resume(priv->phylink); - } else { - phylink_resume(priv->phylink); - if (device_may_wakeup(priv->device)) - phylink_speed_up(priv->phylink); - } + phylink_resume(priv->phylink); + if (device_may_wakeup(priv->device) && !priv->plat->pmt) + phylink_speed_up(priv->phylink); rtnl_unlock(); rtnl_lock();