From patchwork Thu Mar 31 18:48:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 12797589 X-Patchwork-Delegate: kuba@kernel.org 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 9627CC433EF for ; Thu, 31 Mar 2022 18:48:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236944AbiCaSul (ORCPT ); Thu, 31 Mar 2022 14:50:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230521AbiCaSuj (ORCPT ); Thu, 31 Mar 2022 14:50:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92276F8979; Thu, 31 Mar 2022 11:48:51 -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 E83CCB821B1; Thu, 31 Mar 2022 18:48:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 542DDC34112; Thu, 31 Mar 2022 18:48:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648752528; bh=XLqUTEaZHUdBl3k9tG42qX5rR9y+92i0shW0PIO3bNA=; h=From:To:Cc:Subject:Date:From; b=lz5AeUro9ojkspRzwDWYcgYyL5epAIe8ar/6PvcYiTJY6w5ObVHrHOUAbh0BS81zB Y/Ymhrsz75svW/AHrqC1pTlXgHDTW2UgGhZXsPJQ7eVGGZHSwZ1LAoTABL+Bg2uaUZ bYo8wvmfczi8FOZCtXijm3VvKTxQugQsy8uXUY7XG8O8DNM6BsHHr9pbip9RwN/DUf e5zXBNuPVLY1E0hRiwZumzt0uepbdyWCeacCfbN/WtuVU077VOeP4oZ2e5NWlK+q5w N3yAAxwAgb8DqIIV0nhMnbSVyXlUi18/fu9+AaS9ax/9iIdemyyS4jaZw0YHiAgcgh tNuReexFNPEYA== Received: by wens.tw (Postfix, from userid 1000) id 56BC95FC12; Fri, 1 Apr 2022 02:48:45 +0800 (CST) From: Chen-Yu Tsai To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski , Paolo Abeni Cc: Chen-Yu Tsai , Srinivas Kandagatla , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Russell King Subject: [PATCH RESEND2] net: stmmac: Fix unset max_speed difference between DT and non-DT platforms Date: Fri, 1 Apr 2022 02:48:32 +0800 Message-Id: <20220331184832.16316-1-wens@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Chen-Yu Tsai In commit 9cbadf094d9d ("net: stmmac: support max-speed device tree property"), when DT platforms don't set "max-speed", max_speed is set to -1; for non-DT platforms, it stays the default 0. Prior to commit eeef2f6b9f6e ("net: stmmac: Start adding phylink support"), the check for a valid max_speed setting was to check if it was greater than zero. This commit got it right, but subsequent patches just checked for non-zero, which is incorrect for DT platforms. In commit 92c3807b9ac3 ("net: stmmac: convert to phylink_get_linkmodes()") the conversion switched completely to checking for non-zero value as a valid value, which caused 1000base-T to stop getting advertised by default. Instead of trying to fix all the checks, simply leave max_speed alone if DT property parsing fails. Fixes: 9cbadf094d9d ("net: stmmac: support max-speed device tree property") Fixes: 92c3807b9ac3 ("net: stmmac: convert to phylink_get_linkmodes()") Signed-off-by: Chen-Yu Tsai Acked-by: Russell King (Oracle) Reviewed-by: Srinivas Kandagatla --- Resend2: CC Srinivas at Linaro instead of ST. Collected Russell's ack. Resend: added Srinivas (author of first fixed commit) to CC list. This was first noticed on ROC-RK3399-PC, and also observed on ROC-RK3328-CC. The fix was tested on ROC-RK3328-CC and Libre Computer ALL-H5-ALL-CC. drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 5d29f336315b..11e1055e8260 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -431,8 +431,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) plat->phylink_node = np; /* Get max speed of operation from device tree */ - if (of_property_read_u32(np, "max-speed", &plat->max_speed)) - plat->max_speed = -1; + of_property_read_u32(np, "max-speed", &plat->max_speed); plat->bus_id = of_alias_get_id(np, "ethernet"); if (plat->bus_id < 0)