Received: by 2002:a05:7412:3290:b0:fa:6e18:a558 with SMTP id ev16csp812722rdb; Fri, 26 Jan 2024 11:22:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsxA+OUMXET/2zquJol4HGRl/LDoKcx1evxzrT3NVIxREELg+R/peTyixvJtU0TVkglG2t X-Received: by 2002:a05:6a20:993:b0:19c:768b:b77a with SMTP id e19-20020a056a20099300b0019c768bb77amr192486pzb.113.1706296957960; Fri, 26 Jan 2024 11:22:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706296957; cv=pass; d=google.com; s=arc-20160816; b=BOmcnzblTNAvYKYpqsY41mOzoctjZTPNRyJAeimJ2mUqgEmpdsdv9qAxDb4a5l3dpN xL0JlsZtyYKpyPQN0xncPWK+BrVppj1IcEtdTXVzXDR50Vki9RWvrVRFkB/6pWlXsd0a BBbCQrXlwfQ5TrVRsUrOWrunBy26AFpVHh1gbd7F6DyA0edLW1Xyl1t4A7icjSKj/Z/Y i+HugB/e3EA6NuQO+zeosX9a/cQzb25bAN0eQHIPjk8nBN9EWbNM8gr4C5r06nfthwfb oGLHZQZS//gzfV1IACrpcVXwkrOuO1XY/b2/00mEBXxZ593xRS3T7DrA4DUgycRsAYA9 MgiQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=tP94JFGnNGVzkfua2HUoQF7pVy6Z+v52dOnLwF8BgV8=; fh=jt4kI4Vu5tCIY3A2hw4vDrnEPzHtzIjUkzTz9t0INgU=; b=HcX2uofgnknRY30Y9PfYm/qc0QB6wfrn1AMKFoaw14sWzYrczGM33hEpUYDZGvgADo wRDgRA/IYxV40GsaUw/RdMK2qM4JupyBta9eGUfENNPr+kra0BjFJSRsIZ3X6GJQG+8a wTy6MBJ3rni0VTqWR3vuqKoRDzWWTljG3VUVdl/1lAmGf4xhaeFfPxh+2G9EridRCcUa /h8iZ3BkUYv52sjbnxgRIMtT71avRHqI1iMmVpIfTASivZXHHHb3QHZgZ4OvTuYo4FLe FpeuD6c/oy0WpYwKItT2wukqTnAq+FPsAGLQnHz5Mus0PabaNyWi6uHJote9bU3n1oMb 2CeQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=311GBVSb; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-40557-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-40557-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id u185-20020a6385c2000000b005d4fdff9a2csi1551173pgd.328.2024.01.26.11.22.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 11:22:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-40557-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=311GBVSb; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-40557-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-40557-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 462A1B24045 for ; Fri, 26 Jan 2024 19:22:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E2C7522EFA; Fri, 26 Jan 2024 19:21:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="311GBVSb" Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 552BA224DA; Fri, 26 Jan 2024 19:21:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706296908; cv=none; b=cjjfBjla/0ObozzBi5UD0zfxGfeFUBhKrjuyJT3Z9TgZOQqa7aKEv58Eoi9kSICZsDyzyPrPxksKRrJuFF66qbdQ3ZDGVeUzYDGeBNB90BbEBFhU+qCgQ8yAvCSdHNYzICUqQbIbSmOofsVcbDr5YhWEN6HeS3h3DGgzNrzDUO8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706296908; c=relaxed/simple; bh=WQe4wDwRNT0S65UeCvFunjCWa8R+Rf3G+Co3wYKG0EU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iC6iO+/qRARoeFINBplHpnKMrdu0nWu8eDeTn2zXxrLpeEPeBgIWeRSEpPjToPjO7/kccfCiEIJMo6dRYb4cNzp8BkEx3EUVYsUyTPkg5NeoagVBGhU56MsXFT2DF1Win9OKODs40//paO76ayNGVjtNq03GAsC6Zwu3e/KtVwg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=311GBVSb; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1706296904; bh=WQe4wDwRNT0S65UeCvFunjCWa8R+Rf3G+Co3wYKG0EU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=311GBVSbo+T/wQRgYiIOl2xibolvW59jtWlTeVmFrUjMgYHTFocqch27G1J3v/DlH /0RD52FART9t1NnW19GVOIIeDmbQbGgeJpmK3Gu247GkkG8uoEnLG4J7BOqzcXZeSl gT4jwaZ9Hmhfur2gDBYxbu2Tl+K7tAOTH2GFDcS0Mz2FDTwjy6jbwYCuU+WAnimCES NAfMKZQ3HDa8fz6pzGtKXwlUq/dyZoOXy6Mk79Uq5bd6iIyhUQ9UqCBHY7O7kTURM5 1En/bi8h4U4mh6h0XYpM3XgORY5pP9ni9xqcfRRBgZ7f/scgdSJPORyPBxaYk4BzkB T4JylAtLd2qfg== Received: from localhost (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 73EB73782076; Fri, 26 Jan 2024 19:21:44 +0000 (UTC) From: Cristian Ciocaltea To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Emil Renner Berthing , Samin Guo , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Giuseppe Cavallaro , Andrew Lunn , Jacob Keller Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, kernel@collabora.com Subject: [RESEND PATCH v4 2/2] net: stmmac: dwmac-starfive: Add support for JH7100 SoC Date: Fri, 26 Jan 2024 21:21:26 +0200 Message-ID: <20240126192128.1210579-3-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240126192128.1210579-1-cristian.ciocaltea@collabora.com> References: <20240126192128.1210579-1-cristian.ciocaltea@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add a missing quirk to enable support for the StarFive JH7100 SoC. Additionally, for greater flexibility in operation, allow using the rgmii-rxid and rgmii-txid phy modes. Co-developed-by: Emil Renner Berthing Signed-off-by: Emil Renner Berthing Signed-off-by: Cristian Ciocaltea Reviewed-by: Jacob Keller Reviewed-by: Andrew Lunn --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 6 ++-- .../ethernet/stmicro/stmmac/dwmac-starfive.c | 32 ++++++++++++++++--- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig index 85dcda51df05..4ec61f1ee71a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -165,9 +165,9 @@ config DWMAC_STARFIVE help Support for ethernet controllers on StarFive RISC-V SoCs - This selects the StarFive platform specific glue layer support for - the stmmac device driver. This driver is used for StarFive JH7110 - ethernet controller. + This selects the StarFive platform specific glue layer support + for the stmmac device driver. This driver is used for the + StarFive JH7100 and JH7110 ethernet controllers. config DWMAC_STI tristate "STi GMAC support" diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c index 5d630affb4d1..4e1076faee0c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c @@ -15,13 +15,20 @@ #include "stmmac_platform.h" -#define STARFIVE_DWMAC_PHY_INFT_RGMII 0x1 -#define STARFIVE_DWMAC_PHY_INFT_RMII 0x4 -#define STARFIVE_DWMAC_PHY_INFT_FIELD 0x7U +#define STARFIVE_DWMAC_PHY_INFT_RGMII 0x1 +#define STARFIVE_DWMAC_PHY_INFT_RMII 0x4 +#define STARFIVE_DWMAC_PHY_INFT_FIELD 0x7U + +#define JH7100_SYSMAIN_REGISTER49_DLYCHAIN 0xc8 + +struct starfive_dwmac_data { + unsigned int gtxclk_dlychain; +}; struct starfive_dwmac { struct device *dev; struct clk *clk_tx; + const struct starfive_dwmac_data *data; }; static void starfive_dwmac_fix_mac_speed(void *priv, unsigned int speed, unsigned int mode) @@ -67,6 +74,8 @@ static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat) case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_TXID: mode = STARFIVE_DWMAC_PHY_INFT_RGMII; break; @@ -89,6 +98,14 @@ static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat) if (err) return dev_err_probe(dwmac->dev, err, "error setting phy mode\n"); + if (dwmac->data) { + err = regmap_write(regmap, JH7100_SYSMAIN_REGISTER49_DLYCHAIN, + dwmac->data->gtxclk_dlychain); + if (err) + return dev_err_probe(dwmac->dev, err, + "error selecting gtxclk delay chain\n"); + } + return 0; } @@ -114,6 +131,8 @@ static int starfive_dwmac_probe(struct platform_device *pdev) if (!dwmac) return -ENOMEM; + dwmac->data = device_get_match_data(&pdev->dev); + dwmac->clk_tx = devm_clk_get_enabled(&pdev->dev, "tx"); if (IS_ERR(dwmac->clk_tx)) return dev_err_probe(&pdev->dev, PTR_ERR(dwmac->clk_tx), @@ -144,8 +163,13 @@ static int starfive_dwmac_probe(struct platform_device *pdev) return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); } +static const struct starfive_dwmac_data jh7100_data = { + .gtxclk_dlychain = 4, +}; + static const struct of_device_id starfive_dwmac_match[] = { - { .compatible = "starfive,jh7110-dwmac" }, + { .compatible = "starfive,jh7100-dwmac", .data = &jh7100_data }, + { .compatible = "starfive,jh7110-dwmac" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, starfive_dwmac_match); -- 2.43.0