From patchwork Tue Jan 14 18:19:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3806 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 828073F332 for ; Tue, 14 Jan 2025 19:20:34 +0100 (CET) Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-386333ea577sf2183949f8f.1 for ; Tue, 14 Jan 2025 10:20:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1736878834; cv=pass; d=google.com; s=arc-20240605; b=SNdTgX6/NyV2TqRb74lxj/48RXe/BvB0Zz/fz9Jyu5ORT7c5ccwWjs9dGIrFFQsUG/ mkVhXJBqq5LH8f3h6udu+B/dkMj8GsoGNgK4l/sjjjvokvNMWBQUJAu+vC74qlIooOVW yobQg6TDPxmrym6KAgLd6xTInuUyphR0hOLYUUjUjz+Ni53dCCFaQr+AcW633y+r42uC tAMYE17W3shJgdLIHP/ac10ec7NbjimnJslDBECkDITTdRftlLYnR24AcNXQHfanebfQ iBe8ysW2mHma32BTlEqIAmoCAYasWfd8OnQiFZcsxg3gDwjumz0AMacWEwUhB7EhJ18Z FN+w== 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=cDzlPBFHFhrSLV4n6gU3A8apmbVg6nzQNFM/aHWILO4=; fh=HjsZ7BYhPEGQ5aOG2JVhtWkJn4vEQ2TLizuPaUoHEt8=; b=H2iDSZFrsMkKcEJGb/0ROCEA8bkB0t0N0QZ1qhiV5/NyKWWXxtOk3jV66HlYyMXKa8 K3eRQJ3HLpAhdv75ED+AKBM/2n1fBDgFg81r6adUVLdnR4BT7mEvvHXPfTRqaSyF0PkL mrfW8Z0eJFV/La8Lh4jFHDlkCTWP0MbHCN0fTW0t4EFwq2mh+++h4Mf/glIRWqoU7C8V 2VVy4GhNxtoYmU3W4JPFzwEUNjc7Xpc5IVQ4tOsrRLup23RVhkHZykyyjdn0tXw9JY0Z jYOOSFJFldTP6R9LTPCmWAT0z+2Fkri4T6DYg152zKoYwQYKbLHK7euZTyDDS4O3sJ3b Qovw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=H5AGyYg8; 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=1736878834; x=1737483634; 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=cDzlPBFHFhrSLV4n6gU3A8apmbVg6nzQNFM/aHWILO4=; b=f4FNzbORKG3TaRe6nUIiOyc+Poa8LeQKm/McjaNTr4u8I7S+8fakzOal3mVgExCxYB yGrGgnRUFVvGMklNWwjvalZ3GNPosJExsjI6AmR04SwF/aW3Pojf+Qo9JJ5ZnfTkiAMx Mh8KVowCMCcsx4xEXXkE99hyzSxUqs5USdiIc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736878834; x=1737483634; 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=cDzlPBFHFhrSLV4n6gU3A8apmbVg6nzQNFM/aHWILO4=; b=Iy5S8DRtoI2Yzamlp7DpnEW1kyhGRk7NQVtfbyrKVEv7t1uskuhvQcd73hkHtVYX2b 3Ru85fjOWLGa7qnHdKy46SSJ3GyRog8rDTqdOqE/4mbIYwuTTnOCP+LDuOtLsSaCd0+U LpHlEuO8lSmJHEvKLFp/hxgXbV5hvI6VJhiZbEMoHj9IfxV6qUWD7kP2JlWg0NIMiGQ/ WqtxY4zVN10fqAR3+KTPmH6Y8W5KoQCL+D2kCWAywiiuf/EG6z13nzw837H9tzEw4qZ8 lEOLjpAX3Mr9Q53QfBS3q5uwcp4L2CVuNzYtwzOujAPSH0be5IsALjESovVj+Jr7gP8u XVRw== X-Forwarded-Encrypted: i=2; AJvYcCXknxP8cDZ2fld717X+1wfXNdinJ07zs/mwG5cx1aZzwu7EEkY7sx7gtdzGf6Lxqf7weFzppf/JGaXPfg1k@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yz/UKdlAu9XXzKawZzXsI9Ug28QFX2ciE4AdbfNhlzRAjgksflg sLkDrxB5TzowhbJ8vcHRkn42/tN1SjwRSQmWLqQ2yAYEaFZGvC7dR5OC9KSbvKGQWA== X-Google-Smtp-Source: AGHT+IF0nOfuFmzFKW95Q7PcAff4Tj0JOjyn7gR0NUSZnh/gMH49V//S3DjKtPMN+5zbJMNLvsFT+g== X-Received: by 2002:a5d:5f85:0:b0:387:86cf:4e87 with SMTP id ffacd0b85a97d-38a872deb33mr23783786f8f.15.1736878834021; Tue, 14 Jan 2025 10:20:34 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a7b:c418:0:b0:42c:b037:5fba with SMTP id 5b1f17b1804b1-436e8849cbbls11036105e9.2.-pod-prod-06-eu; Tue, 14 Jan 2025 10:20:32 -0800 (PST) X-Received: by 2002:a5d:588f:0:b0:385:f062:c2df with SMTP id ffacd0b85a97d-38a872d2b3dmr857750f8f.11.1736878832229; Tue, 14 Jan 2025 10:20:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736878832; cv=none; d=google.com; s=arc-20240605; b=NQqCoX94qWElr9zuu+R2x4zy4UfrO9AMCdNEd3LU5L8XLlHCKGmn7XgXP//heoe/qZ adxTADgoF/gfU38YLf1scoLetDVELV27lDLiJv2wlGS/WTS9l7W2rtNc3RWRtGXZ6HHf v5aVPYlC2JL2cv0GBGuSg81PVPP4qR8PY7ojbOkBBZB8sq/mDdRf+JNA3qGX+uFWxUq1 myNVapV6X069qvEiwV0jbL1LpmPNJT4kLPCUkQPVtxzUlKheD/1biUnr4DrS6q5EqRzX 1KaB2Eea5camPZr0BZM3DeIaxDy8DGw4ft/44nm07K2pRgyqx3Tobb9yax1qabghWcOn tb8g== 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=zkVJ9sQJb2vv3dExk46APkrSl3qRZZR081phjk5hrNg=; fh=LKhgYKqW/DH7bOgdnVELRgL+gR1eISg3bEXUN1rI9pA=; b=k/KXjJ89IB7MtkcyV3FsEBwbeMiI7lrF1ig8+7srnqYCMOkR30aelf8d8/boakewlo dRyCmJFQiRFQWGv4e8yjGL4L7ZqaLAWv5SRwnCnbH2CvwR6MXsVl2NnzOkOr5adVQ6r2 m7rUlgMj4ScKWUrrk9DxFjVziU+HsDLKS1dSd3fnxkszlFF26OiPCcp/wQYUkP5E7CTk uqfMFCTF4s/njxmnNHI5eaWCiFfRH/XEAJDHGRw8Hxfbj6niAMKASylEA9d2cwnUUvNl wHODbLb8S/s5rPVGHGCe72Cvzvl2raDf21kVlGQtQ1upIbs5mZJWE+NHxSKYzTj7FKx3 Ra4g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=H5AGyYg8; 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 ffacd0b85a97d-38a8e4d19e2sor4153921f8f.8.2025.01.14.10.20.32 for (Google Transport Security); Tue, 14 Jan 2025 10:20:32 -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: ASbGnct9E1vXKIHLk07OMmkYDiKD5nUpaMj+f7x9rEUfgaoP/7v/GYAC7bp9m8rArWx eeInmTFAQGtD5xvTGsfL0UussHm2Loaf5pfDI8aje2yPJp/M126S0QIJWPC20epa9l2JFJ3FiJD j+2q+sZFOZiXDU92E9kFdVCOZxLvxgY1i8kTiGday6VCKS8zA8HlchhAzl1wolPFT//3EwlaanA 9Pnx2Ra6i/9c4DHxN3Un+0u8w9xZF5J6FPkEBwM9B2Ri1l8i0e3BeK+tge2QsTaVl2OmyPpJq5d aVUElOrFm3lCBr/As3DS7g== X-Received: by 2002:a5d:6c68:0:b0:385:fd07:85f8 with SMTP id ffacd0b85a97d-38a872ebfbdmr20001278f8f.29.1736878831746; Tue, 14 Jan 2025 10:20:31 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.42.147]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38be66b01c7sm278970f8f.22.2025.01.14.10.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 10:20:31 -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 v4 4/4] clk: stm32f4: support spread spectrum clock generation Date: Tue, 14 Jan 2025 19:19:49 +0100 Message-ID: <20250114182021.670435-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250114182021.670435-1-dario.binacchi@amarulasolutions.com> References: <20250114182021.670435-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=H5AGyYg8; 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 v4: - Improve the compatible property in patch 1/4 "dt-bindings: clock: convert stm32 rcc bindings to json-schema" 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);