From patchwork Tue Jan 14 09:11:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3800 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4E2683F174 for ; Tue, 14 Jan 2025 10:11:41 +0100 (CET) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-5d9e4d33f04sf1323154a12.0 for ; Tue, 14 Jan 2025 01:11:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1736845901; cv=pass; d=google.com; s=arc-20240605; b=Oe5tP4JgOeDWHUAhEcIgYW/n4oLAmdTSZkNrdtZgaL02Rri4lJwRUTFSOCGUVmeg9u X7+7i2zmy5gbszuMoWps7cbhtifmvSK7RCNW5tRap/q/EAmaDCHJ8cii1YZuHSSE10Hu IxMC9DFBeVZsMHIltJv45YstGi7nSp/+l3zaiO8ntXq9uCVFT6GHOo1N1sjJGRl8nvPM tubqdtjT8yDdlUGXRlnmOi3ugrKhkL3Axs8HLNqCQaZlsvupUkgeZUeueEIPH4MixnOw ZMfD4OeTIvvs+s8ng5Wdf5WrbQMhDjokjYAKx+kFYB5Cp1N/173urlX2c2T5+02WQKCt 3WIg== 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=XcJqL5FQyd0ZfT26caCSXkH/91/MCtI0HGlaOeFOIN0=; fh=yxRRQfvoSo/5C5Ll+p/lClycCWv310/0LTgmwq9qQDs=; b=YUA1SRFqfC/0WhbVYD+Lr0IPWevDG4Bg5ZCBi7CvmLT9Y84V4KtQHI/0Y7n/e7yWOl 5n0KLaiNKqZALN+0QZFDwcbF3iFf4WIVItVq/SysHTuwId6k3wz7uiqEPk78d8QxvIb+ ehqy3lL1r0JSE5KwF8J1rnoTuXPGgxJTa0IqTb73dwMdWoaMyxBSZcf3EPr/0DZm3gnc l49ZAs7dpWl9sc6H5ost0F1xHCRN99gDrgSae6YeOhuxqtCoLU60UHOMbEc+Lw1TMC70 MQe/Pqtso9lyYSLB7aS4E1gYwTdshpRmx+PMKeuJjoST7Dkj4ssYPdxO8o2u6Y71ahk2 Q6Lg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dUyz1U1z; 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=1736845901; x=1737450701; 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=XcJqL5FQyd0ZfT26caCSXkH/91/MCtI0HGlaOeFOIN0=; b=n1i/hhTA/qMghKrLEvHKAtuf3kjkmWewLF9RI2ClGMMW04dkZH4HogchhRXgUoHddZ awV89pMV1YJHsTTW5WlMGlSN/JMod43ttPBQg+1XfZ3HeYvFws4c1g5og6XHaksXSR4E t6Ov061F0zMKrZlaglPSDeuFeJwUMdy07cPB0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736845901; x=1737450701; 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=XcJqL5FQyd0ZfT26caCSXkH/91/MCtI0HGlaOeFOIN0=; b=KRRKvA4lV3yoUhbiKPztWxnVcwGztCc2muT/E9nQ//73hoXwnCpT99obrFJVlScPDH qX3CVp918ZlBPGj5lGtpnW2IdkgMg/8/cg3i9Y4IhCiTK/U/Pg9ITuU8oBcPrqRg2z/r 9cbLQBnoED/1V38PSflXAZLBgg3vuhb1kFP9uGqt5jcCqUkmrmWLZclMv2AQo2BymuIY 8CUi3NHnD0AfV5Zk8mDLcgHysAbfOEUl1RcKErTaoqyN7WwQFDWt7V0lysDEwkHg33jj wVXrbZk597oOVlpgaW59kxOCT332y92OyAiJrf52hXXGGz9V4hXmAbBJCX+QlTYe0/uq nDgQ== X-Forwarded-Encrypted: i=2; AJvYcCX8LgVZ+Z5Ntr57xyo8gqc1nXqUjOX3+sAgrfESKqTArVEG0lkTMoJoossr6E2nsqfhKuOA47xOKCsG7H2N@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YyTCRlp+wRqEhvxvfc3+hAB1+OGTKUXajaLnZngTWp6QiHIcBTh gYWte+P+v0AeKHNSTBxyjIrxhnfxG7+5uH3dpD6Z2Ja6LnuPX2KWL2tBH4fCT5ufRw== X-Google-Smtp-Source: AGHT+IH9OsW5Xk337IMxhWp55pKvjpgaxUwmrDh6a0RkSQRPPOnadn9XEYd+EsBtVhB7K2yzyPm7gg== X-Received: by 2002:a05:6402:5243:b0:5d9:b84:a01f with SMTP id 4fb4d7f45d1cf-5d972e169a3mr25166801a12.18.1736845900895; Tue, 14 Jan 2025 01:11:40 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a50:8a98:0:b0:5d9:6a7e:1514 with SMTP id 4fb4d7f45d1cf-5d9b32d2b46ls905879a12.0.-pod-prod-02-eu; Tue, 14 Jan 2025 01:11:39 -0800 (PST) X-Received: by 2002:a17:906:d555:b0:ab2:fc5d:1795 with SMTP id a640c23a62f3a-ab2fc5d1d7emr1188530166b.37.1736845899010; Tue, 14 Jan 2025 01:11:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736845899; cv=none; d=google.com; s=arc-20240605; b=SaKYaH5sZR8LPKuRtodEOshx7lmdcziYRCc95Zh8ZWGeyg4Q32w31cLBVQosELmtFt uMXciZuKrRjms8xKaJ7JdNFAUEAH+JvvDjOWTcnflksJJ+yDZq5he/OPFpWQ3cnOT+xN fHdMQXKKVDBz/GVXFmrskO0vLrlk+hC+xjUytuLtRVEv0aw0iJiuTap+1hbuEjGmIyjP Zr0689TXx7RLktvjnGAcGAGuJwNWiydNzXOyJxUYN8aPm44LoMNXWr2k/15M2+Cs7BJH epdvKATW4aZct1MVPLJ/LnPsTHGIueSMZZSK8VyD6rcWlsEZT8L534/WZDNpS5jZrJpY TdlA== 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=CUkrlqyJMSue4T39ZMAvPFJocT8wJ7xje6FDMMbnAa0=; fh=LKhgYKqW/DH7bOgdnVELRgL+gR1eISg3bEXUN1rI9pA=; b=AzJDTAw/+mHAh0qUBcn/v9zQA6O02Kub3MycziQcIcMjY+HUWDMXCDKStdL26d0r3C BB5HsiG0dLaQjJz/PgbDxidCWANsbssSAPzcXCmt7Rn+/ig+8EGEm6+eZTMvY6GxBsGF t4E9oEP2KIn9C9J0KbP2fD3/pnfe3VghmlptOBbgRYo7TQBquTKhTKDOyoJVYWWsVLQf QlU2atgkjyS1zjqZTVb1jXs0jmf4RoOUZGxo5ExoZmFslPjsEouLu/kDa3NWM7D2n/HA grBNZOgOJTi8mL3AlUn9FR8N/Ps7z4Ve8KAeHEw67yC4Sk0m4xvSvmcy2PtZiEpZTKp9 4tIw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dUyz1U1z; 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-ab2c939c557sor405095566b.17.2025.01.14.01.11.38 for (Google Transport Security); Tue, 14 Jan 2025 01:11:38 -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: ASbGncuwdBZ8jbIDKK7Hy14n8tYBlNQdp/AW7D3MSlaneD+fd+e6pFGx+aL1x4xc07Z L/LrPaoSEyqzpX+Rq+J0R0EhzaX4wGPjA9T2KiDwtlkWKbl7FnkNlMraqYBgcSr9cusatJKjnzl /BUnJxcr6b0gGnuDq2EvwAoMNAERTtGhxrEgwItnNoe5WIRNsAdqHMDkI8K5BEu2h1a1qdReZXW BMdW6d0iL2xJCBP/cjr6T4KUtmLyVnoyXEDGKPpPBWozJFRNfcGxkB5ykKxwvwdjnuE/qEAx8ue iCHeLB78jq8E1zxcU2t9oA== X-Received: by 2002:a17:907:d8e:b0:aae:ea52:3a5 with SMTP id a640c23a62f3a-ab2abdc0bc4mr2261767166b.44.1736845898485; Tue, 14 Jan 2025 01:11:38 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.42.147]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab2c95b7317sm599640766b.154.2025.01.14.01.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 01:11:38 -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 v3 4/4] clk: stm32f4: support spread spectrum clock generation Date: Tue, 14 Jan 2025 10:11:16 +0100 Message-ID: <20250114091128.528757-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250114091128.528757-1-dario.binacchi@amarulasolutions.com> References: <20250114091128.528757-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=dUyz1U1z; 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 --- Changes in v3: - Changes to patch 4/4 "clk: stm32f4: support spread spectrum clock generation" according to Stephen Boyd's suggestions. - Drop pr_debug() from stm32f4_pll_set_ssc() - Add __init to stm32f4_pll_init_ssc() and stm32f4_pll_ssc_parse_dt(). - Add const to conf parameter of stm32f4_pll_init_ssc(). - Use fwnode_property_match_property_string() to parse the st,ssc-modmethod dts property. Changes in v2: - Fixup patches: 2/6 dt-bindings: reset: st,stm32-rcc: update reference due to rename 3/6 dt-bindings: clock: stm32fx: update reference due to rename to 1/6 dt-bindings: clock: convert stm32 rcc bindings to json-schema - Changes to dt-bindings: clock: convert stm32 rcc bindings to json-schema - Changes to dt-bindings: clock: st,stm32-rcc: support spread spectrum clocking 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..f476883bc93b 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 @@ -367,6 +374,16 @@ static const struct stm32f4_gate_data stm32f769_gates[] __initconst = { { STM32F4_RCC_APB2ENR, 30, "mdio", "apb2_div" }, }; +enum stm32f4_pll_ssc_mod_type { + STM32F4_PLL_SSC_CENTER_SPREAD, + STM32F4_PLL_SSC_DOWN_SPREAD, +}; + +static const char * const stm32f4_ssc_mod_methods[] __initconst = { + [STM32F4_PLL_SSC_DOWN_SPREAD] = "down-spread", + [STM32F4_PLL_SSC_CENTER_SPREAD] = "center-spread", +}; + /* * This bitmask tells us which bit offsets (0..192) on STM32F4[23]xxx * have gate bits associated with them. Its combined hweight is 71. @@ -512,6 +529,12 @@ static const struct clk_div_table pll_divr_table[] = { { 2, 2 }, { 3, 3 }, { 4, 4 }, { 5, 5 }, { 6, 6 }, { 7, 7 }, { 0 } }; +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 +542,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 +566,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 +687,32 @@ 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; + + 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 +735,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 +843,84 @@ static struct clk_hw *clk_register_pll_div(const char *name, return hw; } +static int __init stm32f4_pll_init_ssc(struct clk_hw *hw, + const 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 __init 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 = fwnode_property_match_property_string(of_fwnode_handle(np), + "st,ssc-modmethod", + stm32f4_ssc_mod_methods, + ARRAY_SIZE(stm32f4_ssc_mod_methods)); + if (ret < 0) { + pr_err("%pOF: failed to get st,ssc-modmethod\n", np); + return ret; + } + + conf->mod_type = ret; + + 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);