From patchwork Thu Sep 14 13:51:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13385470 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 9CE4CEEAA41 for ; Thu, 14 Sep 2023 13:52:32 +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=ypTlio+FfVqXaahkqGq4DKI0q4IxKd1sDpRvp8VY+jk=; b=y4prhU+yC2v0Di 8pBaCuaU6A2UVREEidUW9/+an3CLC/f/2C7ucW7MMmgZJP6wsDzLR1jlOAs/mduZKC9bDrIWbIK60 75KROHiPJ64hoNGNB2Mz6plZ9pl9g8N3RtH3WXPONjUXrS8entkDJ+i5q2PvNFNpPhf1K2ZJ1TGSe LnnnL86R+R7P6BlMQngB808FAC4YuH6N8Qfy87d9mVV1Ng4AQjWFYEN5OZe/v9FXoNWk4r/hEvrGA Ek35Gk58qJDJHiy4/fOylJuE6qpoQqwchr6cT0NgavMgy6EDFeNSq/K/rzwFz43oCOHGLE6GfxSJH kQUBFgnSRDKsNdEl6rnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qgmlF-008YGg-2Q; Thu, 14 Sep 2023 13:52:01 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qgmlC-008YEx-14 for linux-arm-kernel@lists.infradead.org; Thu, 14 Sep 2023 13:51:59 +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=MTFeBWXpqjY6Op3UJSYX2O9whn/P1P3QnzWrdNdnLB0=; b=cMI4UeIwU4a36nXtnqf6PAqI+Z J4dThbcCx7APHUiAfjfamrDlnihT6bCC382AcMw24/CBqIGI/bQu5d8TnqxslfOVZVVMwkR+hRwtN J/PaGM1L3bFcWamjAo2ULTi4cRvT8+fo6+8HiKym6rkLXkRwD09DsMRs+T2JFww5hFHiEVTx/HFd7 eWymRrA2Uv4AZzG6eU7/uKG9fttppWHh2qAKRSDeCLJt9xLda8ngByqBYQCd46UGA/7G53+ilHh2A ud2bRG7RY5E3EOuQGb/LapvhuRh0GqGWLwIdhLsbBc9Ffxz9ZnSVNZmOxSQERiTHIyr7WAfocIVD1 RULy6a8g==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:58052 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 1qgmku-0004Gj-34; Thu, 14 Sep 2023 14:51:41 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1qgmku-007Z4y-KM; Thu, 14 Sep 2023 14:51:40 +0100 In-Reply-To: References: From: "Russell King (Oracle)" To: Alexandre Torgue , Jose Abreu Cc: Alexei Starovoitov , bpf@vger.kernel.org, Daniel Borkmann , "David S. Miller" , Emil Renner Berthing , Eric Dumazet , Fabio Estevam , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin , netdev@vger.kernel.org, NXP Linux Team , Paolo Abeni , Pengutronix Kernel Team , Samin Guo , Sascha Hauer , Shawn Guo Subject: [PATCH net-next 5/6] net: stmmac: starfive: use stmmac_set_tx_clk_gmii() MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Thu, 14 Sep 2023 14:51:40 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230914_065158_367679_86DADE33 X-CRM114-Status: GOOD ( 10.27 ) 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 Use stmmac_set_tx_clk_gmii(). Signed-off-by: Russell King (Oracle) Reviewed-by: Serge Semin --- .../ethernet/stmicro/stmmac/dwmac-starfive.c | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c index 9289bb87c3e3..c2931464e977 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c @@ -27,29 +27,15 @@ struct starfive_dwmac { static void starfive_dwmac_fix_mac_speed(void *priv, unsigned int speed, unsigned int mode) { struct starfive_dwmac *dwmac = priv; - unsigned long rate; int err; - rate = clk_get_rate(dwmac->clk_tx); - - switch (speed) { - case SPEED_1000: - rate = 125000000; - break; - case SPEED_100: - rate = 25000000; - break; - case SPEED_10: - rate = 2500000; - break; - default: - dev_err(dwmac->dev, "invalid speed %u\n", speed); - break; - } - - err = clk_set_rate(dwmac->clk_tx, rate); - if (err) - dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate); + err = stmmac_set_tx_clk_gmii(dwmac->clk_tx, speed); + if (err == -ENOTSUPP) + dev_err(dwmac->dev, "invalid speed %uMbps\n", speed); + else if (err) + dev_err(dwmac->dev, + "failed to set tx rate for speed %uMbps: %pe\n", + speed, ERR_PTR(err)); } static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat)