From nobody Sun Sep 14 22:55:28 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF0F8C6FA82 for ; Tue, 13 Sep 2022 14:34:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234040AbiIMOei (ORCPT ); Tue, 13 Sep 2022 10:34:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233975AbiIMOdJ (ORCPT ); Tue, 13 Sep 2022 10:33:09 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8CB5273C; Tue, 13 Sep 2022 07:19:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 57483B80EFC; Tue, 13 Sep 2022 14:19:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4FBDC433C1; Tue, 13 Sep 2022 14:19:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663078770; bh=QZkttdey2IZbuHhI/iymCpT7oKPDrJqvupu9s4uBL/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pqObLCWfAUUQKoDdPqid9Vj1PA+QLitBEo17x88f3+AGX3EoVt8L6U0BnyxrizqQy 0xBYd13yc87kiIWYkK29xTMuI5t1zwJC6ukjyj8Qc9AgMMlFT5CmamzMiY61vkAJ1R 9B1RlnOpX2hhd9jHvpKb7cGSYYtwzS6MvZdR0XG4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heiner Kallweit , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 076/121] Revert "net: phy: meson-gxl: improve link-up behavior" Date: Tue, 13 Sep 2022 16:04:27 +0200 Message-Id: <20220913140400.639455902@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140357.323297659@linuxfoundation.org> References: <20220913140357.323297659@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Heiner Kallweit [ Upstream commit 7fdc77665f3d45c9da7c6edd4beadee9790f43aa ] This reverts commit 2c87c6f9fbddc5b84d67b2fa3f432fcac6d99d93. Meanwhile it turned out that the following commit is the proper workaround for the issue that 2c87c6f9fbdd tries to address. a3a57bf07de2 ("net: stmmac: work around sporadic tx issue on link-up") It's nor clear why the to be reverted commit helped for one user, for others it didn't make a difference. Fixes: 2c87c6f9fbdd ("net: phy: meson-gxl: improve link-up behavior") Signed-off-by: Heiner Kallweit Link: https://lore.kernel.org/r/8deeeddc-6b71-129b-1918-495a12dc11e3@gmail.= com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/phy/meson-gxl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 73f7962a37d33..c49062ad72c6c 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -243,13 +243,7 @@ static irqreturn_t meson_gxl_handle_interrupt(struct p= hy_device *phydev) irq_status =3D=3D INTSRC_ENERGY_DETECT) return IRQ_HANDLED; =20 - /* Give PHY some time before MAC starts sending data. This works - * around an issue where network doesn't come up properly. - */ - if (!(irq_status & INTSRC_LINK_DOWN)) - phy_queue_state_machine(phydev, msecs_to_jiffies(100)); - else - phy_trigger_machine(phydev); + phy_trigger_machine(phydev); =20 return IRQ_HANDLED; } --=20 2.35.1