From patchwork Sun Aug 4 20:49:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Petrous X-Patchwork-Id: 13752711 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 E494CC3DA64 for ; Sun, 4 Aug 2024 20:50:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version: Content-Transfer-Encoding:Content-Type:Message-ID:Date:Subject:CC:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=PEVTv0FWlk8JDzY0sd7BIrVpqlx3+DsdjiPVsgRhvLY=; b=oC1utJz0LOJHe7gASpY9d/qvnt I5gDzI4Qa66NrsY6lBWSL/NsHSylorabZoUEyJUNexkE1wTnqIBUxdjV/I+WquCCV+8ol1zss1pnt dO3R/KIyvH5SvVljj3MWmmScZFCQUVaWHbpgGRLHZBqx7ZxG+PkcvD/L2cJykrYWTGtbB5EOuBz16 kvUDZEZE+auoka7fPD6oxNMYB3aiBrqdPdAXzpUohgjwQSZ1wRBwo6rszo1OEO8wz1kcTUSD+16Lm gxeocUPqbOpmpoY3R17af7Pj0zQLyo6HtjZet2PKoIByhb1AYw1s9DZtOpaOBTfMyuMC1WmCByMjp 7K21bfNw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1saiBA-0000000DtdC-0Aqd; Sun, 04 Aug 2024 20:50:12 +0000 Received: from mail-westeuropeazlp170100000.outbound.protection.outlook.com ([2a01:111:f403:c201::] helo=AM0PR83CU005.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1saiAd-0000000DtUm-3mxH for linux-arm-kernel@lists.infradead.org; Sun, 04 Aug 2024 20:49:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GwXIkNCKwXQh6mgc72/SwAe7lcYKFuJ7p978+Qx8WSZTqZjLvle17OCoP3BCk//YLQS09hccnMhTojvYB+KigDGtTpivxQDinmK7PDwJc3QDns6fP/LdOcxS2HF5/n8JQYYoE9sjJQCLJ5rF90ZLz/OTZb/UidjpQ19BxdMI7xDFyvpatsfEpCdq1f5PIPgodfEMEbgQA5O1GHqocQFEgKRiDoKmI9NUukrDIduSP6BYpKO+ZgonBaLszS8smvTov8GU61UUPOVY7Zc97aFCGmDzY9UPSVfvqO/YyD0d02GP9ab74Trg9HXmSeZJv4mnjmoo6Qqwk5scSaKIjKQSDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PEVTv0FWlk8JDzY0sd7BIrVpqlx3+DsdjiPVsgRhvLY=; b=HCiiIybldg8x9U9ZertvqjXvwM6IytRTXqGWL5MepibbU0MeMDyll8Ak8V4b/odme+5YLOr3HaLpprai4l6YxdcIfEqy5KAuWB24CmdN8AD7n3JGzRpEOdEzZIflDczYtqJSnDK0P34RPp9j+fZWv91jIGdXS75/3FmffiKTvvGi781mTRB1CE0L/ZWVE3ueAkNACgZsmmAKrLAc5ODwwh531gMU46AhjEMNX/bj6dY3LuL5bH4qXer+VTIiqmHFlVx3cMnBIEKPwtK7I6StS0SfMkyObcIEeMzxs2I+1puf+hfhOiIfP3DiD/ueg3D4mR5qYAayseQg4h3LVmdagg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PEVTv0FWlk8JDzY0sd7BIrVpqlx3+DsdjiPVsgRhvLY=; b=sF8WQm0LyX7eOnkY+XgMaavsWxwyozQ9+ivGipunsaZI55QmVva51843X6IPiiE0wKnXJL1Bxb824EYTXNDrB9IgF2I4kjtbWTb5VsHjk1QjGDwXUNCCT+seskAv3ZqGxy6dbwzQMcCenhKS4K9wZBYPbAqdELeR4HjwJwL8jpYs9kg/InkozOVGRqop8GYBL8MtkZG7XH9rInXQw+6Q4zTu9YJT4R3lBtiYLmY979Eks5Hsjq8/oEYr+trkM2k1RV4JBa2kuAkBWgghLJezd2WJTX3yWAZKG25aYhsUfjrkzxrRtoTPKiWJHYede97gFljG2oUyScUL4csSQLw5Rg== Received: from AM9PR04MB8506.eurprd04.prod.outlook.com (2603:10a6:20b:431::16) by PA4PR04MB7965.eurprd04.prod.outlook.com (2603:10a6:102:c9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.25; Sun, 4 Aug 2024 20:49:35 +0000 Received: from AM9PR04MB8506.eurprd04.prod.outlook.com ([fe80::5f7:9bab:66a3:fe27]) by AM9PR04MB8506.eurprd04.prod.outlook.com ([fe80::5f7:9bab:66a3:fe27%4]) with mapi id 15.20.7828.024; Sun, 4 Aug 2024 20:49:35 +0000 From: "Jan Petrous (OSS)" To: Maxime Coquelin , Alexandre Torgue CC: dl-S32 , "linux-kernel@vger.kernel.org" , "linux-stm32@st-md-mailman.stormreply.com" , "linux-arm-kernel@lists.infradead.org" , Claudiu Manoil , "netdev@vger.kernel.org" Subject: [PATCH 1/6] net: driver: stmmac: extend CSR calc support Thread-Topic: [PATCH 1/6] net: driver: stmmac: extend CSR calc support Thread-Index: AdrmqCAbIYfhhpSjQm+gwLO5S8kGvw== Date: Sun, 4 Aug 2024 20:49:35 +0000 Message-ID: Accept-Language: cs-CZ, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AM9PR04MB8506:EE_|PA4PR04MB7965:EE_ x-ms-office365-filtering-correlation-id: 11c2bb2b-6ac5-4009-f34f-08dcb4c6f2e3 x-ms-exchange-sharedmailbox-routingagent-processed: True x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|1800799024|38070700018; x-microsoft-antispam-message-info: 8PdM7t14UC7m6kvj8gewQKYr1uGwziconZg3kMAjOPD9psoFqv3yLllHQ5UMIcQQH0G34a0AY1bzzhMo/hX4lxUdU0uMwYPL8ueg6gHG1VePyvautTfO0022H8AxYkIPupQDtLQ3qttTWPz9PGBLeK1UIpgvUQX2Bx55e4DAvsRodAae6ARiXfca6mYMor/xsPVkRp3HGHkYi3WBeLQNizq6Xe5Cv6GwL46VSijyb0jxH7O63ZY8Jo7L5tNHtiCIfzyllSNmW+GnJsD7Eir5hNsG47yPB1u8CiNKKz9m/ThspEdZ8ajeKJ57Kd7vsG9eg4Vdi6clvboMCQ0fb53LPtZtGBBjEi9bsRw+3fqTtZ2V1fUDgVekMB9Y/vMmpnEYvnknac9Lmo1H2gKzugqD6ke7TQ3JuhxE29SR83k+GHZT4HWWQipmZwIEJh5MfTVM/HuXS97N4NB4YpWE8AQMMfy86FYosNQSvBMp+2sgxeDQ6o8PIk4Hof/2ackDh6m9jQEJmXqkDuQqJeUMgC//qxBko/xOlcJc/K0cBZe4u3nfPnaXWnVnBpVMZt/qWMjrMHQj33t70U0qD8Z337qGuX/J34LAPj/5CVvJtCSWcGYozw0Px0r9Cv8O0kmarRhhIy4DGWJPBz7k6vhrmagUwviy6ZmywJl5WgdOcWvJQeJRfd9MJA5WjWKNPEc+ik4ay69vGXmJgJszyCB+wVDoT+sf9TBhni08XN4Y4GZOAJ7+YDtm2pvAekvXr0oxG8tpD3m15Ac8U4JAhgsETlyjxiP4uUPad7FT4AI2zmHfa7fUuTnUGYKMEG7UVn/gDYdYLRsuQK1bs2K8JpZlT7rVNwMtFejEu8MQhtDTfwgUZXnLkXlWC4c8qOLay98Z0mZlAQ2efjhQGttjtXquCeeTUZ6FZOtCNE96X7LObY/N4dg3urj7ZXlDbGjYU6yYl6Whe4Rrfs0BMJqYbchg0++6gFOvHuZ5B6oDbr+OKA9CakAEOILAiG0/kGBjxo0BrivVKaEVBFZSWdW+bFPvzyKmROKgMT7EExNYJh/V9NkScNRPcWcLHiZBy3nbj4UkOORjBjaNUOR4PmDNrFbXxjcWG4wNYSFdlyoTpIEF2CHfIS6BK6XpCvKxY/QjLsF/s+o2MMz18nPDrL9Nqqmzg9MuvRKUFgPbw0Pm1lw40xS4aK28SDpNMnFXK6KEWnVgUdSsBsPNc3/XatApi287lCEMUbungcqZXUx/9nQ/a7Q28N+1cEOZjaVwTQKnGtQdl8wj994q7kqNhR5NhveaRyIZn/TTfl/pdcyEIC7AyArjNl0SdFk6tHFNMpbW/HW+q8jS46B3eAisC0MgDhOuuiEMTIAfVGkTNeYWx57b2pw0qll2ZiN/HaKgiwEqxUxOqVDeauaqICZK6u4wfjloyK+wjA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8506.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(38070700018);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: I2JiaV5EvVqLSga3PeujftYM58AZFNVnkjWlb3UarToGrHIUL1gX11iuPNSB9jTmr0LSVElcgvW+fF9dCcGD9O2ipxWHvgnkgHmMqz72WadtSKhUzNnh5lzLvjGprPLJI/r9GwQKPIU5f94jT8gI4bbDcFAOC1nB5jFx/He/cbapn7fWmIC/D9pN3+xZgXkF7AxMzodKsVFuXz6JaEtXVNs9vFrUIADDXAkoQNGilXpU1iEPRavt9p7Q3KX0gm7X7qm7rs1k1f/+Pxy3Vl96YhMeeQyp2nHw9uJobBzU2rps+bDvNU0zKbEFTI6yz1KmogmqRV93sjaIulHmayq9o6BPZvqcwNIotPcpjQFa6sCK4gPEdp//SbFgse60gKHSeRZVelQhjFmmF8bBwZUa7ZEwkbgbbqest8y3nQlwEdt897Q8DZM9+EDqyjgsPSykyeay+MgdrNshrxtZ3Oz/U/r7z02NzTn9IMOi+alvj6PLYr/88AOlEidbInpK5zXb2buLWysXjwI6yt55aQNvjjMIdnFvmaP++JgnF1sxsSMvQK47cl9CxEcpkN16UkO+CPGpliMFTuqPUfsZc1mw2hrqWyTLGA4AGQ44YMiySjZNOErHNoymEXYGI8BYIiWb3LgjaF/sq5g7VuLaax7UfXdyLc11docmEqNbBvu/7KLwCx4Vx9Tdv4BOWFPWvLJQZpnpdxQ2BaLNr4xVlTi0fsVRm3kxQQqJAE1+ga+xNP4gbsbanr2NXjGZ77vEySwItY3qJzntK6sMM1CGM9YvPjRgko1dxxriBYz71SXcNla1LaTZGX12kMbMJc/X1x8ojzE11R4SVDolKeFEBWVSlaEarQ2L+vjxk0EZeHquOg90rauSl1/WulIgJICR7pLkCEG0wM5f4xkSdqATc+SemwG172+gqPsc9D+5mmXZ2QF2K+AQk2HMkCz6ZhkerNC50FK74Spl7DnISbP810pS5UQOVCrDXPxdArNsZxptcRtnIKR5EBF2hpUbf4CWQi5ETrxo/KmcR2NG8Fbx85Y5koMJrP2O3Hwzj/aUwoADdtEY3huBYvXJNv2cOLL9nZ/ojG3BJgPLf8obVJrf4scLDBdqrGqCgMLlZyQ7un42jx3OltxnanE7YDyRu7ANEkwTlfvwtPZwv56mqilBQh0ptjGGcQ+e0WDkTwVz9+nDud1TiGbONq8psaYQm31HwJv966ceFExOdDzdwoRCqD7awZ7sRp9ILyxFPbY/tvRonZi+hQG/lwl6Jyf1pQBJnE0xyjju8/2LkVGpcA49rCzfEmg+tAEzhpOeL2S2cdvHHbVN4FVZqF6oRuX71tpkKjXZZ4ESeFbRB9xivT2yYucnAkerMiMQEkBdt1hrgklgDJR3jZnYlapSY6eqMleNGKn3zUjtpBOI64YVk6zXA9Lef23RFetHeAW08d4AzzMKbvem6X/qhN/grRKeO+PctEYsILhgi3sD8UkAwtYPPbUrAYLnzzjdXCVicsxeL0KvoB1zms+Z1YcRWBv1TeFbFw0OeFT7BUBMjb4EgGtDj0zMr6vaclDzqhm2cGoRAhOiKlsA6vOC3H1V0jF70ffq0iEn MIME-Version: 1.0 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8506.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11c2bb2b-6ac5-4009-f34f-08dcb4c6f2e3 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Aug 2024 20:49:35.1159 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GAmvWBhtx/e9gSVQD0OGovZ1Wi8Wl3i1kakC8Sif2Hahsl+e+04T1Os7TdWp85xG6L/FpHmBKp+3npVcOCO92g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7965 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240804_134939_969251_3CA3DFE9 X-CRM114-Status: GOOD ( 12.97 ) 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 Add support for CSR clock range up to 800 MHz. Signed-off-by: Jan Petrous (OSS) --- drivers/net/ethernet/stmicro/stmmac/common.h | 2 ++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++ include/linux/stmmac.h | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h index cd36ff4da68c..e90d3c5ac917 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -256,6 +256,8 @@ struct stmmac_safety_stats { #define CSR_F_150M 150000000 #define CSR_F_250M 250000000 #define CSR_F_300M 300000000 +#define CSR_F_500M 500000000 +#define CSR_F_800M 800000000 #define MAC_CSR_H_FRQ_MASK 0x20 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index f3a1b179aaea..ac80d8a2b743 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -324,6 +324,10 @@ static void stmmac_clk_csr_set(struct stmmac_priv *priv) priv->clk_csr = STMMAC_CSR_150_250M; else if ((clk_rate >= CSR_F_250M) && (clk_rate <= CSR_F_300M)) priv->clk_csr = STMMAC_CSR_250_300M; + else if ((clk_rate >= CSR_F_300M) && (clk_rate < CSR_F_500M)) + priv->clk_csr = STMMAC_CSR_300_500M; + else if ((clk_rate >= CSR_F_500M) && (clk_rate < CSR_F_800M)) + priv->clk_csr = STMMAC_CSR_500_800M; } if (priv->plat->flags & STMMAC_FLAG_HAS_SUN8I) { diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 84e13bd5df28..7caaa5ae6674 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -33,7 +33,9 @@ #define STMMAC_CSR_20_35M 0x2 /* MDC = clk_scr_i/16 */ #define STMMAC_CSR_35_60M 0x3 /* MDC = clk_scr_i/26 */ #define STMMAC_CSR_150_250M 0x4 /* MDC = clk_scr_i/102 */ -#define STMMAC_CSR_250_300M 0x5 /* MDC = clk_scr_i/122 */ +#define STMMAC_CSR_250_300M 0x5 /* MDC = clk_scr_i/124 */ +#define STMMAC_CSR_300_500M 0x6 /* MDC = clk_scr_i/204 */ +#define STMMAC_CSR_500_800M 0x7 /* MDC = clk_scr_i/324 */ /* MTL algorithms identifiers */ #define MTL_TX_ALGORITHM_WRR 0x0