Received: by 2002:a05:7412:3290:b0:fa:6e18:a558 with SMTP id ev16csp808345rdb; Fri, 26 Jan 2024 11:14:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IHedJUu2UICnDOIeQ8328REP1V95OhzwnCVtxAveZXgq9SJpBJc3TVwutzDxxElZNWABXtZ X-Received: by 2002:a17:90a:8c7:b0:28e:afc5:73b8 with SMTP id 7-20020a17090a08c700b0028eafc573b8mr333774pjn.68.1706296456542; Fri, 26 Jan 2024 11:14:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706296456; cv=pass; d=google.com; s=arc-20160816; b=TEjkTf5k0BKUjavLADvbMQsiCdl3Xq0F4TSFKrCBeSeiOLO8e/i4f3+hhs6hDAdDps PBhT9qTGdkP9savbHJcyQK74RDIQRBB7JqBv92hnksTlL38aKYpJHu7o1vN6XGiR5VCf Oh75j7ywfetXwkyQ+AfAsDi2AQrWMmu5k8SFKN80E2xg15a79jql70SArOAShx3+DnXm B9i61xj7YjvXfjN/ppJor2AKla7fsCnokKwFaRwDt2cXfQ0JJ2sdManC/eKktNkGgiQo gYkOBVtbJHlRj2BtLwpufZO4la9t6DBwMoXKufe/UR3Onp8scz9ULJ1D+L+cD2ESKUJL sj4g== 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=LnyRRp+6H2vXrYtZYfiOjRQgB/x4BMu3sCC8IPbDATyAYCktY4SuJMmZBQLMBuZWqE f6PjVzvOX5Gx/J9yEtNCsS5dP3T0Jc1OhThxitcyseKVnekPxwD3UZLOsmVmeEAYuYM4 UD5SyuYrmhRAL+VJqsRF2SBUTH2wM08+Kp+czNC36Tg4RP5DyWtVb5vIbE3kkPypzAmY R0o5RzdYlqImVIDX1kGfVnV4isWLfGaQrsgONZmQ7mTIORVfnRZJnhA9qeMIOqigr3xw GYbiZ2DGctvMZJtqMCW5NVbb/2URm9LmzqezXtzwGRspcL5Ez3z8+joo++8gc1FwVI2H d7ww== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=apl6MWSi; 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-40550-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-40550-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id sr11-20020a17090b4e8b00b0029045145b93si1599477pjb.40.2024.01.26.11.14.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 11:14:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-40550-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=apl6MWSi; 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-40550-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-40550-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 2C939285FC0 for ; Fri, 26 Jan 2024 19:14:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5543322F19; Fri, 26 Jan 2024 19:13:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="apl6MWSi" 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 5B1FB225CF; Fri, 26 Jan 2024 19:13:25 +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=1706296407; cv=none; b=UY8jb12Vc6gstWXiUBsuxVF/szsKjo2+igMKb9Bhx5i4cyNRanX30xLkBfVXi2ZSmHbFyV4hRlKB/30gX+EH2dC94FVpR4XCB1quUHnM6AlL0+ndhWsS/tzyoYDXT7ZE5MDtoWSwAYZdpaP5biOGyp84KFKmzK6ru0lDUDtREGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706296407; c=relaxed/simple; bh=WQe4wDwRNT0S65UeCvFunjCWa8R+Rf3G+Co3wYKG0EU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eUzIzSpXWEXnO7sAhGYhY5GmGFtnmDi7qNeOUi6wAAX85WCFo+ynO2Q+od3J6ykzsoZbb96iTZgU8CSnqpP2pckTBKrTdVBMLUAwTgEhnV6Onc3zZLYhJdObEJ7AvS9IFr8qXdOhPkY+37oeHdCLuR9PQgSYBpJ+sKsvDD15T68= 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=apl6MWSi; 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=1706296403; bh=WQe4wDwRNT0S65UeCvFunjCWa8R+Rf3G+Co3wYKG0EU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=apl6MWSi1VseoqQT1RQLbEFcA2AO7SynigxLKgFfP70pKA/38d3WHqbU1lgkb9HJx hZHVcd5cf29ZpsqWNacchol/KkRuc2ceQ/MbXIFQ1DF/Jv+vHbD+MZammIb/iqa1ov jUEzbiFqnqWGNMGsCpbGnijJ4EblMWH65owpKGKaGn5MXKjJGjo61mU+kvqd/VQNnG oXigXZqmZlHrqk18enh5yGEOv+S9DJr/BIxJ+VQhoTdUPwshw3wDLQFjoyhys4V7v7 K2ExBksFBY5+3v3qqMAmqOxqb+zl+3v1ZjbeQ00a44sHR8hZnpDXj4JTgQyewgDn7G uiYsSV9iumIDw== 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 6F19B3782076; Fri, 26 Jan 2024 19:13:23 +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: [PATCH v4 2/2] net: stmmac: dwmac-starfive: Add support for JH7100 SoC Date: Fri, 26 Jan 2024 21:13:17 +0200 Message-ID: <20240126191319.1209821-3-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240126191319.1209821-1-cristian.ciocaltea@collabora.com> References: <20240126191319.1209821-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