From patchwork Sun Jan 5 18:14:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3790 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 604463F1CD for ; Sun, 5 Jan 2025 19:15:45 +0100 (CET) Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-aa6a1bf7a82sf499448566b.1 for ; Sun, 05 Jan 2025 10:15:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1736100945; cv=pass; d=google.com; s=arc-20240605; b=RG7YO8Fc/qz8ECuxaZmDvWcdIwhZuS3dS+hoY4EDnli1TSnFg2oWF4iR3HeSGhZXX8 ZLbkgTxo/0yEkSUjK8lHcnCNrlPsZ6pvYK7DNvt/bAOFvf/OloQ6ecmbi3mRtCgvClTr eOkKltBNcqF3q/dLjnH8VTcY1ao1h1z6Z6F7f84uKWz0mc5OAo5yc0teAZ6KF0tCXTV8 9sHjLZz19XWvA4yjbmdkfD2yxDP64UT2x8OQcTcSSYbcrQYveYVfmZplHUUzsnCSXbM0 XDpYyygxBTv0+J+bVmK6URiY0pNH1WwJ6khhLrhXj+gJ6NKY28Tf8ApzoKeWcNOUZ9r4 hwVw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=joguiRPBtYEh1ADpX+EgPVvCG6Yy3jhMNougE2e6LCY=; fh=6KQ/ipbTYOZVznmbmH/fT1AO8sBwSjv85hwqp/Mn0sE=; b=jL8tFE3dA0e6eC9GsXsnu0lFSNLyx0MDsPaXSj4A3WX0G6GFu0uoTFjfjzkxGd3lsS /FrAS/YoyIE2YrIjLKNQ3fIW8HETBdG6E865S1wo8pf+cpQknG4ge/FJ4/6va/7LWr/m JwSAFMLxLs5KVZrtwJx6Mfgk+SCQWU27vSWQp02KOFgtRhx2GbqoJBhMMswLsSQLh00m 1l8Ook4VVBrnbfrvf4+RDKOhvHCGLUgBYxMrLpfw4orQderFIUMNIjLBj6c9khBq8T3K kqJFRLw062E6HzXsixFveu5S2rxsIz7Q5fFEWV2TPOGcZKKIkem5rfRob5vrp3CCeFxq IvsA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="CyJ+ZLJ/"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1736100945; x=1736705745; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=joguiRPBtYEh1ADpX+EgPVvCG6Yy3jhMNougE2e6LCY=; b=E7/pYUgZ15m+0NOGrt/rAHyvrAnSApYN4h1f1dp9mC1B6v2I94iiB9NouwAdSEQK74 xLcwkl5dGkqeFI9sMc4QCK7fNkx0W8mP+U5+ATD8DHnwJC6yhlbz4n1la5QH24KGoUfV 7HmD0Bm8rzQGCrV7Nnr2mNQbDMAa7jkEpCS60= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736100945; x=1736705745; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=joguiRPBtYEh1ADpX+EgPVvCG6Yy3jhMNougE2e6LCY=; b=iwsr17STtBT0776bhuH6yhWPMWRMKJZyFGeqilbKikLAfX6zsrIgCMmUvj8Ca68GQF TuR9vR5L09+3x43J7agm27rXZsq603Hdt2XAWTAk8mblt/nHLeGUCYsTZQXfAEiX8WMB UMcviN9j8y5Co2AB6waunuGSiYKVwKFqNKMLNj0ZmkpKl93lZ6uPzc9BTqpKkdv3GzKM MBazc+eOa+ba/F60KIMN4+R+9elDoJsij7fc3409WLXCbQIfN+2Q8RxAQUNXu8o9j8Un h8uLl9MgaX8YCb2TOSM7GBDJF39QNJ+J+gHjjeVoNsMkWxbZNjMQ1WWPizwK3b5nxCEE Ej3A== X-Forwarded-Encrypted: i=2; AJvYcCWxHkZZzXhEEB4eI05MpyDPozrO+Rtdp4GZ2OWioaAOTCQ4A0GErsyeErGfUYKrf6LIQczG6i9SuQuGA79d@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YwGLPtpLcxdbAcnz5KWg9aP9P1zcPblKiansQeIx4SbQIOYjpa4 gyTFGvK8L8KMKnFGmvuGcIq323blv2LDyT8WGC4fUpGv9ZZXHXgB3O/5tExMsgqICQ== X-Google-Smtp-Source: AGHT+IGS2M8mPr0A/TgBDE7OnkCC5e9zBIsLCKOZZ6y/KhIN+Spg5aLLhWw0yWM9yGsXLbh5TU12Yw== X-Received: by 2002:a17:907:7e8f:b0:aa6:552e:451e with SMTP id a640c23a62f3a-aac2d45544cmr5648873966b.29.1736100944819; Sun, 05 Jan 2025 10:15:44 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:4141:b0:5d3:ecaf:6210 with SMTP id 4fb4d7f45d1cf-5d928209f85ls313427a12.0.-pod-prod-08-eu; Sun, 05 Jan 2025 10:15:43 -0800 (PST) X-Received: by 2002:a17:907:d2a:b0:aa6:7cf3:c6f0 with SMTP id a640c23a62f3a-aac2adc48efmr5076676466b.14.1736100943021; Sun, 05 Jan 2025 10:15:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736100943; cv=none; d=google.com; s=arc-20240605; b=HWUMCULUyyPYdkq/HUJITZDKp6A2J+v7P8IRm1McxMpYGPZRsLeyeeDN21uo/4awUs k1UoVOgrNFgQatCl7YGY+QByTs0J9dwRelci3x5ksf4Y+pzWh8yFv23GD1RhW8Uiq85j xHd26RaXDH5ksEIl/5wZ9EF7/+MWBcT726Vkp1dh9YCWyjgHrzhH9hnInUTiWxNghWsE 5UlyZrqxHRp0uYpHdaSCKojxjlISmFEB09t8OhCIBrj3u/ALrRgSErZQchEs6DvilzrN t+k/giEmfJmYEY645x8ADRtzD9v/UjD/29H0kO6K3Djbtf2uRw1ffiaraHfv7nutYAGx WpyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=CYt+s6fkrUpxe5XF17lxHByzQRCB3AxfRzKWTwCyBC0=; fh=LKhgYKqW/DH7bOgdnVELRgL+gR1eISg3bEXUN1rI9pA=; b=NZ174fDsglq4tj3REkppsjXGDIneBmH/vocxjf60ZgeDjnNfXRz5f3Z88x1BWPje+x JCKnBKbw6lQEmQTmh462yOCKvyZss79W3SpPYrWr7EjDaXSVQeYvangdoytgMkR1Lq+y /73Ol3IS4VY89EZQF975ZMBjC646CAMnX8VylIm77hZXguUwdoeiHLPrhlFvsb6wyY2w Uyc8XEjc2ev4NfqYkdz6M7rZSn8huGzDAv7dxU6EylZowVgubOEfkJ0e1YMfHfyLHg/3 aDFQQCk62ygDT37f0t2cq9P7v1ploWi2Y+sjXwzcpL9Cn+vs2BI4GMIXcu59S6Y2C5hs GmpQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="CyJ+ZLJ/"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-aaf7f3a8776sor404943166b.11.2025.01.05.10.15.42 for (Google Transport Security); Sun, 05 Jan 2025 10:15:43 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Gm-Gg: ASbGncukw5U37A5hqQUsVNRC1d16nR5CsxGklVafKOztlcH9AQ0s7fZpSKGNUTFNj3t QR+mDQL9+bR4wFezEGg3wcP8I+DMpyV3l5HIVMnf876ka1UtZZq7RsFXSyczLLzpiKR/WhrFnfe wxrLS8RBlMt2SYQCsdMuDkvFEVTdl6QuTZmn64qEokAvZvyggn6WpMpsrNLFQS3vAd7aGY2aJkw w0H1fBGgUpmcTIpG+gkEC+wF4HxiWypR4edBaXVi/YHqouAbkSbkCjrwbVyWMWsPRUTHvmnFow5 iueZ+M7zmEWMtogrut+sLTvtEq6IwYcvron3/jXTz6A7mCjBpsHqVJFU6YOwoSTp/3knL8fRofs +QpZUfIsiYK+XWD5Svg== X-Received: by 2002:a17:907:7e86:b0:aaf:ada2:181e with SMTP id a640c23a62f3a-aafada219d8mr879413566b.26.1736100942566; Sun, 05 Jan 2025 10:15:42 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-41-6-15.retail.telecomitalia.it. [79.41.6.15]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0e82f178sm2138185066b.38.2025.01.05.10.15.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2025 10:15:42 -0800 (PST) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Alexandre Torgue , Maxime Coquelin , Michael Turquette , Stephen Boyd , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 6/6] clk: stm32f4: support spread spectrum clock generation Date: Sun, 5 Jan 2025 19:14:18 +0100 Message-ID: <20250105181525.1370822-7-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250105181525.1370822-1-dario.binacchi@amarulasolutions.com> References: <20250105181525.1370822-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="CyJ+ZLJ/"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Support spread spectrum clock generation for the main PLL, the only one for which this functionality is available. Tested on the STM32F469I-DISCO board. Signed-off-by: Dario Binacchi --- drivers/clk/clk-stm32f4.c | 143 +++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c index db1c56c8d54f..6c80c0dbb0a3 100644 --- a/drivers/clk/clk-stm32f4.c +++ b/drivers/clk/clk-stm32f4.c @@ -35,6 +35,7 @@ #define STM32F4_RCC_APB2ENR 0x44 #define STM32F4_RCC_BDCR 0x70 #define STM32F4_RCC_CSR 0x74 +#define STM32F4_RCC_SSCGR 0x80 #define STM32F4_RCC_PLLI2SCFGR 0x84 #define STM32F4_RCC_PLLSAICFGR 0x88 #define STM32F4_RCC_DCKCFGR 0x8c @@ -42,6 +43,12 @@ #define STM32F4_RCC_PLLCFGR_N_MASK GENMASK(14, 6) +#define STM32F4_RCC_SSCGR_SSCGEN BIT(31) +#define STM32F4_RCC_SSCGR_SPREADSEL BIT(30) +#define STM32F4_RCC_SSCGR_RESERVED_MASK GENMASK(29, 28) +#define STM32F4_RCC_SSCGR_INCSTEP_MASK GENMASK(27, 13) +#define STM32F4_RCC_SSCGR_MODPER_MASK GENMASK(12, 0) + #define NONE -1 #define NO_IDX NONE #define NO_MUX NONE @@ -512,6 +519,17 @@ static const struct clk_div_table pll_divr_table[] = { { 2, 2 }, { 3, 3 }, { 4, 4 }, { 5, 5 }, { 6, 6 }, { 7, 7 }, { 0 } }; +enum stm32f4_pll_ssc_mod_type { + STM32F4_PLL_SSC_CENTER_SPREAD, + STM32F4_PLL_SSC_DOWN_SPREAD, +}; + +struct stm32f4_pll_ssc { + unsigned int mod_freq; + unsigned int mod_depth; + enum stm32f4_pll_ssc_mod_type mod_type; +}; + struct stm32f4_pll { spinlock_t *lock; struct clk_gate gate; @@ -519,6 +537,8 @@ struct stm32f4_pll { u8 bit_rdy_idx; u8 status; u8 n_start; + bool ssc_enable; + struct stm32f4_pll_ssc ssc_conf; }; #define to_stm32f4_pll(_gate) container_of(_gate, struct stm32f4_pll, gate) @@ -541,6 +561,7 @@ struct stm32f4_vco_data { u8 offset; u8 bit_idx; u8 bit_rdy_idx; + bool sscg; }; static const struct stm32f4_vco_data vco_data[] = { @@ -661,6 +682,34 @@ static long stm32f4_pll_round_rate(struct clk_hw *hw, unsigned long rate, return *prate * n; } +static void stm32f4_pll_set_ssc(struct clk_hw *hw, unsigned long parent_rate, + unsigned int ndiv) +{ + struct clk_gate *gate = to_clk_gate(hw); + struct stm32f4_pll *pll = to_stm32f4_pll(gate); + struct stm32f4_pll_ssc *ssc = &pll->ssc_conf; + u32 modeper, incstep; + u32 sscgr; + + sscgr = readl(base + STM32F4_RCC_SSCGR); + /* reserved field must be kept at reset value */ + sscgr &= STM32F4_RCC_SSCGR_RESERVED_MASK; + + modeper = DIV_ROUND_CLOSEST(parent_rate, 4 * ssc->mod_freq); + incstep = DIV_ROUND_CLOSEST(((1 << 15) - 1) * ssc->mod_depth * ndiv, + 5 * 10000 * modeper); + sscgr |= STM32F4_RCC_SSCGR_SSCGEN | + FIELD_PREP(STM32F4_RCC_SSCGR_INCSTEP_MASK, incstep) | + FIELD_PREP(STM32F4_RCC_SSCGR_MODPER_MASK, modeper); + + if (ssc->mod_type) + sscgr |= STM32F4_RCC_SSCGR_SPREADSEL; + + pr_debug("%s: pll: %s: modeper: %d, incstep: %d, sscgr: 0x%08x\n", + __func__, clk_hw_get_name(hw), modeper, incstep, sscgr); + writel(sscgr, base + STM32F4_RCC_SSCGR); +} + static int stm32f4_pll_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { @@ -683,6 +732,9 @@ static int stm32f4_pll_set_rate(struct clk_hw *hw, unsigned long rate, writel(val, base + pll->offset); + if (pll->ssc_enable) + stm32f4_pll_set_ssc(hw, parent_rate, n); + if (pll_state) stm32f4_pll_enable(hw); @@ -788,6 +840,87 @@ static struct clk_hw *clk_register_pll_div(const char *name, return hw; } +static int stm32f4_pll_init_ssc(struct clk_hw *hw, struct stm32f4_pll_ssc *conf) +{ + struct clk_gate *gate = to_clk_gate(hw); + struct stm32f4_pll *pll = to_stm32f4_pll(gate); + struct clk_hw *parent; + unsigned long parent_rate; + int pll_state; + unsigned long n, val; + + parent = clk_hw_get_parent(hw); + if (!parent) { + pr_err("%s: failed to get clock parent\n", __func__); + return -ENODEV; + } + + parent_rate = clk_hw_get_rate(parent); + + pll->ssc_enable = true; + memcpy(&pll->ssc_conf, conf, sizeof(pll->ssc_conf)); + + pll_state = stm32f4_pll_is_enabled(hw); + + if (pll_state) + stm32f4_pll_disable(hw); + + val = readl(base + pll->offset); + n = FIELD_GET(STM32F4_RCC_PLLCFGR_N_MASK, val); + + pr_debug("%s: pll: %s, parent: %s, parent-rate: %lu, n: %lu\n", + __func__, clk_hw_get_name(hw), clk_hw_get_name(parent), + parent_rate, n); + + stm32f4_pll_set_ssc(hw, parent_rate, n); + + if (pll_state) + stm32f4_pll_enable(hw); + + return 0; +} + +static int stm32f4_pll_ssc_parse_dt(struct device_node *np, + struct stm32f4_pll_ssc *conf) +{ + int ret; + const char *s; + + if (!conf) + return -EINVAL; + + ret = of_property_read_u32(np, "st,ssc-modfreq-hz", &conf->mod_freq); + if (ret) + return ret; + + ret = of_property_read_u32(np, "st,ssc-moddepth-permyriad", + &conf->mod_depth); + if (ret) { + pr_err("%pOF: missing st,ssc-moddepth-permyriad\n", np); + return ret; + } + + ret = of_property_read_string(np, "st,ssc-modmethod", &s); + if (ret) { + pr_err("%pOF: missing st,ssc-modmethod\n", np); + return ret; + } + + if (!strcmp(s, "down-spread")) { + conf->mod_type = STM32F4_PLL_SSC_DOWN_SPREAD; + } else if (!strcmp(s, "center-spread")) { + conf->mod_type = STM32F4_PLL_SSC_CENTER_SPREAD; + } else { + pr_err("%pOF: wrong value (%s) for fsl,ssc-modmethod\n", np, s); + return -EINVAL; + } + + pr_debug("%pOF: SSCG settings: mod_freq: %d, mod_depth: %d mod_method: %s [%d]\n", + np, conf->mod_freq, conf->mod_depth, s, conf->mod_type); + + return 0; +} + static struct clk_hw *stm32f4_rcc_register_pll(const char *pllsrc, const struct stm32f4_pll_data *data, spinlock_t *lock) { @@ -1695,7 +1828,8 @@ static void __init stm32f4_rcc_init(struct device_node *np) const struct of_device_id *match; const struct stm32f4_clk_data *data; unsigned long pllm; - struct clk_hw *pll_src_hw; + struct clk_hw *pll_src_hw, *pll_vco_hw; + struct stm32f4_pll_ssc ssc_conf; base = of_iomap(np, 0); if (!base) { @@ -1754,8 +1888,8 @@ static void __init stm32f4_rcc_init(struct device_node *np) clk_hw_register_fixed_factor(NULL, "vco_in", pll_src, 0, 1, pllm); - stm32f4_rcc_register_pll("vco_in", &data->pll_data[0], - &stm32f4_clk_lock); + pll_vco_hw = stm32f4_rcc_register_pll("vco_in", &data->pll_data[0], + &stm32f4_clk_lock); clks[PLL_VCO_I2S] = stm32f4_rcc_register_pll("vco_in", &data->pll_data[1], &stm32f4_clk_lock); @@ -1900,6 +2034,9 @@ static void __init stm32f4_rcc_init(struct device_node *np) of_clk_add_hw_provider(np, stm32f4_rcc_lookup_clk, NULL); + if (!stm32f4_pll_ssc_parse_dt(np, &ssc_conf)) + stm32f4_pll_init_ssc(pll_vco_hw, &ssc_conf); + return; fail: kfree(clks);