| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Sat, 5 Dec 2020 23:11:26 +0800
From: Zhou Yanjie <zhouyanjie@...yeetech.com>
To: Paul Cercueil <paul@...pouillou.net>
Cc: sboyd@...nel.org, robh+dt@...nel.org, mturquette@...libre.com,
linux-kernel@...r.kernel.org, linux-clk@...r.kernel.org,
devicetree@...r.kernel.org, dongsheng.qiu@...enic.com,
aric.pzqi@...enic.com, rick.tyliu@...enic.com,
yanfei.li@...enic.com, sernia.zhou@...mail.com,
zhenwenjin@...il.com
Subject: Re: [PATCH 3/4] clk: Ingenic: Add missing clocks for Ingenic SoCs.
Hi Paul,
On 2020/12/3 上午6:18, Paul Cercueil wrote:
> Hi Zhou,
>
> Le jeu. 26 nov. 2020 à 1:26, 周琰杰 (Zhou Yanjie)
> <zhouyanjie@...yeetech.com> a écrit :
>> Add CIM, AIC, DMIC clocks for the X1000 SoC, and CIM, AIC, DMIC, I2S
>> clocks for the X1830 SoC from Ingenic.
>>
>> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@...yeetech.com>
>> ---
>> drivers/clk/ingenic/x1000-cgu.c | 19 ++++
>> drivers/clk/ingenic/x1830-cgu.c | 189
>> +++++++++++++++++++++++++++++++++++++++-
>> 2 files changed, 207 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/clk/ingenic/x1000-cgu.c
>> b/drivers/clk/ingenic/x1000-cgu.c
>> index 9aa20b5..d340bcd 100644
>> --- a/drivers/clk/ingenic/x1000-cgu.c
>> +++ b/drivers/clk/ingenic/x1000-cgu.c
>> @@ -360,6 +360,13 @@ static const struct ingenic_cgu_clk_info
>> x1000_cgu_clocks[] = {
>> .mux = { CGU_REG_SSICDR, 30, 1 },
>> },
>>
>> + [X1000_CLK_CIM] = {
>> + "cim", CGU_CLK_MUX | CGU_CLK_DIV,
>> + .parents = { X1000_CLK_SCLKA, X1000_CLK_MPLL, -1, -1 },
>> + .mux = { CGU_REG_CIMCDR, 31, 1 },
>> + .div = { CGU_REG_CIMCDR, 0, 1, 8, 29, 28, 27 },
>> + },
>> +
>> [X1000_CLK_EXCLK_DIV512] = {
>> "exclk_div512", CGU_CLK_FIXDIV,
>> .parents = { X1000_CLK_EXCLK },
>> @@ -411,6 +418,12 @@ static const struct ingenic_cgu_clk_info
>> x1000_cgu_clocks[] = {
>> .gate = { CGU_REG_CLKGR, 9 },
>> },
>>
>> + [X1000_CLK_AIC] = {
>> + "aic", CGU_CLK_GATE,
>> + .parents = { X1000_CLK_EXCLK, -1, -1, -1 },
>> + .gate = { CGU_REG_CLKGR, 11 },
>> + },
>> +
>> [X1000_CLK_UART0] = {
>> "uart0", CGU_CLK_GATE,
>> .parents = { X1000_CLK_EXCLK, -1, -1, -1 },
>> @@ -429,6 +442,12 @@ static const struct ingenic_cgu_clk_info
>> x1000_cgu_clocks[] = {
>> .gate = { CGU_REG_CLKGR, 16 },
>> },
>>
>> + [X1000_CLK_DMIC] = {
>> + "dmic", CGU_CLK_GATE,
>> + .parents = { X1000_CLK_PCLK, -1, -1, -1 },
>> + .gate = { CGU_REG_CLKGR, 17 },
>> + },
>> +
>> [X1000_CLK_TCU] = {
>> "tcu", CGU_CLK_GATE,
>> .parents = { X1000_CLK_EXCLK, -1, -1, -1 },
>> diff --git a/drivers/clk/ingenic/x1830-cgu.c
>> b/drivers/clk/ingenic/x1830-cgu.c
>> index 950aee2..e76e82c 100644
>> --- a/drivers/clk/ingenic/x1830-cgu.c
>> +++ b/drivers/clk/ingenic/x1830-cgu.c
>> @@ -52,6 +52,15 @@
>> #define USBPCR_SIDDQ BIT(21)
>> #define USBPCR_OTG_DISABLE BIT(20)
>>
>> +/* bits within the I2SCDR register */
>> +#define I2SCDR_I2PCS_SHIFT 30
>> +#define I2SCDR_I2PCS_MASK (0x3 << I2SCDR_I2PCS_SHIFT)
>> +#define I2SCDR_I2SDIV_M_SHIFT 20
>> +#define I2SCDR_I2SDIV_M_MASK (0x1ff << I2SCDR_I2SDIV_M_SHIFT)
>> +#define I2SCDR_I2SDIV_N_SHIFT 0
>> +#define I2SCDR_I2SDIV_N_MASK (0xfffff << I2SCDR_I2SDIV_N_SHIFT)
>> +#define I2SCDR_CE_I2S BIT(29)
>> +
>> static struct ingenic_cgu *cgu;
>>
>> static int x1830_usb_phy_enable(struct clk_hw *hw)
>> @@ -89,6 +98,157 @@ static const struct clk_ops x1830_otg_phy_ops = {
>> .is_enabled = x1830_usb_phy_is_enabled,
>> };
>>
>> +static u8 x1830_i2s_get_parent(struct clk_hw *hw)
>> +{
>> + u32 i2scdr;
>> +
>> + i2scdr = readl(cgu->base + CGU_REG_I2SCDR);
>> +
>> + return (i2scdr & I2SCDR_I2PCS_MASK) >> I2SCDR_I2PCS_SHIFT;
>> +}
>> +
>> +static int x1830_i2s_set_parent(struct clk_hw *hw, u8 idx)
>> +{
>> + writel(idx << I2SCDR_I2PCS_SHIFT, cgu->base + CGU_REG_I2SCDR);
>> +
>> + return 0;
>> +}
>> +
>> +static unsigned long x1830_i2s_recalc_rate(struct clk_hw *hw,
>> + unsigned long parent_rate)
>> +{
>> + unsigned m, n;
>> + u32 i2scdr;
>> +
>> + i2scdr = readl(cgu->base + CGU_REG_I2SCDR);
>> +
>> + m = (i2scdr & I2SCDR_I2SDIV_M_MASK) >> I2SCDR_I2SDIV_M_SHIFT;
>> + n = (i2scdr & I2SCDR_I2SDIV_N_MASK) >> I2SCDR_I2SDIV_N_SHIFT;
>> +
>> + return div_u64((u64)parent_rate * m, n);
>
> From what I can see here, your i2s clock is a PLL. You can probably
> use CGU_CLK_PLL, with od_bits = od_max = 0 (you'll need to remove the
> second BUG_ON() in ingenic_pll_recalc_rate).
>
Unfortunately, due to constraints, we cannot use it for i2s with only
minor changes to the code related to CGU_CLK_PLL. Because in main PLLs
such as APLL and MPLL, the value of M is often much larger than the
value of N, but in i2s, the value of N must not be less than twice the
value of M. So there is no way to achieve these two constraints at the
same time, which leads us to use CGU_CLK_PLL, so I chose to use
CGU_CLK_CUSTOM as a last resort. I haven't figured out a better way yet.
Do you have any good ideas?
Thanks and best regards!
> Cheers,
> -Paul
>
>> +}
>> +
>> +static unsigned long x1830_i2s_calc(unsigned long rate, unsigned
>> long parent_rate,
>> + unsigned *pm, unsigned *pn)
>> +{
>> + u64 curr_delta, curr_m, curr_n, delta, m, n;
>> +
>> + if ((parent_rate % rate == 0) && ((parent_rate / rate) > 1)) {
>> + m = 1;
>> + n = parent_rate / rate;
>> + goto out;
>> + }
>> +
>> + delta = rate;
>> +
>> + /*
>> + * The length of M is 9 bits, its value must be between 1 and 511.
>> + * The length of N is 20 bits, its value must be between 2 and
>> 1048575,
>> + * and must not be less than 2 times of the value of M.
>> + */
>> + for (curr_m = 511; curr_m >= 1; curr_m--) {
>> + curr_n = parent_rate * curr_m;
>> + curr_delta = do_div(curr_n, rate);
>> +
>> + if (curr_n < 2 * curr_m || curr_n > 1048575)
>> + continue;
>> +
>> + if (curr_delta == 0)
>> + break;
>> +
>> + if (curr_delta < delta) {
>> + m = curr_m;
>> + n = curr_n;
>> + delta = curr_delta;
>> + }
>> + }
>> +
>> +out:
>> + if (pm)
>> + *pm = m;
>> + if (pn)
>> + *pn = n;
>> +
>> + return div_u64((u64)parent_rate * m, n);
>> +}
>> +
>> +static long x1830_i2s_round_rate(struct clk_hw *hw, unsigned long
>> req_rate,
>> + unsigned long *prate)
>> +{
>> + return x1830_i2s_calc(req_rate, *prate, NULL, NULL);
>> +}
>> +
>> +static int x1830_i2s_set_rate(struct clk_hw *hw, unsigned long
>> req_rate,
>> + unsigned long parent_rate)
>> +{
>> + unsigned long rate;
>> + unsigned m, n;
>> + u32 ctl;
>> +
>> + /*
>> + * The parent clock rate of I2S must not be lower than 2 times
>> + * of the target clock rate.
>> + */
>> + if (parent_rate < 2 * req_rate)
>> + return -EINVAL;
>> +
>> + rate = x1830_i2s_calc(req_rate, parent_rate, &m, &n);
>> + if (rate != req_rate)
>> + pr_info("%s: request I2S rate %luHz, actual %luHz\n", __func__,
>> + req_rate, rate);
>> +
>> + ctl = readl(cgu->base + CGU_REG_I2SCDR);
>> + ctl &= ~I2SCDR_I2SDIV_M_MASK;
>> + ctl |= m << I2SCDR_I2SDIV_M_SHIFT;
>> + ctl &= ~I2SCDR_I2SDIV_N_MASK;
>> + ctl |= n << I2SCDR_I2SDIV_N_SHIFT;
>> + writel(ctl, cgu->base + CGU_REG_I2SCDR);
>> +
>> + return 0;
>> +}
>> +
>> +static int x1830_i2s_enable(struct clk_hw *hw)
>> +{
>> + u32 ctl;
>> +
>> + ctl = readl(cgu->base + CGU_REG_I2SCDR);
>> + ctl |= I2SCDR_CE_I2S;
>> + writel(ctl, cgu->base + CGU_REG_I2SCDR);
>> +
>> + return 0;
>> +}
>> +
>> +static void x1830_i2s_disable(struct clk_hw *hw)
>> +{
>> + u32 ctl;
>> +
>> + ctl = readl(cgu->base + CGU_REG_I2SCDR);
>> + ctl &= ~I2SCDR_CE_I2S;
>> + writel(ctl, cgu->base + CGU_REG_I2SCDR);
>> +}
>> +
>> +static int x1830_i2s_is_enabled(struct clk_hw *hw)
>> +{
>> + u32 ctl;
>> +
>> + ctl = readl(cgu->base + CGU_REG_I2SCDR);
>> +
>> + return !!(ctl & I2SCDR_CE_I2S);
>> +}
>> +
>> +static const struct clk_ops x1830_i2s_ops = {
>> + .get_parent = x1830_i2s_get_parent,
>> + .set_parent = x1830_i2s_set_parent,
>> +
>> + .recalc_rate = x1830_i2s_recalc_rate,
>> + .round_rate = x1830_i2s_round_rate,
>> + .set_rate = x1830_i2s_set_rate,
>> +
>> + .enable = x1830_i2s_enable,
>> + .disable = x1830_i2s_disable,
>> + .is_enabled = x1830_i2s_is_enabled,
>> +};
>> +
>> static const s8 pll_od_encoding[64] = {
>> 0x0, 0x1, -1, 0x2, -1, -1, -1, 0x3,
>> -1, -1, -1, -1, -1, -1, -1, 0x4,
>> @@ -201,7 +361,7 @@ static const struct ingenic_cgu_clk_info
>> x1830_cgu_clocks[] = {
>> },
>> },
>>
>> - /* Custom (SoC-specific) OTG PHY */
>> + /* Custom (SoC-specific) */
>>
>> [X1830_CLK_OTGPHY] = {
>> "otg_phy", CGU_CLK_CUSTOM,
>> @@ -209,6 +369,13 @@ static const struct ingenic_cgu_clk_info
>> x1830_cgu_clocks[] = {
>> .custom = { &x1830_otg_phy_ops },
>> },
>>
>> + [X1830_CLK_I2S] = {
>> + "i2s", CGU_CLK_CUSTOM,
>> + .parents = { X1830_CLK_SCLKA, X1830_CLK_MPLL,
>> + X1830_CLK_VPLL, X1830_CLK_EPLL },
>> + .custom = { &x1830_i2s_ops },
>> + },
>> +
>> /* Muxes & dividers */
>>
>> [X1830_CLK_SCLKA] = {
>> @@ -329,6 +496,14 @@ static const struct ingenic_cgu_clk_info
>> x1830_cgu_clocks[] = {
>> .mux = { CGU_REG_SSICDR, 29, 1 },
>> },
>>
>> + [X1830_CLK_CIM] = {
>> + "cim", CGU_CLK_MUX | CGU_CLK_DIV,
>> + .parents = { X1830_CLK_SCLKA, X1830_CLK_MPLL,
>> + X1830_CLK_VPLL, X1830_CLK_EPLL },
>> + .mux = { CGU_REG_CIMCDR, 30, 2 },
>> + .div = { CGU_REG_CIMCDR, 0, 1, 8, 29, 28, 27 },
>> + },
>> +
>> [X1830_CLK_EXCLK_DIV512] = {
>> "exclk_div512", CGU_CLK_FIXDIV,
>> .parents = { X1830_CLK_EXCLK },
>> @@ -386,6 +561,18 @@ static const struct ingenic_cgu_clk_info
>> x1830_cgu_clocks[] = {
>> .gate = { CGU_REG_CLKGR0, 9 },
>> },
>>
>> + [X1830_CLK_AIC] = {
>> + "aic", CGU_CLK_GATE,
>> + .parents = { X1830_CLK_EXCLK, -1, -1, -1 },
>> + .gate = { CGU_REG_CLKGR0, 11 },
>> + },
>> +
>> + [X1830_CLK_DMIC] = {
>> + "dmic", CGU_CLK_GATE,
>> + .parents = { X1830_CLK_PCLK, -1, -1, -1 },
>> + .gate = { CGU_REG_CLKGR0, 12 },
>> + },
>> +
>> [X1830_CLK_UART0] = {
>> "uart0", CGU_CLK_GATE,
>> .parents = { X1830_CLK_EXCLK, -1, -1, -1 },
>> --
>> 2.7.4
>>
>
Powered by blists - more mailing lists