Message ID | 20211021174223.43310-7-kernel@esmil.dk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Basic StarFive JH7100 RISC-V SoC support | expand |
On Thu, Oct 21, 2021 at 8:43 PM Emil Renner Berthing <kernel@esmil.dk> wrote: ... > +static struct clk_hw *clk_starfive_jh7100_get(struct of_phandle_args *clkspec, void *data) > +{ > + struct clk_starfive_jh7100_priv *priv = data; > + unsigned int idx = clkspec->args[0]; > + > + if (idx >= JH7100_CLK_END) { > + dev_err(priv->dev, "invalid clock index %u\n", idx); > + return ERR_PTR(-EINVAL); After this https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git/commit/?h=driver-core-next&id=7065f92255bb2468dbb9aa0537ff186ef64d5a02 It's okay to use > + } if (idx >= JH7100_CLK_END) return dev_err_probe(priv->dev, -EINVAL, "invalid clock index %u\n", idx); Ditto for other similar cases. > + if (idx >= JH7100_CLK_PLL0_OUT) > + return priv->pll[idx - JH7100_CLK_PLL0_OUT]; > + > + return &priv->reg[idx].hw; > +} ... > + while (idx) > + clk_hw_unregister(&priv->reg[--idx].hw); I still consider that usual pattern, i.e. while (idx--) clk_hw_unregister(&priv->reg[idx].hw); but since you are pushing hard for your variant I'll leave it to the maintainers and author.
On Fri, Oct 22, 2021 at 2:34 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > On Thu, Oct 21, 2021 at 8:43 PM Emil Renner Berthing <kernel@esmil.dk> wrote: > > + while (idx) > > + clk_hw_unregister(&priv->reg[--idx].hw); > > I still consider that usual pattern, i.e. > > while (idx--) > clk_hw_unregister(&priv->reg[idx].hw); > > but since you are pushing hard for your variant I'll leave it to the > maintainers and author. I agree with Andy. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Fri, 22 Oct 2021 at 14:34, Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > On Thu, Oct 21, 2021 at 8:43 PM Emil Renner Berthing <kernel@esmil.dk> wrote: > > ... > > > +static struct clk_hw *clk_starfive_jh7100_get(struct of_phandle_args *clkspec, void *data) > > +{ > > + struct clk_starfive_jh7100_priv *priv = data; > > + unsigned int idx = clkspec->args[0]; > > + > > + if (idx >= JH7100_CLK_END) { > > + dev_err(priv->dev, "invalid clock index %u\n", idx); > > + return ERR_PTR(-EINVAL); > > After this > https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git/commit/?h=driver-core-next&id=7065f92255bb2468dbb9aa0537ff186ef64d5a02 > It's okay to use > > > + } > > if (idx >= JH7100_CLK_END) > return dev_err_probe(priv->dev, -EINVAL, "invalid clock > index %u\n", idx); > > Ditto for other similar cases. Hmm.. this function doesn't return int, but struct clk_hw *, hence the ERR_PTR. Also I don't see any other similar cases in this driver. > > + if (idx >= JH7100_CLK_PLL0_OUT) > > + return priv->pll[idx - JH7100_CLK_PLL0_OUT]; > > + > > + return &priv->reg[idx].hw; > > +} > > ... > > > + while (idx) > > + clk_hw_unregister(&priv->reg[--idx].hw); > > I still consider that usual pattern, i.e. > > while (idx--) > clk_hw_unregister(&priv->reg[idx].hw); > > but since you are pushing hard for your variant I'll leave it to the > maintainers and author. > > -- > With Best Regards, > Andy Shevchenko
On Fri, Oct 22, 2021 at 4:13 PM Emil Renner Berthing <kernel@esmil.dk> wrote: > On Fri, 22 Oct 2021 at 14:34, Andy Shevchenko <andy.shevchenko@gmail.com> wrote: ... > Hmm.. this function doesn't return int, but struct clk_hw *, hence the ERR_PTR. Ah, indeed, sorry. Got your point. Of course one may try 'return ERR_PTR(dev_err_probe())', but this looks ugly.
Quoting Emil Renner Berthing (2021-10-21 10:42:13) > diff --git a/drivers/clk/starfive/clk-starfive-jh7100.c b/drivers/clk/starfive/clk-starfive-jh7100.c > new file mode 100644 > index 000000000000..f109576f18c5 > --- /dev/null > +++ b/drivers/clk/starfive/clk-starfive-jh7100.c > @@ -0,0 +1,776 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * StarFive JH7100 Clock Generator Driver > + * > + * Copyright 2021 Ahmad Fatoum, Pengutronix > + * Copyright (C) 2021 Glider bv > + * Copyright (C) 2021 Emil Renner Berthing <kernel@esmil.dk> > + */ > + > +#include <linux/bits.h> > +#include <linux/clk.h> Is this include used? > +#include <linux/clk-provider.h> > +#include <linux/debugfs.h> > +#include <linux/device.h> > +#include <linux/init.h> > +#include <linux/io.h> > +#include <linux/kernel.h> > +#include <linux/mod_devicetable.h> > +#include <linux/module.h> > +#include <linux/overflow.h> Is this include used? > +#include <linux/platform_device.h> > + > +#include <dt-bindings/clock/starfive-jh7100.h> > + > +#define JH7100_CLK_ENABLE_SHIFT 31 > +#define JH7100_CLK_INVERT_SHIFT 30 > +#define JH7100_CLK_MUX_SHIFT 24 > + > +#define JH7100_CLK_ENABLE BIT(31) > +#define JH7100_CLK_INVERT BIT(30) > +#define JH7100_CLK_MUX_MASK GENMASK(27, 24) > +#define JH7100_CLK_DIV_MASK GENMASK(23, 0) > + > +static const char *const cpundbus_root_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "pll0_out", > + [2] = "pll1_out", > + [3] = "pll2_out", > +}; > + > +static const char *const dla_root_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "pll1_out", > + [2] = "pll2_out", > +}; > + > +static const char *const dsp_root_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "pll0_out", > + [2] = "pll1_out", > + [3] = "pll2_out", > +}; > + > +static const char *const gmacusb_root_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "pll0_out", > + [2] = "pll2_out", > +}; > + > +static const char *const perh0_root_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "pll0_out", > +}; > + > +static const char *const perh1_root_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "pll2_out", > +}; > + > +static const char *const vin_root_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "pll1_out", > + [2] = "pll2_out", > +}; > + > +static const char *const vout_root_sels[] __initconst = { > + [0] = "osc_aud", > + [1] = "pll0_out", > + [2] = "pll2_out", > +}; > + > +static const char *const cdechifi4_root_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "pll1_out", > + [2] = "pll2_out", > +}; > + > +static const char *const cdec_root_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "pll0_out", > + [2] = "pll1_out", > +}; > + > +static const char *const voutbus_root_sels[] __initconst = { > + [0] = "osc_aud", > + [1] = "pll0_out", > + [2] = "pll2_out", > +}; > + > +static const char *const pll2_refclk_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "osc_aud", > +}; > + > +static const char *const ddrc0_sels[] __initconst = { > + [0] = "ddrosc_div2", > + [1] = "ddrpll_div2", > + [2] = "ddrpll_div4", > + [3] = "ddrpll_div8", > +}; > + > +static const char *const ddrc1_sels[] __initconst = { > + [0] = "ddrosc_div2", > + [1] = "ddrpll_div2", > + [2] = "ddrpll_div4", > + [3] = "ddrpll_div8", > +}; > + > +static const char *const nne_bus_sels[] __initconst = { > + [0] = "cpu_axi", > + [1] = "nnebus_src1", > +}; > + > +static const char *const usbphy_25m_sels[] __initconst = { > + [0] = "osc_sys", > + [1] = "usbphy_plldiv25m", > +}; > + > +static const char *const gmac_tx_sels[] __initconst = { > + [0] = "gmac_gtxclk", > + [1] = "gmac_mii_txclk", > + [2] = "gmac_rmii_txclk", > +}; > + > +static const char *const gmac_rx_pre_sels[] __initconst = { > + [0] = "gmac_gr_mii_rxclk", > + [1] = "gmac_rmii_rxclk", > +}; > + > +struct jh7100_clk { > + struct clk_hw hw; > + unsigned int idx; > + u32 max; Why u32? > +}; > + > +struct clk_starfive_jh7100_priv { > + /* protect registers against overlapping read-modify-write */ > + spinlock_t rmw_lock; Does overlapping mean concurrent? Do different clks share the same registers? > + struct device *dev; > + void __iomem *base; > + struct clk_hw *pll[3]; > + struct jh7100_clk reg[JH7100_CLK_PLL0_OUT]; > +}; > + > +static struct jh7100_clk *jh7100_clk_from(struct clk_hw *hw) > +{ > + return container_of(hw, struct jh7100_clk, hw); > +} > + > +static struct clk_starfive_jh7100_priv *jh7100_priv_from(struct jh7100_clk *clk) > +{ > + return container_of(clk, struct clk_starfive_jh7100_priv, reg[clk->idx]); > +} > + > +static u32 jh7100_clk_reg_get(struct jh7100_clk *clk) > +{ > + struct clk_starfive_jh7100_priv *priv = jh7100_priv_from(clk); > + void __iomem *reg = priv->base + 4 * clk->idx; > + > + return readl_relaxed(reg); > +} > + > +static void jh7100_clk_reg_rmw(struct jh7100_clk *clk, u32 mask, u32 value) > +{ > + struct clk_starfive_jh7100_priv *priv = jh7100_priv_from(clk); > + void __iomem *reg = priv->base + 4 * clk->idx; > + unsigned long flags; > + > + spin_lock_irqsave(&priv->rmw_lock, flags); > + value |= readl_relaxed(reg) & ~mask; > + writel_relaxed(value, reg); > + spin_unlock_irqrestore(&priv->rmw_lock, flags); > +} > + > +static int jh7100_clk_enable(struct clk_hw *hw) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + > + dev_dbg(jh7100_priv_from(clk)->dev, "enable(%s)\n", clk_hw_get_name(&clk->hw)); > + > + jh7100_clk_reg_rmw(clk, JH7100_CLK_ENABLE, JH7100_CLK_ENABLE); > + return 0; > +} > + > +static void jh7100_clk_disable(struct clk_hw *hw) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + > + dev_dbg(jh7100_priv_from(clk)->dev, "disable(%s)\n", clk_hw_get_name(&clk->hw)); > + > + jh7100_clk_reg_rmw(clk, JH7100_CLK_ENABLE, 0); > +} > + > +static int jh7100_clk_is_enabled(struct clk_hw *hw) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + > + return !!(jh7100_clk_reg_get(clk) & JH7100_CLK_ENABLE); > +} > + > +static int jh7100_clk_is_parent_enabled(struct clk_hw *hw) > +{ > + return clk_hw_is_enabled(clk_hw_get_parent(hw)); Why do we need this function? The parent being enabled implies this clk is enabled if this clk can't gate itself but then knowing this clk is enabled is useful for what? > +} > + > +static unsigned long jh7100_clk_recalc_rate(struct clk_hw *hw, > + unsigned long parent_rate) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + u32 value = jh7100_clk_reg_get(clk) & JH7100_CLK_DIV_MASK; > + unsigned long rate; > + > + if (value) > + rate = parent_rate / value; > + else > + rate = 0; > + > + dev_dbg(jh7100_priv_from(clk)->dev, "recalc_rate(%s, %lu) = %lu (div %u)\n", > + clk_hw_get_name(&clk->hw), parent_rate, rate, value); > + > + return rate; > +} > + > +static unsigned long jh7100_clk_bestdiv(struct jh7100_clk *clk, > + unsigned long rate, unsigned long parent) > +{ > + unsigned long max = clk->max & JH7100_CLK_DIV_MASK; > + unsigned long div = DIV_ROUND_UP(parent, rate); > + > + return min(div, max); > +} > + > +static int jh7100_clk_determine_rate(struct clk_hw *hw, > + struct clk_rate_request *req) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + unsigned long parent = req->best_parent_rate; > + unsigned long rate = clamp(req->rate, req->min_rate, req->max_rate); > + unsigned long div = jh7100_clk_bestdiv(clk, rate, parent); > + unsigned long result = parent / div; > + > + /* > + * We want the result clamped by min_rate and max_rate if possible: > + * Case 1: div hits the max divider value, which means it's less than > + * parent / rate, so the result is greater than rate and min_rate in > + * particular. We can't do anything about result > max_rate because the > + * divider doesn't go any further. > + * Case 2: div = DIV_ROUND_UP(parent, rate) which means the result is > + * always lower or equal to rate and max_rate. However the result may > + * turn out lower than min_rate, but then the next higher rate is fine: > + * div - 1 = ceil(parent / rate) - 1 < parent / rate > + * and thus > + * min_rate <= rate < parent / (div - 1) > + */ > + if (result < req->min_rate && div > 1) { > + div -= 1; > + result = parent / div; > + } > + > + dev_dbg(jh7100_priv_from(clk)->dev, > + "determine_rate(%s, {%lu<=%lu<=%lu from %lu}) = %lu (div %lu)\n", > + clk_hw_get_name(&clk->hw), req->min_rate, req->rate, req->max_rate, > + parent, result, div); > + > + req->rate = result; > + return 0; > +} > + > +static int jh7100_clk_set_rate(struct clk_hw *hw, > + unsigned long rate, > + unsigned long parent_rate) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + unsigned long div = jh7100_clk_bestdiv(clk, rate, parent_rate); > + > + dev_dbg(jh7100_priv_from(clk)->dev, > + "set_rate(%s, %lu, %lu) = %lu (div %lu)\n", > + clk_hw_get_name(&clk->hw), rate, parent_rate, > + parent_rate / div, div); > + > + jh7100_clk_reg_rmw(clk, JH7100_CLK_DIV_MASK, div); > + return 0; > +} > + > +static u8 jh7100_clk_get_parent(struct clk_hw *hw) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + u32 value = jh7100_clk_reg_get(clk); > + > + return (value & JH7100_CLK_MUX_MASK) >> JH7100_CLK_MUX_SHIFT; > +} > + > +static int jh7100_clk_set_parent(struct clk_hw *hw, u8 index) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + u32 value = (u32)index << JH7100_CLK_MUX_SHIFT; > + > + dev_dbg(jh7100_priv_from(clk)->dev, "set_parent(%s, %u)\n", > + clk_hw_get_name(&clk->hw), index); Please remove these dev_dbg() messages. We have tracepoints for general clk operations and the driver shouldn't duplicate that. > + > + jh7100_clk_reg_rmw(clk, JH7100_CLK_MUX_MASK, value); > + return 0; > +} > + > +static int jh7100_clk_mux_determine_rate(struct clk_hw *hw, > + struct clk_rate_request *req) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + int ret = clk_mux_determine_rate_flags(&clk->hw, req, 0); > + > + dev_dbg(jh7100_priv_from(clk)->dev, "determine_rate(%s) = %d\n", > + clk_hw_get_name(&clk->hw), ret); > + > + return ret; > +} > + > +static int jh7100_clk_get_phase(struct clk_hw *hw) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + u32 value = jh7100_clk_reg_get(clk); > + > + return (value & JH7100_CLK_INVERT) ? 180 : 0; > +} > + > +static int jh7100_clk_set_phase(struct clk_hw *hw, int degrees) > +{ > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + u32 value; > + > + dev_dbg(jh7100_priv_from(clk)->dev, "set_phase(%s, %d)\n", > + clk_hw_get_name(&clk->hw), degrees); > + > + if (degrees == 0) > + value = 0; > + else if (degrees == 180) > + value = JH7100_CLK_INVERT; > + else > + return -EINVAL; > + > + jh7100_clk_reg_rmw(clk, JH7100_CLK_INVERT, value); > + return 0; > +} > + > +#ifdef CONFIG_DEBUG_FS > +static void jh7100_clk_debug_init(struct clk_hw *hw, struct dentry *dentry) > +{ > + static const struct debugfs_reg32 jh7100_clk_reg = { > + .name = "CTRL", > + .offset = 0, > + }; > + struct jh7100_clk *clk = jh7100_clk_from(hw); > + struct clk_starfive_jh7100_priv *priv = jh7100_priv_from(clk); > + struct debugfs_regset32 *regset; > + > + regset = devm_kzalloc(priv->dev, sizeof(*regset), GFP_KERNEL); > + if (!regset) > + return; > + > + regset->regs = &jh7100_clk_reg; > + regset->nregs = 1; > + regset->base = priv->base + 4 * clk->idx; > + > + debugfs_create_regset32("registers", 0400, dentry, regset); > +} > +#else > +#define jh7100_clk_debug_init NULL > +#endif > + > +static const struct clk_ops jh7100_clk_gate_ops = { > + .enable = jh7100_clk_enable, > + .disable = jh7100_clk_disable, > + .is_enabled = jh7100_clk_is_enabled, > + .debug_init = jh7100_clk_debug_init, > +}; > + > +static const struct clk_ops jh7100_clk_div_ops = { > + .is_enabled = jh7100_clk_is_parent_enabled, > + .recalc_rate = jh7100_clk_recalc_rate, > + .determine_rate = jh7100_clk_determine_rate, > + .set_rate = jh7100_clk_set_rate, > + .debug_init = jh7100_clk_debug_init, > +}; > + > +static const struct clk_ops jh7100_clk_gdiv_ops = { > + .enable = jh7100_clk_enable, > + .disable = jh7100_clk_disable, > + .is_enabled = jh7100_clk_is_enabled, > + .recalc_rate = jh7100_clk_recalc_rate, > + .determine_rate = jh7100_clk_determine_rate, > + .set_rate = jh7100_clk_set_rate, > + .debug_init = jh7100_clk_debug_init, > +}; > + > +static const struct clk_ops jh7100_clk_mux_ops = { > + .is_enabled = jh7100_clk_is_parent_enabled, > + .get_parent = jh7100_clk_get_parent, > + .set_parent = jh7100_clk_set_parent, > + .determine_rate = jh7100_clk_mux_determine_rate, > + .debug_init = jh7100_clk_debug_init, > +}; > + > +static const struct clk_ops jh7100_clk_gmux_ops = { > + .enable = jh7100_clk_enable, > + .disable = jh7100_clk_disable, > + .is_enabled = jh7100_clk_is_enabled, > + .get_parent = jh7100_clk_get_parent, > + .set_parent = jh7100_clk_set_parent, > + .determine_rate = jh7100_clk_mux_determine_rate, > + .debug_init = jh7100_clk_debug_init, > +}; > + > +static const struct clk_ops jh7100_clk_inv_ops = { > + .is_enabled = jh7100_clk_is_parent_enabled, > + .get_phase = jh7100_clk_get_phase, > + .set_phase = jh7100_clk_set_phase, > + .debug_init = jh7100_clk_debug_init, > +}; > + > +#define JH7100_GATE(_idx, _name, _parent, _flags) [_idx] = { \ Typical macro style is to tab out the \ to a single column > + .name = _name, \ > + .ops = &jh7100_clk_gate_ops, \ > + .parent = _parent, \ > + .flags = CLK_SET_RATE_PARENT | (_flags), \ > + .max = JH7100_CLK_ENABLE, \ > +} > + > +#define JH7100__DIV(_idx, _name, _parent, _max) [_idx] = { \ > + .name = _name, \ > + .ops = &jh7100_clk_div_ops, \ > + .parent = _parent, \ > + .flags = 0, \ > + .max = _max, \ > +} > + > +#define JH7100_GDIV(_idx, _name, _parent, _max, _flags) [_idx] = { \ > + .name = _name, \ > + .ops = &jh7100_clk_gdiv_ops, \ > + .parent = _parent, \ > + .flags = (_flags), \ > + .max = JH7100_CLK_ENABLE | (_max), \ > +} > + > +#define JH7100__MUX(_idx, _name, _parents) [_idx] = { \ > + .name = _name, \ > + .ops = &jh7100_clk_mux_ops, \ > + .parents = _parents, \ > + .flags = 0, \ > + .max = (ARRAY_SIZE(_parents) - 1) << JH7100_CLK_MUX_SHIFT, \ > +} > + > +#define JH7100_GMUX(_idx, _name, _parents, _flags) [_idx] = { \ > + .name = _name, \ > + .ops = &jh7100_clk_gmux_ops, \ > + .parents = _parents, \ > + .flags = (_flags), \ > + .max = JH7100_CLK_ENABLE | \ > + ((ARRAY_SIZE(_parents) - 1) << JH7100_CLK_MUX_SHIFT), \ > +} > + > +#define JH7100__INV(_idx, _name, _parent) [_idx] = { \ > + .name = _name, \ > + .ops = &jh7100_clk_inv_ops, \ > + .parent = _parent, \ > + .flags = CLK_SET_RATE_PARENT, \ > + .max = JH7100_CLK_INVERT, \ > +} > + > +static const struct { > + const char *name; > + const struct clk_ops *ops; > + union { > + const char *parent; > + const char *const *parents; > + }; > + unsigned long flags; > + u32 max; > +} jh7100_clk_data[] __initconst = { > + JH7100__MUX(JH7100_CLK_CPUNDBUS_ROOT, "cpundbus_root", cpundbus_root_sels), > + JH7100__MUX(JH7100_CLK_DLA_ROOT, "dla_root", dla_root_sels), > + JH7100__MUX(JH7100_CLK_DSP_ROOT, "dsp_root", dsp_root_sels), > + JH7100__MUX(JH7100_CLK_GMACUSB_ROOT, "gmacusb_root", gmacusb_root_sels), > + JH7100__MUX(JH7100_CLK_PERH0_ROOT, "perh0_root", perh0_root_sels), > + JH7100__MUX(JH7100_CLK_PERH1_ROOT, "perh1_root", perh1_root_sels), > + JH7100__MUX(JH7100_CLK_VIN_ROOT, "vin_root", vin_root_sels), > + JH7100__MUX(JH7100_CLK_VOUT_ROOT, "vout_root", vout_root_sels), > + JH7100_GDIV(JH7100_CLK_AUDIO_ROOT, "audio_root", "pll0_out", 8, 0), > + JH7100__MUX(JH7100_CLK_CDECHIFI4_ROOT, "cdechifi4_root", cdechifi4_root_sels), > + JH7100__MUX(JH7100_CLK_CDEC_ROOT, "cdec_root", cdec_root_sels), > + JH7100__MUX(JH7100_CLK_VOUTBUS_ROOT, "voutbus_root", voutbus_root_sels), > + JH7100__DIV(JH7100_CLK_CPUNBUS_ROOT_DIV, "cpunbus_root_div", "cpundbus_root", 2), > + JH7100__DIV(JH7100_CLK_DSP_ROOT_DIV, "dsp_root_div", "dsp_root", 4), > + JH7100__DIV(JH7100_CLK_PERH0_SRC, "perh0_src", "perh0_root", 4), > + JH7100__DIV(JH7100_CLK_PERH1_SRC, "perh1_src", "perh1_root", 4), > + JH7100_GDIV(JH7100_CLK_PLL0_TESTOUT, "pll0_testout", "perh0_src", 31, 0), > + JH7100_GDIV(JH7100_CLK_PLL1_TESTOUT, "pll1_testout", "dla_root", 31, 0), > + JH7100_GDIV(JH7100_CLK_PLL2_TESTOUT, "pll2_testout", "perh1_src", 31, 0), > + JH7100__MUX(JH7100_CLK_PLL2_REF, "pll2_refclk", pll2_refclk_sels), > + JH7100__DIV(JH7100_CLK_CPU_CORE, "cpu_core", "cpunbus_root_div", 8), > + JH7100__DIV(JH7100_CLK_CPU_AXI, "cpu_axi", "cpu_core", 8), > + JH7100__DIV(JH7100_CLK_AHB_BUS, "ahb_bus", "cpunbus_root_div", 8), > + JH7100__DIV(JH7100_CLK_APB1_BUS, "apb1_bus", "ahb_bus", 8), > + JH7100__DIV(JH7100_CLK_APB2_BUS, "apb2_bus", "ahb_bus", 8), > + JH7100_GATE(JH7100_CLK_DOM3AHB_BUS, "dom3ahb_bus", "ahb_bus", CLK_IGNORE_UNUSED), > + JH7100_GATE(JH7100_CLK_DOM7AHB_BUS, "dom7ahb_bus", "ahb_bus", CLK_IGNORE_UNUSED), > + JH7100_GATE(JH7100_CLK_U74_CORE0, "u74_core0", "cpu_core", CLK_IGNORE_UNUSED), > + JH7100_GDIV(JH7100_CLK_U74_CORE1, "u74_core1", "cpu_core", 8, CLK_IGNORE_UNUSED), > + JH7100_GATE(JH7100_CLK_U74_AXI, "u74_axi", "cpu_axi", CLK_IGNORE_UNUSED), > + JH7100_GATE(JH7100_CLK_U74RTC_TOGGLE, "u74rtc_toggle", "osc_sys", CLK_IGNORE_UNUSED), > + JH7100_GATE(JH7100_CLK_SGDMA2P_AXI, "sgdma2p_axi", "cpu_axi", 0), > + JH7100_GATE(JH7100_CLK_DMA2PNOC_AXI, "dma2pnoc_axi", "cpu_axi", 0), > + JH7100_GATE(JH7100_CLK_SGDMA2P_AHB, "sgdma2p_ahb", "ahb_bus", 0), > + JH7100__DIV(JH7100_CLK_DLA_BUS, "dla_bus", "dla_root", 4), > + JH7100_GATE(JH7100_CLK_DLA_AXI, "dla_axi", "dla_bus", 0), > + JH7100_GATE(JH7100_CLK_DLANOC_AXI, "dlanoc_axi", "dla_bus", 0), > + JH7100_GATE(JH7100_CLK_DLA_APB, "dla_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_VP6_CORE, "vp6_core", "dsp_root_div", 4, 0), > + JH7100__DIV(JH7100_CLK_VP6BUS_SRC, "vp6bus_src", "dsp_root", 4), > + JH7100_GDIV(JH7100_CLK_VP6_AXI, "vp6_axi", "vp6bus_src", 4, 0), > + JH7100__DIV(JH7100_CLK_VCDECBUS_SRC, "vcdecbus_src", "cdechifi4_root", 4), > + JH7100__DIV(JH7100_CLK_VDEC_BUS, "vdec_bus", "vcdecbus_src", 8), > + JH7100_GATE(JH7100_CLK_VDEC_AXI, "vdec_axi", "vdec_bus", 0), > + JH7100_GATE(JH7100_CLK_VDECBRG_MAIN, "vdecbrg_mainclk", "vdec_bus", 0), > + JH7100_GDIV(JH7100_CLK_VDEC_BCLK, "vdec_bclk", "vcdecbus_src", 8, 0), > + JH7100_GDIV(JH7100_CLK_VDEC_CCLK, "vdec_cclk", "cdec_root", 8, 0), > + JH7100_GATE(JH7100_CLK_VDEC_APB, "vdec_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_JPEG_AXI, "jpeg_axi", "cpunbus_root_div", 8, 0), > + JH7100_GDIV(JH7100_CLK_JPEG_CCLK, "jpeg_cclk", "cpunbus_root_div", 8, 0), > + JH7100_GATE(JH7100_CLK_JPEG_APB, "jpeg_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_GC300_2X, "gc300_2x", "cdechifi4_root", 8, 0), > + JH7100_GATE(JH7100_CLK_GC300_AHB, "gc300_ahb", "ahb_bus", 0), > + JH7100__DIV(JH7100_CLK_JPCGC300_AXIBUS, "jpcgc300_axibus", "vcdecbus_src", 8), > + JH7100_GATE(JH7100_CLK_GC300_AXI, "gc300_axi", "jpcgc300_axibus", 0), > + JH7100_GATE(JH7100_CLK_JPCGC300_MAIN, "jpcgc300_mainclk", "jpcgc300_axibus", 0), > + JH7100__DIV(JH7100_CLK_VENC_BUS, "venc_bus", "vcdecbus_src", 8), > + JH7100_GATE(JH7100_CLK_VENC_AXI, "venc_axi", "venc_bus", 0), > + JH7100_GATE(JH7100_CLK_VENCBRG_MAIN, "vencbrg_mainclk", "venc_bus", 0), > + JH7100_GDIV(JH7100_CLK_VENC_BCLK, "venc_bclk", "vcdecbus_src", 8, 0), > + JH7100_GDIV(JH7100_CLK_VENC_CCLK, "venc_cclk", "cdec_root", 8, 0), > + JH7100_GATE(JH7100_CLK_VENC_APB, "venc_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_DDRPLL_DIV2, "ddrpll_div2", "pll1_out", 2, CLK_IGNORE_UNUSED), > + JH7100_GDIV(JH7100_CLK_DDRPLL_DIV4, "ddrpll_div4", "ddrpll_div2", 2, CLK_IGNORE_UNUSED), > + JH7100_GDIV(JH7100_CLK_DDRPLL_DIV8, "ddrpll_div8", "ddrpll_div4", 2, CLK_IGNORE_UNUSED), > + JH7100_GDIV(JH7100_CLK_DDROSC_DIV2, "ddrosc_div2", "osc_sys", 2, CLK_IGNORE_UNUSED), > + JH7100_GMUX(JH7100_CLK_DDRC0, "ddrc0", ddrc0_sels, CLK_IGNORE_UNUSED), > + JH7100_GMUX(JH7100_CLK_DDRC1, "ddrc1", ddrc1_sels, CLK_IGNORE_UNUSED), Is it really unused? Or it is CLK_IS_CRITICAL? > + JH7100_GATE(JH7100_CLK_DDRPHY_APB, "ddrphy_apb", "apb1_bus", CLK_IGNORE_UNUSED), > + JH7100__DIV(JH7100_CLK_NOC_ROB, "noc_rob", "cpunbus_root_div", 8), > + JH7100__DIV(JH7100_CLK_NOC_COG, "noc_cog", "dla_root", 8), > + JH7100_GATE(JH7100_CLK_NNE_AHB, "nne_ahb", "ahb_bus", 0), > + JH7100__DIV(JH7100_CLK_NNEBUS_SRC1, "nnebus_src1", "dsp_root", 4), > + JH7100__MUX(JH7100_CLK_NNE_BUS, "nne_bus", nne_bus_sels), > + JH7100_GATE(JH7100_CLK_NNE_AXI, "nne_axi", "nne_bus", 0), > + JH7100_GATE(JH7100_CLK_NNENOC_AXI, "nnenoc_axi", "nne_bus", 0), > + JH7100_GATE(JH7100_CLK_DLASLV_AXI, "dlaslv_axi", "nne_bus", 0), > + JH7100_GATE(JH7100_CLK_DSPX2C_AXI, "dspx2c_axi", "nne_bus", CLK_IGNORE_UNUSED), > + JH7100__DIV(JH7100_CLK_HIFI4_SRC, "hifi4_src", "cdechifi4_root", 4), > + JH7100__DIV(JH7100_CLK_HIFI4_COREFREE, "hifi4_corefree", "hifi4_src", 8), > + JH7100_GATE(JH7100_CLK_HIFI4_CORE, "hifi4_core", "hifi4_corefree", 0), > + JH7100__DIV(JH7100_CLK_HIFI4_BUS, "hifi4_bus", "hifi4_corefree", 8), > + JH7100_GATE(JH7100_CLK_HIFI4_AXI, "hifi4_axi", "hifi4_bus", 0), > + JH7100_GATE(JH7100_CLK_HIFI4NOC_AXI, "hifi4noc_axi", "hifi4_bus", 0), > + JH7100__DIV(JH7100_CLK_SGDMA1P_BUS, "sgdma1p_bus", "cpunbus_root_div", 8), > + JH7100_GATE(JH7100_CLK_SGDMA1P_AXI, "sgdma1p_axi", "sgdma1p_bus", 0), > + JH7100_GATE(JH7100_CLK_DMA1P_AXI, "dma1p_axi", "sgdma1p_bus", 0), > + JH7100_GDIV(JH7100_CLK_X2C_AXI, "x2c_axi", "cpunbus_root_div", 8, CLK_IGNORE_UNUSED), > + JH7100__DIV(JH7100_CLK_USB_BUS, "usb_bus", "cpunbus_root_div", 8), > + JH7100_GATE(JH7100_CLK_USB_AXI, "usb_axi", "usb_bus", 0), > + JH7100_GATE(JH7100_CLK_USBNOC_AXI, "usbnoc_axi", "usb_bus", 0), > + JH7100__DIV(JH7100_CLK_USBPHY_ROOTDIV, "usbphy_rootdiv", "gmacusb_root", 4), > + JH7100_GDIV(JH7100_CLK_USBPHY_125M, "usbphy_125m", "usbphy_rootdiv", 8, 0), > + JH7100_GDIV(JH7100_CLK_USBPHY_PLLDIV25M, "usbphy_plldiv25m", "usbphy_rootdiv", 32, 0), > + JH7100__MUX(JH7100_CLK_USBPHY_25M, "usbphy_25m", usbphy_25m_sels), > + JH7100__DIV(JH7100_CLK_AUDIO_DIV, "audio_div", "audio_root", 131072), > + JH7100_GATE(JH7100_CLK_AUDIO_SRC, "audio_src", "audio_div", 0), > + JH7100_GATE(JH7100_CLK_AUDIO_12288, "audio_12288", "osc_aud", 0), > + JH7100_GDIV(JH7100_CLK_VIN_SRC, "vin_src", "vin_root", 4, 0), > + JH7100__DIV(JH7100_CLK_ISP0_BUS, "isp0_bus", "vin_src", 8), > + JH7100_GATE(JH7100_CLK_ISP0_AXI, "isp0_axi", "isp0_bus", 0), > + JH7100_GATE(JH7100_CLK_ISP0NOC_AXI, "isp0noc_axi", "isp0_bus", 0), > + JH7100_GATE(JH7100_CLK_ISPSLV_AXI, "ispslv_axi", "isp0_bus", 0), > + JH7100__DIV(JH7100_CLK_ISP1_BUS, "isp1_bus", "vin_src", 8), > + JH7100_GATE(JH7100_CLK_ISP1_AXI, "isp1_axi", "isp1_bus", 0), > + JH7100_GATE(JH7100_CLK_ISP1NOC_AXI, "isp1noc_axi", "isp1_bus", 0), > + JH7100__DIV(JH7100_CLK_VIN_BUS, "vin_bus", "vin_src", 8), > + JH7100_GATE(JH7100_CLK_VIN_AXI, "vin_axi", "vin_bus", 0), > + JH7100_GATE(JH7100_CLK_VINNOC_AXI, "vinnoc_axi", "vin_bus", 0), > + JH7100_GDIV(JH7100_CLK_VOUT_SRC, "vout_src", "vout_root", 4, 0), > + JH7100__DIV(JH7100_CLK_DISPBUS_SRC, "dispbus_src", "voutbus_root", 4), > + JH7100__DIV(JH7100_CLK_DISP_BUS, "disp_bus", "dispbus_src", 4), > + JH7100_GATE(JH7100_CLK_DISP_AXI, "disp_axi", "disp_bus", 0), > + JH7100_GATE(JH7100_CLK_DISPNOC_AXI, "dispnoc_axi", "disp_bus", 0), > + JH7100_GATE(JH7100_CLK_SDIO0_AHB, "sdio0_ahb", "ahb_bus", 0), > + JH7100_GDIV(JH7100_CLK_SDIO0_CCLKINT, "sdio0_cclkint", "perh0_src", 24, 0), > + JH7100__INV(JH7100_CLK_SDIO0_CCLKINT_INV, "sdio0_cclkint_inv", "sdio0_cclkint"), > + JH7100_GATE(JH7100_CLK_SDIO1_AHB, "sdio1_ahb", "ahb_bus", 0), > + JH7100_GDIV(JH7100_CLK_SDIO1_CCLKINT, "sdio1_cclkint", "perh1_src", 24, 0), > + JH7100__INV(JH7100_CLK_SDIO1_CCLKINT_INV, "sdio1_cclkint_inv", "sdio1_cclkint"), > + JH7100_GATE(JH7100_CLK_GMAC_AHB, "gmac_ahb", "ahb_bus", 0), > + JH7100__DIV(JH7100_CLK_GMAC_ROOT_DIV, "gmac_root_div", "gmacusb_root", 8), > + JH7100_GDIV(JH7100_CLK_GMAC_PTP_REF, "gmac_ptp_refclk", "gmac_root_div", 31, 0), > + JH7100_GDIV(JH7100_CLK_GMAC_GTX, "gmac_gtxclk", "gmac_root_div", 255, 0), > + JH7100_GDIV(JH7100_CLK_GMAC_RMII_TX, "gmac_rmii_txclk", "gmac_rmii_ref", 8, 0), > + JH7100_GDIV(JH7100_CLK_GMAC_RMII_RX, "gmac_rmii_rxclk", "gmac_rmii_ref", 8, 0), > + JH7100__MUX(JH7100_CLK_GMAC_TX, "gmac_tx", gmac_tx_sels), > + JH7100__INV(JH7100_CLK_GMAC_TX_INV, "gmac_tx_inv", "gmac_tx"), > + JH7100__MUX(JH7100_CLK_GMAC_RX_PRE, "gmac_rx_pre", gmac_rx_pre_sels), > + JH7100__INV(JH7100_CLK_GMAC_RX_INV, "gmac_rx_inv", "gmac_rx_pre"), > + JH7100_GATE(JH7100_CLK_GMAC_RMII, "gmac_rmii", "gmac_rmii_ref", 0), > + JH7100_GDIV(JH7100_CLK_GMAC_TOPHYREF, "gmac_tophyref", "gmac_root_div", 127, 0), > + JH7100_GATE(JH7100_CLK_SPI2AHB_AHB, "spi2ahb_ahb", "ahb_bus", 0), > + JH7100_GDIV(JH7100_CLK_SPI2AHB_CORE, "spi2ahb_core", "perh0_src", 31, 0), > + JH7100_GATE(JH7100_CLK_EZMASTER_AHB, "ezmaster_ahb", "ahb_bus", 0), > + JH7100_GATE(JH7100_CLK_E24_AHB, "e24_ahb", "ahb_bus", 0), > + JH7100_GATE(JH7100_CLK_E24RTC_TOGGLE, "e24rtc_toggle", "osc_sys", 0), > + JH7100_GATE(JH7100_CLK_QSPI_AHB, "qspi_ahb", "ahb_bus", 0), > + JH7100_GATE(JH7100_CLK_QSPI_APB, "qspi_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_QSPI_REF, "qspi_refclk", "perh0_src", 31, 0), > + JH7100_GATE(JH7100_CLK_SEC_AHB, "sec_ahb", "ahb_bus", 0), > + JH7100_GATE(JH7100_CLK_AES, "aes_clk", "sec_ahb", 0), > + JH7100_GATE(JH7100_CLK_SHA, "sha_clk", "sec_ahb", 0), > + JH7100_GATE(JH7100_CLK_PKA, "pka_clk", "sec_ahb", 0), > + JH7100_GATE(JH7100_CLK_TRNG_APB, "trng_apb", "apb1_bus", 0), > + JH7100_GATE(JH7100_CLK_OTP_APB, "otp_apb", "apb1_bus", 0), > + JH7100_GATE(JH7100_CLK_UART0_APB, "uart0_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_UART0_CORE, "uart0_core", "perh1_src", 63, 0), > + JH7100_GATE(JH7100_CLK_UART1_APB, "uart1_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_UART1_CORE, "uart1_core", "perh1_src", 63, 0), > + JH7100_GATE(JH7100_CLK_SPI0_APB, "spi0_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_SPI0_CORE, "spi0_core", "perh1_src", 63, 0), > + JH7100_GATE(JH7100_CLK_SPI1_APB, "spi1_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_SPI1_CORE, "spi1_core", "perh1_src", 63, 0), > + JH7100_GATE(JH7100_CLK_I2C0_APB, "i2c0_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_I2C0_CORE, "i2c0_core", "perh1_src", 63, 0), > + JH7100_GATE(JH7100_CLK_I2C1_APB, "i2c1_apb", "apb1_bus", 0), > + JH7100_GDIV(JH7100_CLK_I2C1_CORE, "i2c1_core", "perh1_src", 63, 0), > + JH7100_GATE(JH7100_CLK_GPIO_APB, "gpio_apb", "apb1_bus", 0), > + JH7100_GATE(JH7100_CLK_UART2_APB, "uart2_apb", "apb2_bus", 0), > + JH7100_GDIV(JH7100_CLK_UART2_CORE, "uart2_core", "perh0_src", 63, 0), > + JH7100_GATE(JH7100_CLK_UART3_APB, "uart3_apb", "apb2_bus", 0), > + JH7100_GDIV(JH7100_CLK_UART3_CORE, "uart3_core", "perh0_src", 63, 0), > + JH7100_GATE(JH7100_CLK_SPI2_APB, "spi2_apb", "apb2_bus", 0), > + JH7100_GDIV(JH7100_CLK_SPI2_CORE, "spi2_core", "perh0_src", 63, 0), > + JH7100_GATE(JH7100_CLK_SPI3_APB, "spi3_apb", "apb2_bus", 0), > + JH7100_GDIV(JH7100_CLK_SPI3_CORE, "spi3_core", "perh0_src", 63, 0), > + JH7100_GATE(JH7100_CLK_I2C2_APB, "i2c2_apb", "apb2_bus", 0), > + JH7100_GDIV(JH7100_CLK_I2C2_CORE, "i2c2_core", "perh0_src", 63, 0), > + JH7100_GATE(JH7100_CLK_I2C3_APB, "i2c3_apb", "apb2_bus", 0), > + JH7100_GDIV(JH7100_CLK_I2C3_CORE, "i2c3_core", "perh0_src", 63, 0), > + JH7100_GATE(JH7100_CLK_WDTIMER_APB, "wdtimer_apb", "apb2_bus", 0), > + JH7100_GDIV(JH7100_CLK_WDT_CORE, "wdt_coreclk", "perh0_src", 63, 0), > + JH7100_GDIV(JH7100_CLK_TIMER0_CORE, "timer0_coreclk", "perh0_src", 63, 0), > + JH7100_GDIV(JH7100_CLK_TIMER1_CORE, "timer1_coreclk", "perh0_src", 63, 0), > + JH7100_GDIV(JH7100_CLK_TIMER2_CORE, "timer2_coreclk", "perh0_src", 63, 0), > + JH7100_GDIV(JH7100_CLK_TIMER3_CORE, "timer3_coreclk", "perh0_src", 63, 0), > + JH7100_GDIV(JH7100_CLK_TIMER4_CORE, "timer4_coreclk", "perh0_src", 63, 0), > + JH7100_GDIV(JH7100_CLK_TIMER5_CORE, "timer5_coreclk", "perh0_src", 63, 0), > + JH7100_GDIV(JH7100_CLK_TIMER6_CORE, "timer6_coreclk", "perh0_src", 63, 0), > + JH7100_GATE(JH7100_CLK_VP6INTC_APB, "vp6intc_apb", "apb2_bus", 0), > + JH7100_GATE(JH7100_CLK_PWM_APB, "pwm_apb", "apb2_bus", 0), > + JH7100_GATE(JH7100_CLK_MSI_APB, "msi_apb", "apb2_bus", 0), > + JH7100_GATE(JH7100_CLK_TEMP_APB, "temp_apb", "apb2_bus", 0), > + JH7100_GDIV(JH7100_CLK_TEMP_SENSE, "temp_sense", "osc_sys", 31, 0), > + JH7100_GATE(JH7100_CLK_SYSERR_APB, "syserr_apb", "apb2_bus", 0), > +}; > + > +static struct clk_hw *clk_starfive_jh7100_get(struct of_phandle_args *clkspec, void *data) > +{ > + struct clk_starfive_jh7100_priv *priv = data; > + unsigned int idx = clkspec->args[0]; > + > + if (idx >= JH7100_CLK_END) { > + dev_err(priv->dev, "invalid clock index %u\n", idx); We should pull this sort of error message up into the core instead of have it in every driver. It also doesn't look very meaningful to print the name of the device that's providing the clks vs. the name of the device that's requesting the clk that can't be found. > + return ERR_PTR(-EINVAL); > + } > + > + if (idx >= JH7100_CLK_PLL0_OUT) > + return priv->pll[idx - JH7100_CLK_PLL0_OUT]; > + > + return &priv->reg[idx].hw; > +} > + > +static int __init clk_starfive_jh7100_probe(struct platform_device *pdev) Drop __init as this can be called after kernel init is over. > +{ > + struct clk_starfive_jh7100_priv *priv; > + unsigned int idx; > + int ret; > + > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + spin_lock_init(&priv->rmw_lock); > + priv->dev = &pdev->dev; > + priv->base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(priv->base)) > + return PTR_ERR(priv->base); > + > + priv->pll[0] = devm_clk_hw_register_fixed_factor(priv->dev, "pll0_out", > + "osc_sys", 0, 40, 1); > + if (IS_ERR(priv->pll[0])) > + return PTR_ERR(priv->pll[0]); > + > + priv->pll[1] = devm_clk_hw_register_fixed_factor(priv->dev, "pll1_out", > + "osc_sys", 0, 64, 1); > + if (IS_ERR(priv->pll[1])) > + return PTR_ERR(priv->pll[1]); > + > + priv->pll[2] = devm_clk_hw_register_fixed_factor(priv->dev, "pll2_out", > + "pll2_refclk", 0, 55, 1); > + if (IS_ERR(priv->pll[2])) > + return PTR_ERR(priv->pll[2]); > + > + for (idx = 0; idx < JH7100_CLK_PLL0_OUT; idx++) { > + u32 max_parent = (jh7100_clk_data[idx].max & JH7100_CLK_MUX_MASK) >> > + JH7100_CLK_MUX_SHIFT; > + struct clk_init_data init = { > + .name = jh7100_clk_data[idx].name, > + .ops = jh7100_clk_data[idx].ops, > + .num_parents = max_parent + 1, > + .flags = jh7100_clk_data[idx].flags, > + }; > + struct jh7100_clk *clk = &priv->reg[idx]; > + > + if (init.num_parents > 1) > + init.parent_names = jh7100_clk_data[idx].parents; > + else > + init.parent_names = &jh7100_clk_data[idx].parent; Can you use clk_parent_data instead of parent_names? To make the object size even smaller you can use the DT index instead of the .fw_name field. > + > + clk->hw.init = &init; > + clk->idx = idx; > + clk->max = jh7100_clk_data[idx].max; > + > + ret = clk_hw_register(priv->dev, &clk->hw); Why not use devm_clk_hw_register()? > + if (ret) > + goto err; > + } > + > + ret = devm_of_clk_add_hw_provider(priv->dev, clk_starfive_jh7100_get, priv); > + if (ret) > + goto err; > + > + return 0; > +err: > + while (idx) > + clk_hw_unregister(&priv->reg[--idx].hw); > + return ret; > +} > + > +static const struct of_device_id clk_starfive_jh7100_match[] = { > + { .compatible = "starfive,jh7100-clkgen" }, > + { /* sentinel */ } > +}; Please add MODULE_DEVICE_TABLE() > + > +static struct platform_driver clk_starfive_jh7100_driver = { > + .probe = clk_starfive_jh7100_probe, > + .driver = {
On Tue, 26 Oct 2021 at 22:20, Stephen Boyd <sboyd@kernel.org> wrote: > Quoting Emil Renner Berthing (2021-10-21 10:42:13) > > +struct jh7100_clk { > > + struct clk_hw hw; > > + unsigned int idx; > > + u32 max; > > Why u32? The idea here was to mirror the configuration register when all valid fields are set to their maximum value, so that the clk_ops methods could check which features of this clock was enabled. But you're right none of the methods actually need that and only the dividers use this to know the maximum divider value, so it might as well be an unsigned int max_div. > > +}; > > + > > +struct clk_starfive_jh7100_priv { > > + /* protect registers against overlapping read-modify-write */ > > + spinlock_t rmw_lock; > > Does overlapping mean concurrent? Yes, sorry. > Do different clks share the same registers? No, each clock has their own register, but they use that register both to gate the clock and other configuration. The Locking chapter of Documentation/driver-api/clk.rst talks about the prepare lock and the enable lock and then says: "However, access to resources that are shared between operations of the two groups needs to be protected by the drivers. An example of such a resource would be a register that controls both the clock rate and the clock enable/disable state." > > + struct device *dev; > > + void __iomem *base; > > + struct clk_hw *pll[3]; > > + struct jh7100_clk reg[JH7100_CLK_PLL0_OUT]; > > +}; > > + > > +static int jh7100_clk_is_enabled(struct clk_hw *hw) > > +{ > > + struct jh7100_clk *clk = jh7100_clk_from(hw); > > + > > + return !!(jh7100_clk_reg_get(clk) & JH7100_CLK_ENABLE); > > +} > > + > > +static int jh7100_clk_is_parent_enabled(struct clk_hw *hw) > > +{ > > + return clk_hw_is_enabled(clk_hw_get_parent(hw)); > > Why do we need this function? The parent being enabled implies this clk > is enabled if this clk can't gate itself but then knowing this clk is > enabled is useful for what? Probably only useful to me getting an overview of which clocks were actually enabled by grepping clk_summary. I'll delete it. ... > > +static int jh7100_clk_set_parent(struct clk_hw *hw, u8 index) > > +{ > > + struct jh7100_clk *clk = jh7100_clk_from(hw); > > + u32 value = (u32)index << JH7100_CLK_MUX_SHIFT; > > + > > + dev_dbg(jh7100_priv_from(clk)->dev, "set_parent(%s, %u)\n", > > + clk_hw_get_name(&clk->hw), index); > > Please remove these dev_dbg() messages. We have tracepoints for general > clk operations and the driver shouldn't duplicate that. Gotcha. > > + > > +static const struct clk_ops jh7100_clk_inv_ops = { > > + .is_enabled = jh7100_clk_is_parent_enabled, > > + .get_phase = jh7100_clk_get_phase, > > + .set_phase = jh7100_clk_set_phase, > > + .debug_init = jh7100_clk_debug_init, > > +}; > > + > > +#define JH7100_GATE(_idx, _name, _parent, _flags) [_idx] = { \ > > Typical macro style is to tab out the \ to a single column Ah, thanks. Will fix. > > + .name = _name, \ > > + .ops = &jh7100_clk_gate_ops, \ > > + .parent = _parent, \ > > + .flags = CLK_SET_RATE_PARENT | (_flags), \ > > + .max = JH7100_CLK_ENABLE, \ > > +} > > + > > +#define JH7100__DIV(_idx, _name, _parent, _max) [_idx] = { \ > > + .name = _name, \ > > + .ops = &jh7100_clk_div_ops, \ > > + .parent = _parent, \ > > + .flags = 0, \ > > + .max = _max, \ > > +} > > + > > +#define JH7100_GDIV(_idx, _name, _parent, _max, _flags) [_idx] = { \ > > + .name = _name, \ > > + .ops = &jh7100_clk_gdiv_ops, \ > > + .parent = _parent, \ > > + .flags = (_flags), \ > > + .max = JH7100_CLK_ENABLE | (_max), \ > > +} > > + > > +#define JH7100__MUX(_idx, _name, _parents) [_idx] = { \ > > + .name = _name, \ > > + .ops = &jh7100_clk_mux_ops, \ > > + .parents = _parents, \ > > + .flags = 0, \ > > + .max = (ARRAY_SIZE(_parents) - 1) << JH7100_CLK_MUX_SHIFT, \ > > +} > > + > > +#define JH7100_GMUX(_idx, _name, _parents, _flags) [_idx] = { \ > > + .name = _name, \ > > + .ops = &jh7100_clk_gmux_ops, \ > > + .parents = _parents, \ > > + .flags = (_flags), \ > > + .max = JH7100_CLK_ENABLE | \ > > + ((ARRAY_SIZE(_parents) - 1) << JH7100_CLK_MUX_SHIFT), \ > > +} > > + > > +#define JH7100__INV(_idx, _name, _parent) [_idx] = { \ > > + .name = _name, \ > > + .ops = &jh7100_clk_inv_ops, \ > > + .parent = _parent, \ > > + .flags = CLK_SET_RATE_PARENT, \ > > + .max = JH7100_CLK_INVERT, \ > > +} > > + > > +static const struct { > > + const char *name; > > + const struct clk_ops *ops; > > + union { > > + const char *parent; > > + const char *const *parents; > > + }; > > + unsigned long flags; > > + u32 max; > > +} jh7100_clk_data[] __initconst = { > > + JH7100__MUX(JH7100_CLK_CPUNDBUS_ROOT, "cpundbus_root", cpundbus_root_sels), > > + JH7100__MUX(JH7100_CLK_DLA_ROOT, "dla_root", dla_root_sels), > > + JH7100__MUX(JH7100_CLK_DSP_ROOT, "dsp_root", dsp_root_sels), > > + JH7100__MUX(JH7100_CLK_GMACUSB_ROOT, "gmacusb_root", gmacusb_root_sels), > > + JH7100__MUX(JH7100_CLK_PERH0_ROOT, "perh0_root", perh0_root_sels), > > + JH7100__MUX(JH7100_CLK_PERH1_ROOT, "perh1_root", perh1_root_sels), > > + JH7100__MUX(JH7100_CLK_VIN_ROOT, "vin_root", vin_root_sels), > > + JH7100__MUX(JH7100_CLK_VOUT_ROOT, "vout_root", vout_root_sels), > > + JH7100_GDIV(JH7100_CLK_AUDIO_ROOT, "audio_root", "pll0_out", 8, 0), > > + JH7100__MUX(JH7100_CLK_CDECHIFI4_ROOT, "cdechifi4_root", cdechifi4_root_sels), > > + JH7100__MUX(JH7100_CLK_CDEC_ROOT, "cdec_root", cdec_root_sels), > > + JH7100__MUX(JH7100_CLK_VOUTBUS_ROOT, "voutbus_root", voutbus_root_sels), > > + JH7100__DIV(JH7100_CLK_CPUNBUS_ROOT_DIV, "cpunbus_root_div", "cpundbus_root", 2), > > + JH7100__DIV(JH7100_CLK_DSP_ROOT_DIV, "dsp_root_div", "dsp_root", 4), > > + JH7100__DIV(JH7100_CLK_PERH0_SRC, "perh0_src", "perh0_root", 4), > > + JH7100__DIV(JH7100_CLK_PERH1_SRC, "perh1_src", "perh1_root", 4), > > + JH7100_GDIV(JH7100_CLK_PLL0_TESTOUT, "pll0_testout", "perh0_src", 31, 0), > > + JH7100_GDIV(JH7100_CLK_PLL1_TESTOUT, "pll1_testout", "dla_root", 31, 0), > > + JH7100_GDIV(JH7100_CLK_PLL2_TESTOUT, "pll2_testout", "perh1_src", 31, 0), > > + JH7100__MUX(JH7100_CLK_PLL2_REF, "pll2_refclk", pll2_refclk_sels), > > + JH7100__DIV(JH7100_CLK_CPU_CORE, "cpu_core", "cpunbus_root_div", 8), > > + JH7100__DIV(JH7100_CLK_CPU_AXI, "cpu_axi", "cpu_core", 8), > > + JH7100__DIV(JH7100_CLK_AHB_BUS, "ahb_bus", "cpunbus_root_div", 8), > > + JH7100__DIV(JH7100_CLK_APB1_BUS, "apb1_bus", "ahb_bus", 8), > > + JH7100__DIV(JH7100_CLK_APB2_BUS, "apb2_bus", "ahb_bus", 8), > > + JH7100_GATE(JH7100_CLK_DOM3AHB_BUS, "dom3ahb_bus", "ahb_bus", CLK_IGNORE_UNUSED), > > + JH7100_GATE(JH7100_CLK_DOM7AHB_BUS, "dom7ahb_bus", "ahb_bus", CLK_IGNORE_UNUSED), > > + JH7100_GATE(JH7100_CLK_U74_CORE0, "u74_core0", "cpu_core", CLK_IGNORE_UNUSED), > > + JH7100_GDIV(JH7100_CLK_U74_CORE1, "u74_core1", "cpu_core", 8, CLK_IGNORE_UNUSED), > > + JH7100_GATE(JH7100_CLK_U74_AXI, "u74_axi", "cpu_axi", CLK_IGNORE_UNUSED), > > + JH7100_GATE(JH7100_CLK_U74RTC_TOGGLE, "u74rtc_toggle", "osc_sys", CLK_IGNORE_UNUSED), > > + JH7100_GATE(JH7100_CLK_SGDMA2P_AXI, "sgdma2p_axi", "cpu_axi", 0), > > + JH7100_GATE(JH7100_CLK_DMA2PNOC_AXI, "dma2pnoc_axi", "cpu_axi", 0), > > + JH7100_GATE(JH7100_CLK_SGDMA2P_AHB, "sgdma2p_ahb", "ahb_bus", 0), > > + JH7100__DIV(JH7100_CLK_DLA_BUS, "dla_bus", "dla_root", 4), > > + JH7100_GATE(JH7100_CLK_DLA_AXI, "dla_axi", "dla_bus", 0), > > + JH7100_GATE(JH7100_CLK_DLANOC_AXI, "dlanoc_axi", "dla_bus", 0), > > + JH7100_GATE(JH7100_CLK_DLA_APB, "dla_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_VP6_CORE, "vp6_core", "dsp_root_div", 4, 0), > > + JH7100__DIV(JH7100_CLK_VP6BUS_SRC, "vp6bus_src", "dsp_root", 4), > > + JH7100_GDIV(JH7100_CLK_VP6_AXI, "vp6_axi", "vp6bus_src", 4, 0), > > + JH7100__DIV(JH7100_CLK_VCDECBUS_SRC, "vcdecbus_src", "cdechifi4_root", 4), > > + JH7100__DIV(JH7100_CLK_VDEC_BUS, "vdec_bus", "vcdecbus_src", 8), > > + JH7100_GATE(JH7100_CLK_VDEC_AXI, "vdec_axi", "vdec_bus", 0), > > + JH7100_GATE(JH7100_CLK_VDECBRG_MAIN, "vdecbrg_mainclk", "vdec_bus", 0), > > + JH7100_GDIV(JH7100_CLK_VDEC_BCLK, "vdec_bclk", "vcdecbus_src", 8, 0), > > + JH7100_GDIV(JH7100_CLK_VDEC_CCLK, "vdec_cclk", "cdec_root", 8, 0), > > + JH7100_GATE(JH7100_CLK_VDEC_APB, "vdec_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_JPEG_AXI, "jpeg_axi", "cpunbus_root_div", 8, 0), > > + JH7100_GDIV(JH7100_CLK_JPEG_CCLK, "jpeg_cclk", "cpunbus_root_div", 8, 0), > > + JH7100_GATE(JH7100_CLK_JPEG_APB, "jpeg_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_GC300_2X, "gc300_2x", "cdechifi4_root", 8, 0), > > + JH7100_GATE(JH7100_CLK_GC300_AHB, "gc300_ahb", "ahb_bus", 0), > > + JH7100__DIV(JH7100_CLK_JPCGC300_AXIBUS, "jpcgc300_axibus", "vcdecbus_src", 8), > > + JH7100_GATE(JH7100_CLK_GC300_AXI, "gc300_axi", "jpcgc300_axibus", 0), > > + JH7100_GATE(JH7100_CLK_JPCGC300_MAIN, "jpcgc300_mainclk", "jpcgc300_axibus", 0), > > + JH7100__DIV(JH7100_CLK_VENC_BUS, "venc_bus", "vcdecbus_src", 8), > > + JH7100_GATE(JH7100_CLK_VENC_AXI, "venc_axi", "venc_bus", 0), > > + JH7100_GATE(JH7100_CLK_VENCBRG_MAIN, "vencbrg_mainclk", "venc_bus", 0), > > + JH7100_GDIV(JH7100_CLK_VENC_BCLK, "venc_bclk", "vcdecbus_src", 8, 0), > > + JH7100_GDIV(JH7100_CLK_VENC_CCLK, "venc_cclk", "cdec_root", 8, 0), > > + JH7100_GATE(JH7100_CLK_VENC_APB, "venc_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_DDRPLL_DIV2, "ddrpll_div2", "pll1_out", 2, CLK_IGNORE_UNUSED), > > + JH7100_GDIV(JH7100_CLK_DDRPLL_DIV4, "ddrpll_div4", "ddrpll_div2", 2, CLK_IGNORE_UNUSED), > > + JH7100_GDIV(JH7100_CLK_DDRPLL_DIV8, "ddrpll_div8", "ddrpll_div4", 2, CLK_IGNORE_UNUSED), > > + JH7100_GDIV(JH7100_CLK_DDROSC_DIV2, "ddrosc_div2", "osc_sys", 2, CLK_IGNORE_UNUSED), > > + JH7100_GMUX(JH7100_CLK_DDRC0, "ddrc0", ddrc0_sels, CLK_IGNORE_UNUSED), > > + JH7100_GMUX(JH7100_CLK_DDRC1, "ddrc1", ddrc1_sels, CLK_IGNORE_UNUSED), > > Is it really unused? Or it is CLK_IS_CRITICAL? Ah no. CLK_IS_CRITICAL is exactly what they are, thanks. > > + JH7100_GATE(JH7100_CLK_DDRPHY_APB, "ddrphy_apb", "apb1_bus", CLK_IGNORE_UNUSED), > > + JH7100__DIV(JH7100_CLK_NOC_ROB, "noc_rob", "cpunbus_root_div", 8), > > + JH7100__DIV(JH7100_CLK_NOC_COG, "noc_cog", "dla_root", 8), > > + JH7100_GATE(JH7100_CLK_NNE_AHB, "nne_ahb", "ahb_bus", 0), > > + JH7100__DIV(JH7100_CLK_NNEBUS_SRC1, "nnebus_src1", "dsp_root", 4), > > + JH7100__MUX(JH7100_CLK_NNE_BUS, "nne_bus", nne_bus_sels), > > + JH7100_GATE(JH7100_CLK_NNE_AXI, "nne_axi", "nne_bus", 0), > > + JH7100_GATE(JH7100_CLK_NNENOC_AXI, "nnenoc_axi", "nne_bus", 0), > > + JH7100_GATE(JH7100_CLK_DLASLV_AXI, "dlaslv_axi", "nne_bus", 0), > > + JH7100_GATE(JH7100_CLK_DSPX2C_AXI, "dspx2c_axi", "nne_bus", CLK_IGNORE_UNUSED), > > + JH7100__DIV(JH7100_CLK_HIFI4_SRC, "hifi4_src", "cdechifi4_root", 4), > > + JH7100__DIV(JH7100_CLK_HIFI4_COREFREE, "hifi4_corefree", "hifi4_src", 8), > > + JH7100_GATE(JH7100_CLK_HIFI4_CORE, "hifi4_core", "hifi4_corefree", 0), > > + JH7100__DIV(JH7100_CLK_HIFI4_BUS, "hifi4_bus", "hifi4_corefree", 8), > > + JH7100_GATE(JH7100_CLK_HIFI4_AXI, "hifi4_axi", "hifi4_bus", 0), > > + JH7100_GATE(JH7100_CLK_HIFI4NOC_AXI, "hifi4noc_axi", "hifi4_bus", 0), > > + JH7100__DIV(JH7100_CLK_SGDMA1P_BUS, "sgdma1p_bus", "cpunbus_root_div", 8), > > + JH7100_GATE(JH7100_CLK_SGDMA1P_AXI, "sgdma1p_axi", "sgdma1p_bus", 0), > > + JH7100_GATE(JH7100_CLK_DMA1P_AXI, "dma1p_axi", "sgdma1p_bus", 0), > > + JH7100_GDIV(JH7100_CLK_X2C_AXI, "x2c_axi", "cpunbus_root_div", 8, CLK_IGNORE_UNUSED), > > + JH7100__DIV(JH7100_CLK_USB_BUS, "usb_bus", "cpunbus_root_div", 8), > > + JH7100_GATE(JH7100_CLK_USB_AXI, "usb_axi", "usb_bus", 0), > > + JH7100_GATE(JH7100_CLK_USBNOC_AXI, "usbnoc_axi", "usb_bus", 0), > > + JH7100__DIV(JH7100_CLK_USBPHY_ROOTDIV, "usbphy_rootdiv", "gmacusb_root", 4), > > + JH7100_GDIV(JH7100_CLK_USBPHY_125M, "usbphy_125m", "usbphy_rootdiv", 8, 0), > > + JH7100_GDIV(JH7100_CLK_USBPHY_PLLDIV25M, "usbphy_plldiv25m", "usbphy_rootdiv", 32, 0), > > + JH7100__MUX(JH7100_CLK_USBPHY_25M, "usbphy_25m", usbphy_25m_sels), > > + JH7100__DIV(JH7100_CLK_AUDIO_DIV, "audio_div", "audio_root", 131072), > > + JH7100_GATE(JH7100_CLK_AUDIO_SRC, "audio_src", "audio_div", 0), > > + JH7100_GATE(JH7100_CLK_AUDIO_12288, "audio_12288", "osc_aud", 0), > > + JH7100_GDIV(JH7100_CLK_VIN_SRC, "vin_src", "vin_root", 4, 0), > > + JH7100__DIV(JH7100_CLK_ISP0_BUS, "isp0_bus", "vin_src", 8), > > + JH7100_GATE(JH7100_CLK_ISP0_AXI, "isp0_axi", "isp0_bus", 0), > > + JH7100_GATE(JH7100_CLK_ISP0NOC_AXI, "isp0noc_axi", "isp0_bus", 0), > > + JH7100_GATE(JH7100_CLK_ISPSLV_AXI, "ispslv_axi", "isp0_bus", 0), > > + JH7100__DIV(JH7100_CLK_ISP1_BUS, "isp1_bus", "vin_src", 8), > > + JH7100_GATE(JH7100_CLK_ISP1_AXI, "isp1_axi", "isp1_bus", 0), > > + JH7100_GATE(JH7100_CLK_ISP1NOC_AXI, "isp1noc_axi", "isp1_bus", 0), > > + JH7100__DIV(JH7100_CLK_VIN_BUS, "vin_bus", "vin_src", 8), > > + JH7100_GATE(JH7100_CLK_VIN_AXI, "vin_axi", "vin_bus", 0), > > + JH7100_GATE(JH7100_CLK_VINNOC_AXI, "vinnoc_axi", "vin_bus", 0), > > + JH7100_GDIV(JH7100_CLK_VOUT_SRC, "vout_src", "vout_root", 4, 0), > > + JH7100__DIV(JH7100_CLK_DISPBUS_SRC, "dispbus_src", "voutbus_root", 4), > > + JH7100__DIV(JH7100_CLK_DISP_BUS, "disp_bus", "dispbus_src", 4), > > + JH7100_GATE(JH7100_CLK_DISP_AXI, "disp_axi", "disp_bus", 0), > > + JH7100_GATE(JH7100_CLK_DISPNOC_AXI, "dispnoc_axi", "disp_bus", 0), > > + JH7100_GATE(JH7100_CLK_SDIO0_AHB, "sdio0_ahb", "ahb_bus", 0), > > + JH7100_GDIV(JH7100_CLK_SDIO0_CCLKINT, "sdio0_cclkint", "perh0_src", 24, 0), > > + JH7100__INV(JH7100_CLK_SDIO0_CCLKINT_INV, "sdio0_cclkint_inv", "sdio0_cclkint"), > > + JH7100_GATE(JH7100_CLK_SDIO1_AHB, "sdio1_ahb", "ahb_bus", 0), > > + JH7100_GDIV(JH7100_CLK_SDIO1_CCLKINT, "sdio1_cclkint", "perh1_src", 24, 0), > > + JH7100__INV(JH7100_CLK_SDIO1_CCLKINT_INV, "sdio1_cclkint_inv", "sdio1_cclkint"), > > + JH7100_GATE(JH7100_CLK_GMAC_AHB, "gmac_ahb", "ahb_bus", 0), > > + JH7100__DIV(JH7100_CLK_GMAC_ROOT_DIV, "gmac_root_div", "gmacusb_root", 8), > > + JH7100_GDIV(JH7100_CLK_GMAC_PTP_REF, "gmac_ptp_refclk", "gmac_root_div", 31, 0), > > + JH7100_GDIV(JH7100_CLK_GMAC_GTX, "gmac_gtxclk", "gmac_root_div", 255, 0), > > + JH7100_GDIV(JH7100_CLK_GMAC_RMII_TX, "gmac_rmii_txclk", "gmac_rmii_ref", 8, 0), > > + JH7100_GDIV(JH7100_CLK_GMAC_RMII_RX, "gmac_rmii_rxclk", "gmac_rmii_ref", 8, 0), > > + JH7100__MUX(JH7100_CLK_GMAC_TX, "gmac_tx", gmac_tx_sels), > > + JH7100__INV(JH7100_CLK_GMAC_TX_INV, "gmac_tx_inv", "gmac_tx"), > > + JH7100__MUX(JH7100_CLK_GMAC_RX_PRE, "gmac_rx_pre", gmac_rx_pre_sels), > > + JH7100__INV(JH7100_CLK_GMAC_RX_INV, "gmac_rx_inv", "gmac_rx_pre"), > > + JH7100_GATE(JH7100_CLK_GMAC_RMII, "gmac_rmii", "gmac_rmii_ref", 0), > > + JH7100_GDIV(JH7100_CLK_GMAC_TOPHYREF, "gmac_tophyref", "gmac_root_div", 127, 0), > > + JH7100_GATE(JH7100_CLK_SPI2AHB_AHB, "spi2ahb_ahb", "ahb_bus", 0), > > + JH7100_GDIV(JH7100_CLK_SPI2AHB_CORE, "spi2ahb_core", "perh0_src", 31, 0), > > + JH7100_GATE(JH7100_CLK_EZMASTER_AHB, "ezmaster_ahb", "ahb_bus", 0), > > + JH7100_GATE(JH7100_CLK_E24_AHB, "e24_ahb", "ahb_bus", 0), > > + JH7100_GATE(JH7100_CLK_E24RTC_TOGGLE, "e24rtc_toggle", "osc_sys", 0), > > + JH7100_GATE(JH7100_CLK_QSPI_AHB, "qspi_ahb", "ahb_bus", 0), > > + JH7100_GATE(JH7100_CLK_QSPI_APB, "qspi_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_QSPI_REF, "qspi_refclk", "perh0_src", 31, 0), > > + JH7100_GATE(JH7100_CLK_SEC_AHB, "sec_ahb", "ahb_bus", 0), > > + JH7100_GATE(JH7100_CLK_AES, "aes_clk", "sec_ahb", 0), > > + JH7100_GATE(JH7100_CLK_SHA, "sha_clk", "sec_ahb", 0), > > + JH7100_GATE(JH7100_CLK_PKA, "pka_clk", "sec_ahb", 0), > > + JH7100_GATE(JH7100_CLK_TRNG_APB, "trng_apb", "apb1_bus", 0), > > + JH7100_GATE(JH7100_CLK_OTP_APB, "otp_apb", "apb1_bus", 0), > > + JH7100_GATE(JH7100_CLK_UART0_APB, "uart0_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_UART0_CORE, "uart0_core", "perh1_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_UART1_APB, "uart1_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_UART1_CORE, "uart1_core", "perh1_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_SPI0_APB, "spi0_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_SPI0_CORE, "spi0_core", "perh1_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_SPI1_APB, "spi1_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_SPI1_CORE, "spi1_core", "perh1_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_I2C0_APB, "i2c0_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_I2C0_CORE, "i2c0_core", "perh1_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_I2C1_APB, "i2c1_apb", "apb1_bus", 0), > > + JH7100_GDIV(JH7100_CLK_I2C1_CORE, "i2c1_core", "perh1_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_GPIO_APB, "gpio_apb", "apb1_bus", 0), > > + JH7100_GATE(JH7100_CLK_UART2_APB, "uart2_apb", "apb2_bus", 0), > > + JH7100_GDIV(JH7100_CLK_UART2_CORE, "uart2_core", "perh0_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_UART3_APB, "uart3_apb", "apb2_bus", 0), > > + JH7100_GDIV(JH7100_CLK_UART3_CORE, "uart3_core", "perh0_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_SPI2_APB, "spi2_apb", "apb2_bus", 0), > > + JH7100_GDIV(JH7100_CLK_SPI2_CORE, "spi2_core", "perh0_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_SPI3_APB, "spi3_apb", "apb2_bus", 0), > > + JH7100_GDIV(JH7100_CLK_SPI3_CORE, "spi3_core", "perh0_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_I2C2_APB, "i2c2_apb", "apb2_bus", 0), > > + JH7100_GDIV(JH7100_CLK_I2C2_CORE, "i2c2_core", "perh0_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_I2C3_APB, "i2c3_apb", "apb2_bus", 0), > > + JH7100_GDIV(JH7100_CLK_I2C3_CORE, "i2c3_core", "perh0_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_WDTIMER_APB, "wdtimer_apb", "apb2_bus", 0), > > + JH7100_GDIV(JH7100_CLK_WDT_CORE, "wdt_coreclk", "perh0_src", 63, 0), > > + JH7100_GDIV(JH7100_CLK_TIMER0_CORE, "timer0_coreclk", "perh0_src", 63, 0), > > + JH7100_GDIV(JH7100_CLK_TIMER1_CORE, "timer1_coreclk", "perh0_src", 63, 0), > > + JH7100_GDIV(JH7100_CLK_TIMER2_CORE, "timer2_coreclk", "perh0_src", 63, 0), > > + JH7100_GDIV(JH7100_CLK_TIMER3_CORE, "timer3_coreclk", "perh0_src", 63, 0), > > + JH7100_GDIV(JH7100_CLK_TIMER4_CORE, "timer4_coreclk", "perh0_src", 63, 0), > > + JH7100_GDIV(JH7100_CLK_TIMER5_CORE, "timer5_coreclk", "perh0_src", 63, 0), > > + JH7100_GDIV(JH7100_CLK_TIMER6_CORE, "timer6_coreclk", "perh0_src", 63, 0), > > + JH7100_GATE(JH7100_CLK_VP6INTC_APB, "vp6intc_apb", "apb2_bus", 0), > > + JH7100_GATE(JH7100_CLK_PWM_APB, "pwm_apb", "apb2_bus", 0), > > + JH7100_GATE(JH7100_CLK_MSI_APB, "msi_apb", "apb2_bus", 0), > > + JH7100_GATE(JH7100_CLK_TEMP_APB, "temp_apb", "apb2_bus", 0), > > + JH7100_GDIV(JH7100_CLK_TEMP_SENSE, "temp_sense", "osc_sys", 31, 0), > > + JH7100_GATE(JH7100_CLK_SYSERR_APB, "syserr_apb", "apb2_bus", 0), > > +}; > > + > > +static struct clk_hw *clk_starfive_jh7100_get(struct of_phandle_args *clkspec, void *data) > > +{ > > + struct clk_starfive_jh7100_priv *priv = data; > > + unsigned int idx = clkspec->args[0]; > > + > > + if (idx >= JH7100_CLK_END) { > > + dev_err(priv->dev, "invalid clock index %u\n", idx); > > We should pull this sort of error message up into the core instead of > have it in every driver. It also doesn't look very meaningful to print > the name of the device that's providing the clks vs. the name of the > device that's requesting the clk that can't be found. Makes sense. I'll just remove the message then. > > + return ERR_PTR(-EINVAL); > > + } > > + > > + if (idx >= JH7100_CLK_PLL0_OUT) > > + return priv->pll[idx - JH7100_CLK_PLL0_OUT]; > > + > > + return &priv->reg[idx].hw; > > +} > > + > > +static int __init clk_starfive_jh7100_probe(struct platform_device *pdev) > > Drop __init as this can be called after kernel init is over. Oh interesting, I'd like to know when that can happen. The comment for the builtin_platform_driver macro says it's just a wrapper for device_initcall. Won't we then need to remove all the __initconst tags too since the probe function walks through jh7100_clk_data which eventually references all __initconst data? > > +{ > > + struct clk_starfive_jh7100_priv *priv; > > + unsigned int idx; > > + int ret; > > + > > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > > + if (!priv) > > + return -ENOMEM; > > + > > + spin_lock_init(&priv->rmw_lock); > > + priv->dev = &pdev->dev; > > + priv->base = devm_platform_ioremap_resource(pdev, 0); > > + if (IS_ERR(priv->base)) > > + return PTR_ERR(priv->base); > > + > > + priv->pll[0] = devm_clk_hw_register_fixed_factor(priv->dev, "pll0_out", > > + "osc_sys", 0, 40, 1); > > + if (IS_ERR(priv->pll[0])) > > + return PTR_ERR(priv->pll[0]); > > + > > + priv->pll[1] = devm_clk_hw_register_fixed_factor(priv->dev, "pll1_out", > > + "osc_sys", 0, 64, 1); > > + if (IS_ERR(priv->pll[1])) > > + return PTR_ERR(priv->pll[1]); > > + > > + priv->pll[2] = devm_clk_hw_register_fixed_factor(priv->dev, "pll2_out", > > + "pll2_refclk", 0, 55, 1); > > + if (IS_ERR(priv->pll[2])) > > + return PTR_ERR(priv->pll[2]); > > + > > + for (idx = 0; idx < JH7100_CLK_PLL0_OUT; idx++) { > > + u32 max_parent = (jh7100_clk_data[idx].max & JH7100_CLK_MUX_MASK) >> > > + JH7100_CLK_MUX_SHIFT; > > + struct clk_init_data init = { > > + .name = jh7100_clk_data[idx].name, > > + .ops = jh7100_clk_data[idx].ops, > > + .num_parents = max_parent + 1, > > + .flags = jh7100_clk_data[idx].flags, > > + }; > > + struct jh7100_clk *clk = &priv->reg[idx]; > > + > > + if (init.num_parents > 1) > > + init.parent_names = jh7100_clk_data[idx].parents; > > + else > > + init.parent_names = &jh7100_clk_data[idx].parent; > > Can you use clk_parent_data instead of parent_names? To make the object > size even smaller you can use the DT index instead of the .fw_name > field. Ah cool. I'll look into that. > > + > > + clk->hw.init = &init; > > + clk->idx = idx; > > + clk->max = jh7100_clk_data[idx].max; > > + > > + ret = clk_hw_register(priv->dev, &clk->hw); > > Why not use devm_clk_hw_register()? I probably could. Just for my understanding that's just to avoid the loop on error below, because as a builtin driver the device won't otherwise go away, right? > > + if (ret) > > + goto err; > > + } > > + > > + ret = devm_of_clk_add_hw_provider(priv->dev, clk_starfive_jh7100_get, priv); > > + if (ret) > > + goto err; > > + > > + return 0; > > +err: > > + while (idx) > > + clk_hw_unregister(&priv->reg[--idx].hw); > > + return ret; > > +} > > + > > +static const struct of_device_id clk_starfive_jh7100_match[] = { > > + { .compatible = "starfive,jh7100-clkgen" }, > > + { /* sentinel */ } > > +}; > > Please add MODULE_DEVICE_TABLE() Will do! Thank you. /Emil
Quoting Emil Renner Berthing (2021-10-26 15:35:36) > On Tue, 26 Oct 2021 at 22:20, Stephen Boyd <sboyd@kernel.org> wrote: > > Quoting Emil Renner Berthing (2021-10-21 10:42:13) > > > +}; > > > + > > > +struct clk_starfive_jh7100_priv { > > > + /* protect registers against overlapping read-modify-write */ > > > + spinlock_t rmw_lock; > > > > Does overlapping mean concurrent? > > Yes, sorry. > > > Do different clks share the same registers? > > No, each clock has their own register, but they use that register both > to gate the clock and other configuration. The Locking chapter of > Documentation/driver-api/clk.rst talks about the prepare lock and the > enable lock and then says: > "However, access to resources that are shared between operations of > the two groups needs to be protected by the drivers. An example of > such a resource would be a register that controls both the clock rate > and the clock enable/disable state." Alright got it. Maybe say "protect clk enable and set rate from happening at the same time". > > > > + return ERR_PTR(-EINVAL); > > > + } > > > + > > > + if (idx >= JH7100_CLK_PLL0_OUT) > > > + return priv->pll[idx - JH7100_CLK_PLL0_OUT]; > > > + > > > + return &priv->reg[idx].hw; > > > +} > > > + > > > +static int __init clk_starfive_jh7100_probe(struct platform_device *pdev) > > > > Drop __init as this can be called after kernel init is over. > > Oh interesting, I'd like to know when that can happen. The comment for > the builtin_platform_driver macro says it's just a wrapper for I thought this was using module_platform_driver() macro? > device_initcall. > > Won't we then need to remove all the __initconst tags too since the > probe function walks through jh7100_clk_data which eventually > references all __initconst data? Yes. If it's builtin_platform_driver() it can't be a module/tristate Kconfig, in which case all the init markings can stay. > > > > + > > > + clk->hw.init = &init; > > > + clk->idx = idx; > > > + clk->max = jh7100_clk_data[idx].max; > > > + > > > + ret = clk_hw_register(priv->dev, &clk->hw); > > > > Why not use devm_clk_hw_register()? > > I probably could. Just for my understanding that's just to avoid the > loop on error below, because as a builtin driver the device won't > otherwise go away, right? Yes > > > > + if (ret) > > > + goto err; > > > + } > > > + > > > + ret = devm_of_clk_add_hw_provider(priv->dev, clk_starfive_jh7100_get, priv); > > > + if (ret) > > > + goto err; > > > + > > > + return 0; > > > +err: > > > + while (idx) > > > + clk_hw_unregister(&priv->reg[--idx].hw); > > > + return ret; > > > +} > > > + > > > +static const struct of_device_id clk_starfive_jh7100_match[] = { > > > + { .compatible = "starfive,jh7100-clkgen" }, > > > + { /* sentinel */ } > > > +}; > > > > Please add MODULE_DEVICE_TABLE() > > Will do! If it's never going to be a module then don't add any module_* things.
On Tue, Oct 26, 2021 at 05:54:03PM -0700, Stephen Boyd wrote: > Quoting Emil Renner Berthing (2021-10-26 15:35:36) > > On Tue, 26 Oct 2021 at 22:20, Stephen Boyd <sboyd@kernel.org> wrote: > > > Quoting Emil Renner Berthing (2021-10-21 10:42:13) ... > > > > +static int __init clk_starfive_jh7100_probe(struct platform_device *pdev) > > > > > > Drop __init as this can be called after kernel init is over. > > > > Oh interesting, I'd like to know when that can happen. The comment for > > the builtin_platform_driver macro says it's just a wrapper for > > I thought this was using module_platform_driver() macro? > > > device_initcall. > > > > Won't we then need to remove all the __initconst tags too since the > > probe function walks through jh7100_clk_data which eventually > > references all __initconst data? > > Yes. If it's builtin_platform_driver() it can't be a module/tristate > Kconfig, in which case all the init markings can stay. What about bind/unbind attribute?
On Wed, 27 Oct 2021 at 02:54, Stephen Boyd <sboyd@kernel.org> wrote: > Quoting Emil Renner Berthing (2021-10-26 15:35:36) > > On Tue, 26 Oct 2021 at 22:20, Stephen Boyd <sboyd@kernel.org> wrote: > > > Quoting Emil Renner Berthing (2021-10-21 10:42:13) > > > > +}; > > > > + > > > > +struct clk_starfive_jh7100_priv { > > > > + /* protect registers against overlapping read-modify-write */ > > > > + spinlock_t rmw_lock; > > > > > > Does overlapping mean concurrent? > > > > Yes, sorry. > > > > > Do different clks share the same registers? > > > > No, each clock has their own register, but they use that register both > > to gate the clock and other configuration. The Locking chapter of > > Documentation/driver-api/clk.rst talks about the prepare lock and the > > enable lock and then says: > > "However, access to resources that are shared between operations of > > the two groups needs to be protected by the drivers. An example of > > such a resource would be a register that controls both the clock rate > > and the clock enable/disable state." > > Alright got it. Maybe say "protect clk enable and set rate from > happening at the same time". > > > > > > > + return ERR_PTR(-EINVAL); > > > > + } > > > > + > > > > + if (idx >= JH7100_CLK_PLL0_OUT) > > > > + return priv->pll[idx - JH7100_CLK_PLL0_OUT]; > > > > + > > > > + return &priv->reg[idx].hw; > > > > +} > > > > + > > > > +static int __init clk_starfive_jh7100_probe(struct platform_device *pdev) > > > > > > Drop __init as this can be called after kernel init is over. > > > > Oh interesting, I'd like to know when that can happen. The comment for > > the builtin_platform_driver macro says it's just a wrapper for > > I thought this was using module_platform_driver() macro? > > > device_initcall. > > > > Won't we then need to remove all the __initconst tags too since the > > probe function walks through jh7100_clk_data which eventually > > references all __initconst data? > > Yes. If it's builtin_platform_driver() it can't be a module/tristate > Kconfig, in which case all the init markings can stay. Yes, it's already bool in the Kconfig file. After looking into this I think it's better to do like the rockchip drivers and use builtin_platform_driver_probe to make sure the probe function only called at kernel init time: static struct platform_driver clk_starfive_jh7100_driver = { .driver = { .name = "clk-starfive-jh7100", .of_match_table = clk_starfive_jh7100_match, .suppress_bind_attrs = true, }, }; builtin_platform_driver_probe(clk_starfive_jh7100_driver, clk_starfive_jh7100_probe); @Andy: is the supress_bind_attrs what you were asking about? > > > > + > > > > + clk->hw.init = &init; > > > > + clk->idx = idx; > > > > + clk->max = jh7100_clk_data[idx].max; > > > > + > > > > + ret = clk_hw_register(priv->dev, &clk->hw); > > > > > > Why not use devm_clk_hw_register()? > > > > I probably could. Just for my understanding that's just to avoid the > > loop on error below, because as a builtin driver the device won't > > otherwise go away, right? > > Yes > > > > > > > + if (ret) > > > > + goto err; > > > > + } > > > > + > > > > + ret = devm_of_clk_add_hw_provider(priv->dev, clk_starfive_jh7100_get, priv); > > > > + if (ret) > > > > + goto err; > > > > + > > > > + return 0; > > > > +err: > > > > + while (idx) > > > > + clk_hw_unregister(&priv->reg[--idx].hw); > > > > + return ret; > > > > +} > > > > + > > > > +static const struct of_device_id clk_starfive_jh7100_match[] = { > > > > + { .compatible = "starfive,jh7100-clkgen" }, > > > > + { /* sentinel */ } > > > > +}; > > > > > > Please add MODULE_DEVICE_TABLE() > > > > Will do! > > If it's never going to be a module then don't add any module_* things. So does that just mean no MODULE_DEVICE_TABLE or should I also remove MODULE_DESCRIPTION, MODULE_AUTHOR and MODULE_LICENSE? I'm just double checking because the rockchip drivers seem to have MODULE_DESCRIPTION and MODULE_LICENSE lines.
On Wed, Oct 27, 2021 at 12:24:07PM +0200, Emil Renner Berthing wrote: > On Wed, 27 Oct 2021 at 02:54, Stephen Boyd <sboyd@kernel.org> wrote: > > Quoting Emil Renner Berthing (2021-10-26 15:35:36) > > > On Tue, 26 Oct 2021 at 22:20, Stephen Boyd <sboyd@kernel.org> wrote: > > > > Quoting Emil Renner Berthing (2021-10-21 10:42:13) ... > > > > > +static int __init clk_starfive_jh7100_probe(struct platform_device *pdev) > > > > > > > > Drop __init as this can be called after kernel init is over. > > > > > > Oh interesting, I'd like to know when that can happen. The comment for > > > the builtin_platform_driver macro says it's just a wrapper for > > > > I thought this was using module_platform_driver() macro? > > > > > device_initcall. > > > > > > Won't we then need to remove all the __initconst tags too since the > > > probe function walks through jh7100_clk_data which eventually > > > references all __initconst data? > > > > Yes. If it's builtin_platform_driver() it can't be a module/tristate > > Kconfig, in which case all the init markings can stay. > > Yes, it's already bool in the Kconfig file. After looking into this I > think it's better to do like the rockchip drivers and use > builtin_platform_driver_probe to make sure the probe function only > called at kernel init time: > > static struct platform_driver clk_starfive_jh7100_driver = { > .driver = { > .name = "clk-starfive-jh7100", > .of_match_table = clk_starfive_jh7100_match, > .suppress_bind_attrs = true, > }, > }; > builtin_platform_driver_probe(clk_starfive_jh7100_driver, > clk_starfive_jh7100_probe); > > @Andy: is the supress_bind_attrs what you were asking about? Clever chap! :-) Yes, that's what I have in mind. ... > > If it's never going to be a module then don't add any module_* things. > > So does that just mean no MODULE_DEVICE_TABLE or should I also remove > MODULE_DESCRIPTION, MODULE_AUTHOR and MODULE_LICENSE? I'm just double > checking because the rockchip drivers seem to have MODULE_DESCRIPTION > and MODULE_LICENSE lines. You may comment them out. Convert them to comments or so. But in general yes, they are no-ops in such case.
Am Mittwoch, 27. Oktober 2021, 12:24:07 CEST schrieb Emil Renner Berthing: > On Wed, 27 Oct 2021 at 02:54, Stephen Boyd <sboyd@kernel.org> wrote: > > Quoting Emil Renner Berthing (2021-10-26 15:35:36) > > > On Tue, 26 Oct 2021 at 22:20, Stephen Boyd <sboyd@kernel.org> wrote: > > > > Quoting Emil Renner Berthing (2021-10-21 10:42:13) > > > > > +}; > > > > > + > > > > > +struct clk_starfive_jh7100_priv { > > > > > + /* protect registers against overlapping read-modify-write */ > > > > > + spinlock_t rmw_lock; > > > > > > > > Does overlapping mean concurrent? > > > > > > Yes, sorry. > > > > > > > Do different clks share the same registers? > > > > > > No, each clock has their own register, but they use that register both > > > to gate the clock and other configuration. The Locking chapter of > > > Documentation/driver-api/clk.rst talks about the prepare lock and the > > > enable lock and then says: > > > "However, access to resources that are shared between operations of > > > the two groups needs to be protected by the drivers. An example of > > > such a resource would be a register that controls both the clock rate > > > and the clock enable/disable state." > > > > Alright got it. Maybe say "protect clk enable and set rate from > > happening at the same time". > > > > > > > > > > + return ERR_PTR(-EINVAL); > > > > > + } > > > > > + > > > > > + if (idx >= JH7100_CLK_PLL0_OUT) > > > > > + return priv->pll[idx - JH7100_CLK_PLL0_OUT]; > > > > > + > > > > > + return &priv->reg[idx].hw; > > > > > +} > > > > > + > > > > > +static int __init clk_starfive_jh7100_probe(struct platform_device *pdev) > > > > > > > > Drop __init as this can be called after kernel init is over. > > > > > > Oh interesting, I'd like to know when that can happen. The comment for > > > the builtin_platform_driver macro says it's just a wrapper for > > > > I thought this was using module_platform_driver() macro? > > > > > device_initcall. > > > > > > Won't we then need to remove all the __initconst tags too since the > > > probe function walks through jh7100_clk_data which eventually > > > references all __initconst data? > > > > Yes. If it's builtin_platform_driver() it can't be a module/tristate > > Kconfig, in which case all the init markings can stay. > > Yes, it's already bool in the Kconfig file. After looking into this I > think it's better to do like the rockchip drivers and use > builtin_platform_driver_probe to make sure the probe function only > called at kernel init time: > > static struct platform_driver clk_starfive_jh7100_driver = { > .driver = { > .name = "clk-starfive-jh7100", > .of_match_table = clk_starfive_jh7100_match, > .suppress_bind_attrs = true, > }, > }; > builtin_platform_driver_probe(clk_starfive_jh7100_driver, > clk_starfive_jh7100_probe); > > @Andy: is the supress_bind_attrs what you were asking about? > > > > > > + > > > > > + clk->hw.init = &init; > > > > > + clk->idx = idx; > > > > > + clk->max = jh7100_clk_data[idx].max; > > > > > + > > > > > + ret = clk_hw_register(priv->dev, &clk->hw); > > > > > > > > Why not use devm_clk_hw_register()? > > > > > > I probably could. Just for my understanding that's just to avoid the > > > loop on error below, because as a builtin driver the device won't > > > otherwise go away, right? > > > > Yes > > > > > > > > > > + if (ret) > > > > > + goto err; > > > > > + } > > > > > + > > > > > + ret = devm_of_clk_add_hw_provider(priv->dev, clk_starfive_jh7100_get, priv); > > > > > + if (ret) > > > > > + goto err; > > > > > + > > > > > + return 0; > > > > > +err: > > > > > + while (idx) > > > > > + clk_hw_unregister(&priv->reg[--idx].hw); > > > > > + return ret; > > > > > +} > > > > > + > > > > > +static const struct of_device_id clk_starfive_jh7100_match[] = { > > > > > + { .compatible = "starfive,jh7100-clkgen" }, > > > > > + { /* sentinel */ } > > > > > +}; > > > > > > > > Please add MODULE_DEVICE_TABLE() > > > > > > Will do! > > > > If it's never going to be a module then don't add any module_* things. > > So does that just mean no MODULE_DEVICE_TABLE or should I also remove > MODULE_DESCRIPTION, MODULE_AUTHOR and MODULE_LICENSE? I'm just double > checking because the rockchip drivers seem to have MODULE_DESCRIPTION > and MODULE_LICENSE lines. reading this I realized that the current implementation on the Rockchip side is faulty :-) . For one, there recently was a change for 5.16 that moved this to use module_platform_driver, while keeping the initdata, which suggest that the change was actually not tested at all in that context. And secondly the kconfig is wrong to actually use tristate and should instead use bool. Of course this is also influenced by the recent GKI discussion [0] ;-) I'm going to revert the one change and also adapt the kconfig to use bool again. Heiko [0] https://lwn.net/Articles/872209/
diff --git a/MAINTAINERS b/MAINTAINERS index 8d118d7957d2..e5a19b70dfbb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17848,6 +17848,13 @@ M: Ion Badulescu <ionut@badula.org> S: Odd Fixes F: drivers/net/ethernet/adaptec/starfire* +STARFIVE JH7100 CLOCK DRIVER +M: Emil Renner Berthing <kernel@esmil.dk> +S: Maintained +F: Documentation/devicetree/bindings/clock/starfive,jh7100-clkgen.yaml +F: drivers/clk/starfive/clk-starfive-jh7100.c +F: include/dt-bindings/clock/starfive-jh7100.h + STATIC BRANCH/CALL M: Peter Zijlstra <peterz@infradead.org> M: Josh Poimboeuf <jpoimboe@redhat.com> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index c5b3dc97396a..c91931c94888 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -412,6 +412,7 @@ source "drivers/clk/samsung/Kconfig" source "drivers/clk/sifive/Kconfig" source "drivers/clk/socfpga/Kconfig" source "drivers/clk/sprd/Kconfig" +source "drivers/clk/starfive/Kconfig" source "drivers/clk/sunxi/Kconfig" source "drivers/clk/sunxi-ng/Kconfig" source "drivers/clk/tegra/Kconfig" diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index e42312121e51..a9bb2478fbdd 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -109,6 +109,7 @@ obj-y += socfpga/ obj-$(CONFIG_PLAT_SPEAR) += spear/ obj-y += sprd/ obj-$(CONFIG_ARCH_STI) += st/ +obj-$(CONFIG_SOC_STARFIVE) += starfive/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_SUNXI_CCU) += sunxi-ng/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig new file mode 100644 index 000000000000..c0fa9d5e641f --- /dev/null +++ b/drivers/clk/starfive/Kconfig @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 + +config CLK_STARFIVE_JH7100 + bool "StarFive JH7100 clock support" + depends on SOC_STARFIVE || COMPILE_TEST + default SOC_STARFIVE + help + Say yes here to support the clock controller on the StarFive JH7100 + SoC. diff --git a/drivers/clk/starfive/Makefile b/drivers/clk/starfive/Makefile new file mode 100644 index 000000000000..09759cc73530 --- /dev/null +++ b/drivers/clk/starfive/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +# StarFive Clock +obj-$(CONFIG_CLK_STARFIVE_JH7100) += clk-starfive-jh7100.o diff --git a/drivers/clk/starfive/clk-starfive-jh7100.c b/drivers/clk/starfive/clk-starfive-jh7100.c new file mode 100644 index 000000000000..f109576f18c5 --- /dev/null +++ b/drivers/clk/starfive/clk-starfive-jh7100.c @@ -0,0 +1,776 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * StarFive JH7100 Clock Generator Driver + * + * Copyright 2021 Ahmad Fatoum, Pengutronix + * Copyright (C) 2021 Glider bv + * Copyright (C) 2021 Emil Renner Berthing <kernel@esmil.dk> + */ + +#include <linux/bits.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> +#include <linux/debugfs.h> +#include <linux/device.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/overflow.h> +#include <linux/platform_device.h> + +#include <dt-bindings/clock/starfive-jh7100.h> + +#define JH7100_CLK_ENABLE_SHIFT 31 +#define JH7100_CLK_INVERT_SHIFT 30 +#define JH7100_CLK_MUX_SHIFT 24 + +#define JH7100_CLK_ENABLE BIT(31) +#define JH7100_CLK_INVERT BIT(30) +#define JH7100_CLK_MUX_MASK GENMASK(27, 24) +#define JH7100_CLK_DIV_MASK GENMASK(23, 0) + +static const char *const cpundbus_root_sels[] __initconst = { + [0] = "osc_sys", + [1] = "pll0_out", + [2] = "pll1_out", + [3] = "pll2_out", +}; + +static const char *const dla_root_sels[] __initconst = { + [0] = "osc_sys", + [1] = "pll1_out", + [2] = "pll2_out", +}; + +static const char *const dsp_root_sels[] __initconst = { + [0] = "osc_sys", + [1] = "pll0_out", + [2] = "pll1_out", + [3] = "pll2_out", +}; + +static const char *const gmacusb_root_sels[] __initconst = { + [0] = "osc_sys", + [1] = "pll0_out", + [2] = "pll2_out", +}; + +static const char *const perh0_root_sels[] __initconst = { + [0] = "osc_sys", + [1] = "pll0_out", +}; + +static const char *const perh1_root_sels[] __initconst = { + [0] = "osc_sys", + [1] = "pll2_out", +}; + +static const char *const vin_root_sels[] __initconst = { + [0] = "osc_sys", + [1] = "pll1_out", + [2] = "pll2_out", +}; + +static const char *const vout_root_sels[] __initconst = { + [0] = "osc_aud", + [1] = "pll0_out", + [2] = "pll2_out", +}; + +static const char *const cdechifi4_root_sels[] __initconst = { + [0] = "osc_sys", + [1] = "pll1_out", + [2] = "pll2_out", +}; + +static const char *const cdec_root_sels[] __initconst = { + [0] = "osc_sys", + [1] = "pll0_out", + [2] = "pll1_out", +}; + +static const char *const voutbus_root_sels[] __initconst = { + [0] = "osc_aud", + [1] = "pll0_out", + [2] = "pll2_out", +}; + +static const char *const pll2_refclk_sels[] __initconst = { + [0] = "osc_sys", + [1] = "osc_aud", +}; + +static const char *const ddrc0_sels[] __initconst = { + [0] = "ddrosc_div2", + [1] = "ddrpll_div2", + [2] = "ddrpll_div4", + [3] = "ddrpll_div8", +}; + +static const char *const ddrc1_sels[] __initconst = { + [0] = "ddrosc_div2", + [1] = "ddrpll_div2", + [2] = "ddrpll_div4", + [3] = "ddrpll_div8", +}; + +static const char *const nne_bus_sels[] __initconst = { + [0] = "cpu_axi", + [1] = "nnebus_src1", +}; + +static const char *const usbphy_25m_sels[] __initconst = { + [0] = "osc_sys", + [1] = "usbphy_plldiv25m", +}; + +static const char *const gmac_tx_sels[] __initconst = { + [0] = "gmac_gtxclk", + [1] = "gmac_mii_txclk", + [2] = "gmac_rmii_txclk", +}; + +static const char *const gmac_rx_pre_sels[] __initconst = { + [0] = "gmac_gr_mii_rxclk", + [1] = "gmac_rmii_rxclk", +}; + +struct jh7100_clk { + struct clk_hw hw; + unsigned int idx; + u32 max; +}; + +struct clk_starfive_jh7100_priv { + /* protect registers against overlapping read-modify-write */ + spinlock_t rmw_lock; + struct device *dev; + void __iomem *base; + struct clk_hw *pll[3]; + struct jh7100_clk reg[JH7100_CLK_PLL0_OUT]; +}; + +static struct jh7100_clk *jh7100_clk_from(struct clk_hw *hw) +{ + return container_of(hw, struct jh7100_clk, hw); +} + +static struct clk_starfive_jh7100_priv *jh7100_priv_from(struct jh7100_clk *clk) +{ + return container_of(clk, struct clk_starfive_jh7100_priv, reg[clk->idx]); +} + +static u32 jh7100_clk_reg_get(struct jh7100_clk *clk) +{ + struct clk_starfive_jh7100_priv *priv = jh7100_priv_from(clk); + void __iomem *reg = priv->base + 4 * clk->idx; + + return readl_relaxed(reg); +} + +static void jh7100_clk_reg_rmw(struct jh7100_clk *clk, u32 mask, u32 value) +{ + struct clk_starfive_jh7100_priv *priv = jh7100_priv_from(clk); + void __iomem *reg = priv->base + 4 * clk->idx; + unsigned long flags; + + spin_lock_irqsave(&priv->rmw_lock, flags); + value |= readl_relaxed(reg) & ~mask; + writel_relaxed(value, reg); + spin_unlock_irqrestore(&priv->rmw_lock, flags); +} + +static int jh7100_clk_enable(struct clk_hw *hw) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + + dev_dbg(jh7100_priv_from(clk)->dev, "enable(%s)\n", clk_hw_get_name(&clk->hw)); + + jh7100_clk_reg_rmw(clk, JH7100_CLK_ENABLE, JH7100_CLK_ENABLE); + return 0; +} + +static void jh7100_clk_disable(struct clk_hw *hw) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + + dev_dbg(jh7100_priv_from(clk)->dev, "disable(%s)\n", clk_hw_get_name(&clk->hw)); + + jh7100_clk_reg_rmw(clk, JH7100_CLK_ENABLE, 0); +} + +static int jh7100_clk_is_enabled(struct clk_hw *hw) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + + return !!(jh7100_clk_reg_get(clk) & JH7100_CLK_ENABLE); +} + +static int jh7100_clk_is_parent_enabled(struct clk_hw *hw) +{ + return clk_hw_is_enabled(clk_hw_get_parent(hw)); +} + +static unsigned long jh7100_clk_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + u32 value = jh7100_clk_reg_get(clk) & JH7100_CLK_DIV_MASK; + unsigned long rate; + + if (value) + rate = parent_rate / value; + else + rate = 0; + + dev_dbg(jh7100_priv_from(clk)->dev, "recalc_rate(%s, %lu) = %lu (div %u)\n", + clk_hw_get_name(&clk->hw), parent_rate, rate, value); + + return rate; +} + +static unsigned long jh7100_clk_bestdiv(struct jh7100_clk *clk, + unsigned long rate, unsigned long parent) +{ + unsigned long max = clk->max & JH7100_CLK_DIV_MASK; + unsigned long div = DIV_ROUND_UP(parent, rate); + + return min(div, max); +} + +static int jh7100_clk_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + unsigned long parent = req->best_parent_rate; + unsigned long rate = clamp(req->rate, req->min_rate, req->max_rate); + unsigned long div = jh7100_clk_bestdiv(clk, rate, parent); + unsigned long result = parent / div; + + /* + * We want the result clamped by min_rate and max_rate if possible: + * Case 1: div hits the max divider value, which means it's less than + * parent / rate, so the result is greater than rate and min_rate in + * particular. We can't do anything about result > max_rate because the + * divider doesn't go any further. + * Case 2: div = DIV_ROUND_UP(parent, rate) which means the result is + * always lower or equal to rate and max_rate. However the result may + * turn out lower than min_rate, but then the next higher rate is fine: + * div - 1 = ceil(parent / rate) - 1 < parent / rate + * and thus + * min_rate <= rate < parent / (div - 1) + */ + if (result < req->min_rate && div > 1) { + div -= 1; + result = parent / div; + } + + dev_dbg(jh7100_priv_from(clk)->dev, + "determine_rate(%s, {%lu<=%lu<=%lu from %lu}) = %lu (div %lu)\n", + clk_hw_get_name(&clk->hw), req->min_rate, req->rate, req->max_rate, + parent, result, div); + + req->rate = result; + return 0; +} + +static int jh7100_clk_set_rate(struct clk_hw *hw, + unsigned long rate, + unsigned long parent_rate) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + unsigned long div = jh7100_clk_bestdiv(clk, rate, parent_rate); + + dev_dbg(jh7100_priv_from(clk)->dev, + "set_rate(%s, %lu, %lu) = %lu (div %lu)\n", + clk_hw_get_name(&clk->hw), rate, parent_rate, + parent_rate / div, div); + + jh7100_clk_reg_rmw(clk, JH7100_CLK_DIV_MASK, div); + return 0; +} + +static u8 jh7100_clk_get_parent(struct clk_hw *hw) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + u32 value = jh7100_clk_reg_get(clk); + + return (value & JH7100_CLK_MUX_MASK) >> JH7100_CLK_MUX_SHIFT; +} + +static int jh7100_clk_set_parent(struct clk_hw *hw, u8 index) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + u32 value = (u32)index << JH7100_CLK_MUX_SHIFT; + + dev_dbg(jh7100_priv_from(clk)->dev, "set_parent(%s, %u)\n", + clk_hw_get_name(&clk->hw), index); + + jh7100_clk_reg_rmw(clk, JH7100_CLK_MUX_MASK, value); + return 0; +} + +static int jh7100_clk_mux_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + int ret = clk_mux_determine_rate_flags(&clk->hw, req, 0); + + dev_dbg(jh7100_priv_from(clk)->dev, "determine_rate(%s) = %d\n", + clk_hw_get_name(&clk->hw), ret); + + return ret; +} + +static int jh7100_clk_get_phase(struct clk_hw *hw) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + u32 value = jh7100_clk_reg_get(clk); + + return (value & JH7100_CLK_INVERT) ? 180 : 0; +} + +static int jh7100_clk_set_phase(struct clk_hw *hw, int degrees) +{ + struct jh7100_clk *clk = jh7100_clk_from(hw); + u32 value; + + dev_dbg(jh7100_priv_from(clk)->dev, "set_phase(%s, %d)\n", + clk_hw_get_name(&clk->hw), degrees); + + if (degrees == 0) + value = 0; + else if (degrees == 180) + value = JH7100_CLK_INVERT; + else + return -EINVAL; + + jh7100_clk_reg_rmw(clk, JH7100_CLK_INVERT, value); + return 0; +} + +#ifdef CONFIG_DEBUG_FS +static void jh7100_clk_debug_init(struct clk_hw *hw, struct dentry *dentry) +{ + static const struct debugfs_reg32 jh7100_clk_reg = { + .name = "CTRL", + .offset = 0, + }; + struct jh7100_clk *clk = jh7100_clk_from(hw); + struct clk_starfive_jh7100_priv *priv = jh7100_priv_from(clk); + struct debugfs_regset32 *regset; + + regset = devm_kzalloc(priv->dev, sizeof(*regset), GFP_KERNEL); + if (!regset) + return; + + regset->regs = &jh7100_clk_reg; + regset->nregs = 1; + regset->base = priv->base + 4 * clk->idx; + + debugfs_create_regset32("registers", 0400, dentry, regset); +} +#else +#define jh7100_clk_debug_init NULL +#endif + +static const struct clk_ops jh7100_clk_gate_ops = { + .enable = jh7100_clk_enable, + .disable = jh7100_clk_disable, + .is_enabled = jh7100_clk_is_enabled, + .debug_init = jh7100_clk_debug_init, +}; + +static const struct clk_ops jh7100_clk_div_ops = { + .is_enabled = jh7100_clk_is_parent_enabled, + .recalc_rate = jh7100_clk_recalc_rate, + .determine_rate = jh7100_clk_determine_rate, + .set_rate = jh7100_clk_set_rate, + .debug_init = jh7100_clk_debug_init, +}; + +static const struct clk_ops jh7100_clk_gdiv_ops = { + .enable = jh7100_clk_enable, + .disable = jh7100_clk_disable, + .is_enabled = jh7100_clk_is_enabled, + .recalc_rate = jh7100_clk_recalc_rate, + .determine_rate = jh7100_clk_determine_rate, + .set_rate = jh7100_clk_set_rate, + .debug_init = jh7100_clk_debug_init, +}; + +static const struct clk_ops jh7100_clk_mux_ops = { + .is_enabled = jh7100_clk_is_parent_enabled, + .get_parent = jh7100_clk_get_parent, + .set_parent = jh7100_clk_set_parent, + .determine_rate = jh7100_clk_mux_determine_rate, + .debug_init = jh7100_clk_debug_init, +}; + +static const struct clk_ops jh7100_clk_gmux_ops = { + .enable = jh7100_clk_enable, + .disable = jh7100_clk_disable, + .is_enabled = jh7100_clk_is_enabled, + .get_parent = jh7100_clk_get_parent, + .set_parent = jh7100_clk_set_parent, + .determine_rate = jh7100_clk_mux_determine_rate, + .debug_init = jh7100_clk_debug_init, +}; + +static const struct clk_ops jh7100_clk_inv_ops = { + .is_enabled = jh7100_clk_is_parent_enabled, + .get_phase = jh7100_clk_get_phase, + .set_phase = jh7100_clk_set_phase, + .debug_init = jh7100_clk_debug_init, +}; + +#define JH7100_GATE(_idx, _name, _parent, _flags) [_idx] = { \ + .name = _name, \ + .ops = &jh7100_clk_gate_ops, \ + .parent = _parent, \ + .flags = CLK_SET_RATE_PARENT | (_flags), \ + .max = JH7100_CLK_ENABLE, \ +} + +#define JH7100__DIV(_idx, _name, _parent, _max) [_idx] = { \ + .name = _name, \ + .ops = &jh7100_clk_div_ops, \ + .parent = _parent, \ + .flags = 0, \ + .max = _max, \ +} + +#define JH7100_GDIV(_idx, _name, _parent, _max, _flags) [_idx] = { \ + .name = _name, \ + .ops = &jh7100_clk_gdiv_ops, \ + .parent = _parent, \ + .flags = (_flags), \ + .max = JH7100_CLK_ENABLE | (_max), \ +} + +#define JH7100__MUX(_idx, _name, _parents) [_idx] = { \ + .name = _name, \ + .ops = &jh7100_clk_mux_ops, \ + .parents = _parents, \ + .flags = 0, \ + .max = (ARRAY_SIZE(_parents) - 1) << JH7100_CLK_MUX_SHIFT, \ +} + +#define JH7100_GMUX(_idx, _name, _parents, _flags) [_idx] = { \ + .name = _name, \ + .ops = &jh7100_clk_gmux_ops, \ + .parents = _parents, \ + .flags = (_flags), \ + .max = JH7100_CLK_ENABLE | \ + ((ARRAY_SIZE(_parents) - 1) << JH7100_CLK_MUX_SHIFT), \ +} + +#define JH7100__INV(_idx, _name, _parent) [_idx] = { \ + .name = _name, \ + .ops = &jh7100_clk_inv_ops, \ + .parent = _parent, \ + .flags = CLK_SET_RATE_PARENT, \ + .max = JH7100_CLK_INVERT, \ +} + +static const struct { + const char *name; + const struct clk_ops *ops; + union { + const char *parent; + const char *const *parents; + }; + unsigned long flags; + u32 max; +} jh7100_clk_data[] __initconst = { + JH7100__MUX(JH7100_CLK_CPUNDBUS_ROOT, "cpundbus_root", cpundbus_root_sels), + JH7100__MUX(JH7100_CLK_DLA_ROOT, "dla_root", dla_root_sels), + JH7100__MUX(JH7100_CLK_DSP_ROOT, "dsp_root", dsp_root_sels), + JH7100__MUX(JH7100_CLK_GMACUSB_ROOT, "gmacusb_root", gmacusb_root_sels), + JH7100__MUX(JH7100_CLK_PERH0_ROOT, "perh0_root", perh0_root_sels), + JH7100__MUX(JH7100_CLK_PERH1_ROOT, "perh1_root", perh1_root_sels), + JH7100__MUX(JH7100_CLK_VIN_ROOT, "vin_root", vin_root_sels), + JH7100__MUX(JH7100_CLK_VOUT_ROOT, "vout_root", vout_root_sels), + JH7100_GDIV(JH7100_CLK_AUDIO_ROOT, "audio_root", "pll0_out", 8, 0), + JH7100__MUX(JH7100_CLK_CDECHIFI4_ROOT, "cdechifi4_root", cdechifi4_root_sels), + JH7100__MUX(JH7100_CLK_CDEC_ROOT, "cdec_root", cdec_root_sels), + JH7100__MUX(JH7100_CLK_VOUTBUS_ROOT, "voutbus_root", voutbus_root_sels), + JH7100__DIV(JH7100_CLK_CPUNBUS_ROOT_DIV, "cpunbus_root_div", "cpundbus_root", 2), + JH7100__DIV(JH7100_CLK_DSP_ROOT_DIV, "dsp_root_div", "dsp_root", 4), + JH7100__DIV(JH7100_CLK_PERH0_SRC, "perh0_src", "perh0_root", 4), + JH7100__DIV(JH7100_CLK_PERH1_SRC, "perh1_src", "perh1_root", 4), + JH7100_GDIV(JH7100_CLK_PLL0_TESTOUT, "pll0_testout", "perh0_src", 31, 0), + JH7100_GDIV(JH7100_CLK_PLL1_TESTOUT, "pll1_testout", "dla_root", 31, 0), + JH7100_GDIV(JH7100_CLK_PLL2_TESTOUT, "pll2_testout", "perh1_src", 31, 0), + JH7100__MUX(JH7100_CLK_PLL2_REF, "pll2_refclk", pll2_refclk_sels), + JH7100__DIV(JH7100_CLK_CPU_CORE, "cpu_core", "cpunbus_root_div", 8), + JH7100__DIV(JH7100_CLK_CPU_AXI, "cpu_axi", "cpu_core", 8), + JH7100__DIV(JH7100_CLK_AHB_BUS, "ahb_bus", "cpunbus_root_div", 8), + JH7100__DIV(JH7100_CLK_APB1_BUS, "apb1_bus", "ahb_bus", 8), + JH7100__DIV(JH7100_CLK_APB2_BUS, "apb2_bus", "ahb_bus", 8), + JH7100_GATE(JH7100_CLK_DOM3AHB_BUS, "dom3ahb_bus", "ahb_bus", CLK_IGNORE_UNUSED), + JH7100_GATE(JH7100_CLK_DOM7AHB_BUS, "dom7ahb_bus", "ahb_bus", CLK_IGNORE_UNUSED), + JH7100_GATE(JH7100_CLK_U74_CORE0, "u74_core0", "cpu_core", CLK_IGNORE_UNUSED), + JH7100_GDIV(JH7100_CLK_U74_CORE1, "u74_core1", "cpu_core", 8, CLK_IGNORE_UNUSED), + JH7100_GATE(JH7100_CLK_U74_AXI, "u74_axi", "cpu_axi", CLK_IGNORE_UNUSED), + JH7100_GATE(JH7100_CLK_U74RTC_TOGGLE, "u74rtc_toggle", "osc_sys", CLK_IGNORE_UNUSED), + JH7100_GATE(JH7100_CLK_SGDMA2P_AXI, "sgdma2p_axi", "cpu_axi", 0), + JH7100_GATE(JH7100_CLK_DMA2PNOC_AXI, "dma2pnoc_axi", "cpu_axi", 0), + JH7100_GATE(JH7100_CLK_SGDMA2P_AHB, "sgdma2p_ahb", "ahb_bus", 0), + JH7100__DIV(JH7100_CLK_DLA_BUS, "dla_bus", "dla_root", 4), + JH7100_GATE(JH7100_CLK_DLA_AXI, "dla_axi", "dla_bus", 0), + JH7100_GATE(JH7100_CLK_DLANOC_AXI, "dlanoc_axi", "dla_bus", 0), + JH7100_GATE(JH7100_CLK_DLA_APB, "dla_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_VP6_CORE, "vp6_core", "dsp_root_div", 4, 0), + JH7100__DIV(JH7100_CLK_VP6BUS_SRC, "vp6bus_src", "dsp_root", 4), + JH7100_GDIV(JH7100_CLK_VP6_AXI, "vp6_axi", "vp6bus_src", 4, 0), + JH7100__DIV(JH7100_CLK_VCDECBUS_SRC, "vcdecbus_src", "cdechifi4_root", 4), + JH7100__DIV(JH7100_CLK_VDEC_BUS, "vdec_bus", "vcdecbus_src", 8), + JH7100_GATE(JH7100_CLK_VDEC_AXI, "vdec_axi", "vdec_bus", 0), + JH7100_GATE(JH7100_CLK_VDECBRG_MAIN, "vdecbrg_mainclk", "vdec_bus", 0), + JH7100_GDIV(JH7100_CLK_VDEC_BCLK, "vdec_bclk", "vcdecbus_src", 8, 0), + JH7100_GDIV(JH7100_CLK_VDEC_CCLK, "vdec_cclk", "cdec_root", 8, 0), + JH7100_GATE(JH7100_CLK_VDEC_APB, "vdec_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_JPEG_AXI, "jpeg_axi", "cpunbus_root_div", 8, 0), + JH7100_GDIV(JH7100_CLK_JPEG_CCLK, "jpeg_cclk", "cpunbus_root_div", 8, 0), + JH7100_GATE(JH7100_CLK_JPEG_APB, "jpeg_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_GC300_2X, "gc300_2x", "cdechifi4_root", 8, 0), + JH7100_GATE(JH7100_CLK_GC300_AHB, "gc300_ahb", "ahb_bus", 0), + JH7100__DIV(JH7100_CLK_JPCGC300_AXIBUS, "jpcgc300_axibus", "vcdecbus_src", 8), + JH7100_GATE(JH7100_CLK_GC300_AXI, "gc300_axi", "jpcgc300_axibus", 0), + JH7100_GATE(JH7100_CLK_JPCGC300_MAIN, "jpcgc300_mainclk", "jpcgc300_axibus", 0), + JH7100__DIV(JH7100_CLK_VENC_BUS, "venc_bus", "vcdecbus_src", 8), + JH7100_GATE(JH7100_CLK_VENC_AXI, "venc_axi", "venc_bus", 0), + JH7100_GATE(JH7100_CLK_VENCBRG_MAIN, "vencbrg_mainclk", "venc_bus", 0), + JH7100_GDIV(JH7100_CLK_VENC_BCLK, "venc_bclk", "vcdecbus_src", 8, 0), + JH7100_GDIV(JH7100_CLK_VENC_CCLK, "venc_cclk", "cdec_root", 8, 0), + JH7100_GATE(JH7100_CLK_VENC_APB, "venc_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_DDRPLL_DIV2, "ddrpll_div2", "pll1_out", 2, CLK_IGNORE_UNUSED), + JH7100_GDIV(JH7100_CLK_DDRPLL_DIV4, "ddrpll_div4", "ddrpll_div2", 2, CLK_IGNORE_UNUSED), + JH7100_GDIV(JH7100_CLK_DDRPLL_DIV8, "ddrpll_div8", "ddrpll_div4", 2, CLK_IGNORE_UNUSED), + JH7100_GDIV(JH7100_CLK_DDROSC_DIV2, "ddrosc_div2", "osc_sys", 2, CLK_IGNORE_UNUSED), + JH7100_GMUX(JH7100_CLK_DDRC0, "ddrc0", ddrc0_sels, CLK_IGNORE_UNUSED), + JH7100_GMUX(JH7100_CLK_DDRC1, "ddrc1", ddrc1_sels, CLK_IGNORE_UNUSED), + JH7100_GATE(JH7100_CLK_DDRPHY_APB, "ddrphy_apb", "apb1_bus", CLK_IGNORE_UNUSED), + JH7100__DIV(JH7100_CLK_NOC_ROB, "noc_rob", "cpunbus_root_div", 8), + JH7100__DIV(JH7100_CLK_NOC_COG, "noc_cog", "dla_root", 8), + JH7100_GATE(JH7100_CLK_NNE_AHB, "nne_ahb", "ahb_bus", 0), + JH7100__DIV(JH7100_CLK_NNEBUS_SRC1, "nnebus_src1", "dsp_root", 4), + JH7100__MUX(JH7100_CLK_NNE_BUS, "nne_bus", nne_bus_sels), + JH7100_GATE(JH7100_CLK_NNE_AXI, "nne_axi", "nne_bus", 0), + JH7100_GATE(JH7100_CLK_NNENOC_AXI, "nnenoc_axi", "nne_bus", 0), + JH7100_GATE(JH7100_CLK_DLASLV_AXI, "dlaslv_axi", "nne_bus", 0), + JH7100_GATE(JH7100_CLK_DSPX2C_AXI, "dspx2c_axi", "nne_bus", CLK_IGNORE_UNUSED), + JH7100__DIV(JH7100_CLK_HIFI4_SRC, "hifi4_src", "cdechifi4_root", 4), + JH7100__DIV(JH7100_CLK_HIFI4_COREFREE, "hifi4_corefree", "hifi4_src", 8), + JH7100_GATE(JH7100_CLK_HIFI4_CORE, "hifi4_core", "hifi4_corefree", 0), + JH7100__DIV(JH7100_CLK_HIFI4_BUS, "hifi4_bus", "hifi4_corefree", 8), + JH7100_GATE(JH7100_CLK_HIFI4_AXI, "hifi4_axi", "hifi4_bus", 0), + JH7100_GATE(JH7100_CLK_HIFI4NOC_AXI, "hifi4noc_axi", "hifi4_bus", 0), + JH7100__DIV(JH7100_CLK_SGDMA1P_BUS, "sgdma1p_bus", "cpunbus_root_div", 8), + JH7100_GATE(JH7100_CLK_SGDMA1P_AXI, "sgdma1p_axi", "sgdma1p_bus", 0), + JH7100_GATE(JH7100_CLK_DMA1P_AXI, "dma1p_axi", "sgdma1p_bus", 0), + JH7100_GDIV(JH7100_CLK_X2C_AXI, "x2c_axi", "cpunbus_root_div", 8, CLK_IGNORE_UNUSED), + JH7100__DIV(JH7100_CLK_USB_BUS, "usb_bus", "cpunbus_root_div", 8), + JH7100_GATE(JH7100_CLK_USB_AXI, "usb_axi", "usb_bus", 0), + JH7100_GATE(JH7100_CLK_USBNOC_AXI, "usbnoc_axi", "usb_bus", 0), + JH7100__DIV(JH7100_CLK_USBPHY_ROOTDIV, "usbphy_rootdiv", "gmacusb_root", 4), + JH7100_GDIV(JH7100_CLK_USBPHY_125M, "usbphy_125m", "usbphy_rootdiv", 8, 0), + JH7100_GDIV(JH7100_CLK_USBPHY_PLLDIV25M, "usbphy_plldiv25m", "usbphy_rootdiv", 32, 0), + JH7100__MUX(JH7100_CLK_USBPHY_25M, "usbphy_25m", usbphy_25m_sels), + JH7100__DIV(JH7100_CLK_AUDIO_DIV, "audio_div", "audio_root", 131072), + JH7100_GATE(JH7100_CLK_AUDIO_SRC, "audio_src", "audio_div", 0), + JH7100_GATE(JH7100_CLK_AUDIO_12288, "audio_12288", "osc_aud", 0), + JH7100_GDIV(JH7100_CLK_VIN_SRC, "vin_src", "vin_root", 4, 0), + JH7100__DIV(JH7100_CLK_ISP0_BUS, "isp0_bus", "vin_src", 8), + JH7100_GATE(JH7100_CLK_ISP0_AXI, "isp0_axi", "isp0_bus", 0), + JH7100_GATE(JH7100_CLK_ISP0NOC_AXI, "isp0noc_axi", "isp0_bus", 0), + JH7100_GATE(JH7100_CLK_ISPSLV_AXI, "ispslv_axi", "isp0_bus", 0), + JH7100__DIV(JH7100_CLK_ISP1_BUS, "isp1_bus", "vin_src", 8), + JH7100_GATE(JH7100_CLK_ISP1_AXI, "isp1_axi", "isp1_bus", 0), + JH7100_GATE(JH7100_CLK_ISP1NOC_AXI, "isp1noc_axi", "isp1_bus", 0), + JH7100__DIV(JH7100_CLK_VIN_BUS, "vin_bus", "vin_src", 8), + JH7100_GATE(JH7100_CLK_VIN_AXI, "vin_axi", "vin_bus", 0), + JH7100_GATE(JH7100_CLK_VINNOC_AXI, "vinnoc_axi", "vin_bus", 0), + JH7100_GDIV(JH7100_CLK_VOUT_SRC, "vout_src", "vout_root", 4, 0), + JH7100__DIV(JH7100_CLK_DISPBUS_SRC, "dispbus_src", "voutbus_root", 4), + JH7100__DIV(JH7100_CLK_DISP_BUS, "disp_bus", "dispbus_src", 4), + JH7100_GATE(JH7100_CLK_DISP_AXI, "disp_axi", "disp_bus", 0), + JH7100_GATE(JH7100_CLK_DISPNOC_AXI, "dispnoc_axi", "disp_bus", 0), + JH7100_GATE(JH7100_CLK_SDIO0_AHB, "sdio0_ahb", "ahb_bus", 0), + JH7100_GDIV(JH7100_CLK_SDIO0_CCLKINT, "sdio0_cclkint", "perh0_src", 24, 0), + JH7100__INV(JH7100_CLK_SDIO0_CCLKINT_INV, "sdio0_cclkint_inv", "sdio0_cclkint"), + JH7100_GATE(JH7100_CLK_SDIO1_AHB, "sdio1_ahb", "ahb_bus", 0), + JH7100_GDIV(JH7100_CLK_SDIO1_CCLKINT, "sdio1_cclkint", "perh1_src", 24, 0), + JH7100__INV(JH7100_CLK_SDIO1_CCLKINT_INV, "sdio1_cclkint_inv", "sdio1_cclkint"), + JH7100_GATE(JH7100_CLK_GMAC_AHB, "gmac_ahb", "ahb_bus", 0), + JH7100__DIV(JH7100_CLK_GMAC_ROOT_DIV, "gmac_root_div", "gmacusb_root", 8), + JH7100_GDIV(JH7100_CLK_GMAC_PTP_REF, "gmac_ptp_refclk", "gmac_root_div", 31, 0), + JH7100_GDIV(JH7100_CLK_GMAC_GTX, "gmac_gtxclk", "gmac_root_div", 255, 0), + JH7100_GDIV(JH7100_CLK_GMAC_RMII_TX, "gmac_rmii_txclk", "gmac_rmii_ref", 8, 0), + JH7100_GDIV(JH7100_CLK_GMAC_RMII_RX, "gmac_rmii_rxclk", "gmac_rmii_ref", 8, 0), + JH7100__MUX(JH7100_CLK_GMAC_TX, "gmac_tx", gmac_tx_sels), + JH7100__INV(JH7100_CLK_GMAC_TX_INV, "gmac_tx_inv", "gmac_tx"), + JH7100__MUX(JH7100_CLK_GMAC_RX_PRE, "gmac_rx_pre", gmac_rx_pre_sels), + JH7100__INV(JH7100_CLK_GMAC_RX_INV, "gmac_rx_inv", "gmac_rx_pre"), + JH7100_GATE(JH7100_CLK_GMAC_RMII, "gmac_rmii", "gmac_rmii_ref", 0), + JH7100_GDIV(JH7100_CLK_GMAC_TOPHYREF, "gmac_tophyref", "gmac_root_div", 127, 0), + JH7100_GATE(JH7100_CLK_SPI2AHB_AHB, "spi2ahb_ahb", "ahb_bus", 0), + JH7100_GDIV(JH7100_CLK_SPI2AHB_CORE, "spi2ahb_core", "perh0_src", 31, 0), + JH7100_GATE(JH7100_CLK_EZMASTER_AHB, "ezmaster_ahb", "ahb_bus", 0), + JH7100_GATE(JH7100_CLK_E24_AHB, "e24_ahb", "ahb_bus", 0), + JH7100_GATE(JH7100_CLK_E24RTC_TOGGLE, "e24rtc_toggle", "osc_sys", 0), + JH7100_GATE(JH7100_CLK_QSPI_AHB, "qspi_ahb", "ahb_bus", 0), + JH7100_GATE(JH7100_CLK_QSPI_APB, "qspi_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_QSPI_REF, "qspi_refclk", "perh0_src", 31, 0), + JH7100_GATE(JH7100_CLK_SEC_AHB, "sec_ahb", "ahb_bus", 0), + JH7100_GATE(JH7100_CLK_AES, "aes_clk", "sec_ahb", 0), + JH7100_GATE(JH7100_CLK_SHA, "sha_clk", "sec_ahb", 0), + JH7100_GATE(JH7100_CLK_PKA, "pka_clk", "sec_ahb", 0), + JH7100_GATE(JH7100_CLK_TRNG_APB, "trng_apb", "apb1_bus", 0), + JH7100_GATE(JH7100_CLK_OTP_APB, "otp_apb", "apb1_bus", 0), + JH7100_GATE(JH7100_CLK_UART0_APB, "uart0_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_UART0_CORE, "uart0_core", "perh1_src", 63, 0), + JH7100_GATE(JH7100_CLK_UART1_APB, "uart1_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_UART1_CORE, "uart1_core", "perh1_src", 63, 0), + JH7100_GATE(JH7100_CLK_SPI0_APB, "spi0_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_SPI0_CORE, "spi0_core", "perh1_src", 63, 0), + JH7100_GATE(JH7100_CLK_SPI1_APB, "spi1_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_SPI1_CORE, "spi1_core", "perh1_src", 63, 0), + JH7100_GATE(JH7100_CLK_I2C0_APB, "i2c0_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_I2C0_CORE, "i2c0_core", "perh1_src", 63, 0), + JH7100_GATE(JH7100_CLK_I2C1_APB, "i2c1_apb", "apb1_bus", 0), + JH7100_GDIV(JH7100_CLK_I2C1_CORE, "i2c1_core", "perh1_src", 63, 0), + JH7100_GATE(JH7100_CLK_GPIO_APB, "gpio_apb", "apb1_bus", 0), + JH7100_GATE(JH7100_CLK_UART2_APB, "uart2_apb", "apb2_bus", 0), + JH7100_GDIV(JH7100_CLK_UART2_CORE, "uart2_core", "perh0_src", 63, 0), + JH7100_GATE(JH7100_CLK_UART3_APB, "uart3_apb", "apb2_bus", 0), + JH7100_GDIV(JH7100_CLK_UART3_CORE, "uart3_core", "perh0_src", 63, 0), + JH7100_GATE(JH7100_CLK_SPI2_APB, "spi2_apb", "apb2_bus", 0), + JH7100_GDIV(JH7100_CLK_SPI2_CORE, "spi2_core", "perh0_src", 63, 0), + JH7100_GATE(JH7100_CLK_SPI3_APB, "spi3_apb", "apb2_bus", 0), + JH7100_GDIV(JH7100_CLK_SPI3_CORE, "spi3_core", "perh0_src", 63, 0), + JH7100_GATE(JH7100_CLK_I2C2_APB, "i2c2_apb", "apb2_bus", 0), + JH7100_GDIV(JH7100_CLK_I2C2_CORE, "i2c2_core", "perh0_src", 63, 0), + JH7100_GATE(JH7100_CLK_I2C3_APB, "i2c3_apb", "apb2_bus", 0), + JH7100_GDIV(JH7100_CLK_I2C3_CORE, "i2c3_core", "perh0_src", 63, 0), + JH7100_GATE(JH7100_CLK_WDTIMER_APB, "wdtimer_apb", "apb2_bus", 0), + JH7100_GDIV(JH7100_CLK_WDT_CORE, "wdt_coreclk", "perh0_src", 63, 0), + JH7100_GDIV(JH7100_CLK_TIMER0_CORE, "timer0_coreclk", "perh0_src", 63, 0), + JH7100_GDIV(JH7100_CLK_TIMER1_CORE, "timer1_coreclk", "perh0_src", 63, 0), + JH7100_GDIV(JH7100_CLK_TIMER2_CORE, "timer2_coreclk", "perh0_src", 63, 0), + JH7100_GDIV(JH7100_CLK_TIMER3_CORE, "timer3_coreclk", "perh0_src", 63, 0), + JH7100_GDIV(JH7100_CLK_TIMER4_CORE, "timer4_coreclk", "perh0_src", 63, 0), + JH7100_GDIV(JH7100_CLK_TIMER5_CORE, "timer5_coreclk", "perh0_src", 63, 0), + JH7100_GDIV(JH7100_CLK_TIMER6_CORE, "timer6_coreclk", "perh0_src", 63, 0), + JH7100_GATE(JH7100_CLK_VP6INTC_APB, "vp6intc_apb", "apb2_bus", 0), + JH7100_GATE(JH7100_CLK_PWM_APB, "pwm_apb", "apb2_bus", 0), + JH7100_GATE(JH7100_CLK_MSI_APB, "msi_apb", "apb2_bus", 0), + JH7100_GATE(JH7100_CLK_TEMP_APB, "temp_apb", "apb2_bus", 0), + JH7100_GDIV(JH7100_CLK_TEMP_SENSE, "temp_sense", "osc_sys", 31, 0), + JH7100_GATE(JH7100_CLK_SYSERR_APB, "syserr_apb", "apb2_bus", 0), +}; + +static struct clk_hw *clk_starfive_jh7100_get(struct of_phandle_args *clkspec, void *data) +{ + struct clk_starfive_jh7100_priv *priv = data; + unsigned int idx = clkspec->args[0]; + + if (idx >= JH7100_CLK_END) { + dev_err(priv->dev, "invalid clock index %u\n", idx); + return ERR_PTR(-EINVAL); + } + + if (idx >= JH7100_CLK_PLL0_OUT) + return priv->pll[idx - JH7100_CLK_PLL0_OUT]; + + return &priv->reg[idx].hw; +} + +static int __init clk_starfive_jh7100_probe(struct platform_device *pdev) +{ + struct clk_starfive_jh7100_priv *priv; + unsigned int idx; + int ret; + + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + spin_lock_init(&priv->rmw_lock); + priv->dev = &pdev->dev; + priv->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(priv->base)) + return PTR_ERR(priv->base); + + priv->pll[0] = devm_clk_hw_register_fixed_factor(priv->dev, "pll0_out", + "osc_sys", 0, 40, 1); + if (IS_ERR(priv->pll[0])) + return PTR_ERR(priv->pll[0]); + + priv->pll[1] = devm_clk_hw_register_fixed_factor(priv->dev, "pll1_out", + "osc_sys", 0, 64, 1); + if (IS_ERR(priv->pll[1])) + return PTR_ERR(priv->pll[1]); + + priv->pll[2] = devm_clk_hw_register_fixed_factor(priv->dev, "pll2_out", + "pll2_refclk", 0, 55, 1); + if (IS_ERR(priv->pll[2])) + return PTR_ERR(priv->pll[2]); + + for (idx = 0; idx < JH7100_CLK_PLL0_OUT; idx++) { + u32 max_parent = (jh7100_clk_data[idx].max & JH7100_CLK_MUX_MASK) >> + JH7100_CLK_MUX_SHIFT; + struct clk_init_data init = { + .name = jh7100_clk_data[idx].name, + .ops = jh7100_clk_data[idx].ops, + .num_parents = max_parent + 1, + .flags = jh7100_clk_data[idx].flags, + }; + struct jh7100_clk *clk = &priv->reg[idx]; + + if (init.num_parents > 1) + init.parent_names = jh7100_clk_data[idx].parents; + else + init.parent_names = &jh7100_clk_data[idx].parent; + + clk->hw.init = &init; + clk->idx = idx; + clk->max = jh7100_clk_data[idx].max; + + ret = clk_hw_register(priv->dev, &clk->hw); + if (ret) + goto err; + } + + ret = devm_of_clk_add_hw_provider(priv->dev, clk_starfive_jh7100_get, priv); + if (ret) + goto err; + + return 0; +err: + while (idx) + clk_hw_unregister(&priv->reg[--idx].hw); + return ret; +} + +static const struct of_device_id clk_starfive_jh7100_match[] = { + { .compatible = "starfive,jh7100-clkgen" }, + { /* sentinel */ } +}; + +static struct platform_driver clk_starfive_jh7100_driver = { + .probe = clk_starfive_jh7100_probe, + .driver = { + .name = "clk-starfive-jh7100", + .of_match_table = clk_starfive_jh7100_match, + }, +}; +builtin_platform_driver(clk_starfive_jh7100_driver); + +MODULE_DESCRIPTION("StarFive JH7100 Clock Generator Driver"); +MODULE_AUTHOR("Emil Renner Berthing <kernel@esmil.dk>"); +MODULE_AUTHOR("Geert Uytterhoeven <geert@linux-m68k.org>"); +MODULE_LICENSE("GPL v2");