Message ID | 1507209837-16938-3-git-send-email-horms+renesas@verge.net.au (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Geert Uytterhoeven |
Headers | show |
Hi Simon, On Thu, Oct 5, 2017 at 3:23 PM, Simon Horman <horms+renesas@verge.net.au> wrote: > From: Takeshi Kihara <takeshi.kihara.df@renesas.com> > > This patch adds Z2 clock divider support for R-Car Gen3 SoC. > > Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > v2 [Simon Horman] > * Consolidate Z and Z2 clock ops > * Allow setting of Z2 clock Thanks for the update! > --- a/drivers/clk/renesas/rcar-gen3-cpg.c > +++ b/drivers/clk/renesas/rcar-gen3-cpg.c > @@ -88,8 +90,8 @@ static int cpg_z_clk_set_rate(struct clk_hw *hw, unsigned long rate, > if (clk_readl(zclk->kick_reg) & CPG_FRQCRB_KICK) > return -EBUSY; > > - val = clk_readl(zclk->reg) & ~CPG_FRQCRC_ZFC_MASK; > - val |= FIELD_PREP(CPG_FRQCRC_ZFC_MASK, 32 - mult); > + val = clk_readl(zclk->reg) & ~zclk->mask; > + val |= ((32 - mult) << __bf_shf(zclk->mask)) & zclk->mask; Any special reason you're now open coding FIELD_PREP()? Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> 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
Hi Simon, On Mon, Oct 9, 2017 at 10:02 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Thu, Oct 5, 2017 at 3:23 PM, Simon Horman <horms+renesas@verge.net.au> wrote: >> From: Takeshi Kihara <takeshi.kihara.df@renesas.com> >> >> This patch adds Z2 clock divider support for R-Car Gen3 SoC. >> >> Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> >> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> >> --- >> v2 [Simon Horman] >> * Consolidate Z and Z2 clock ops >> * Allow setting of Z2 clock > > Thanks for the update! > >> --- a/drivers/clk/renesas/rcar-gen3-cpg.c >> +++ b/drivers/clk/renesas/rcar-gen3-cpg.c > >> @@ -88,8 +90,8 @@ static int cpg_z_clk_set_rate(struct clk_hw *hw, unsigned long rate, >> if (clk_readl(zclk->kick_reg) & CPG_FRQCRB_KICK) >> return -EBUSY; >> >> - val = clk_readl(zclk->reg) & ~CPG_FRQCRC_ZFC_MASK; >> - val |= FIELD_PREP(CPG_FRQCRC_ZFC_MASK, 32 - mult); >> + val = clk_readl(zclk->reg) & ~zclk->mask; >> + val |= ((32 - mult) << __bf_shf(zclk->mask)) & zclk->mask; > > Any special reason you're now open coding FIELD_PREP()? Now I know: to circumvent the BUILD_BUG_ON_MSG(!__builtin_constant_p(_mask), ...) in __BF_FIELD_CHECK(), called from FIELD_PREP(). Given <linux/bitfield.h> is intended to work with constant masks only, I think it's best to not use it, and replace __bf_shf() by __ffs(). > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Oops, looks like you forgot to replace CPG_FRQCRC_ZFC_MASK in cpg_z_clk_recalc_rate() by zclk->mask. Sorry for missing that. 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 Tue, Oct 10, 2017 at 08:56:35AM +0200, Geert Uytterhoeven wrote: > Hi Simon, > > On Mon, Oct 9, 2017 at 10:02 AM, Geert Uytterhoeven > <geert@linux-m68k.org> wrote: > > On Thu, Oct 5, 2017 at 3:23 PM, Simon Horman <horms+renesas@verge.net.au> wrote: > >> From: Takeshi Kihara <takeshi.kihara.df@renesas.com> > >> > >> This patch adds Z2 clock divider support for R-Car Gen3 SoC. > >> > >> Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> > >> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > >> --- > >> v2 [Simon Horman] > >> * Consolidate Z and Z2 clock ops > >> * Allow setting of Z2 clock > > > > Thanks for the update! > > > >> --- a/drivers/clk/renesas/rcar-gen3-cpg.c > >> +++ b/drivers/clk/renesas/rcar-gen3-cpg.c > > > >> @@ -88,8 +90,8 @@ static int cpg_z_clk_set_rate(struct clk_hw *hw, unsigned long rate, > >> if (clk_readl(zclk->kick_reg) & CPG_FRQCRB_KICK) > >> return -EBUSY; > >> > >> - val = clk_readl(zclk->reg) & ~CPG_FRQCRC_ZFC_MASK; > >> - val |= FIELD_PREP(CPG_FRQCRC_ZFC_MASK, 32 - mult); > >> + val = clk_readl(zclk->reg) & ~zclk->mask; > >> + val |= ((32 - mult) << __bf_shf(zclk->mask)) & zclk->mask; > > > > Any special reason you're now open coding FIELD_PREP()? > > Now I know: to circumvent the > BUILD_BUG_ON_MSG(!__builtin_constant_p(_mask), ...) in > __BF_FIELD_CHECK(), called from FIELD_PREP(). Yes, that is correct. A comment is probably in order. > Given <linux/bitfield.h> is intended to work with constant masks > only, I think it's best to not use it, and replace __bf_shf() by __ffs(). I see there has been some discussion of this elsewhere. Perhaps its best to let that cool down before I repost. > > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Oops, looks like you forgot to replace CPG_FRQCRC_ZFC_MASK in > cpg_z_clk_recalc_rate() by zclk->mask. > Sorry for missing that. Thanks, will fix.
diff --git a/drivers/clk/renesas/rcar-gen3-cpg.c b/drivers/clk/renesas/rcar-gen3-cpg.c index d98272a6075f..e794e7b9c40a 100644 --- a/drivers/clk/renesas/rcar-gen3-cpg.c +++ b/drivers/clk/renesas/rcar-gen3-cpg.c @@ -31,7 +31,7 @@ #define CPG_PLL4CR 0x01f4 /* - * Z Clock + * Z Clock & Z2 Clock * * Traits of this clock: * prepare - clk_prepare only ensures that parents are prepared @@ -43,11 +43,13 @@ #define CPG_FRQCRB_KICK BIT(31) #define CPG_FRQCRC 0x000000e0 #define CPG_FRQCRC_ZFC_MASK GENMASK(12, 8) +#define CPG_FRQCRC_Z2FC_MASK GENMASK(4, 0) struct cpg_z_clk { struct clk_hw hw; void __iomem *reg; void __iomem *kick_reg; + unsigned long mask; }; #define to_z_clk(_hw) container_of(_hw, struct cpg_z_clk, hw) @@ -88,8 +90,8 @@ static int cpg_z_clk_set_rate(struct clk_hw *hw, unsigned long rate, if (clk_readl(zclk->kick_reg) & CPG_FRQCRB_KICK) return -EBUSY; - val = clk_readl(zclk->reg) & ~CPG_FRQCRC_ZFC_MASK; - val |= FIELD_PREP(CPG_FRQCRC_ZFC_MASK, 32 - mult); + val = clk_readl(zclk->reg) & ~zclk->mask; + val |= ((32 - mult) << __bf_shf(zclk->mask)) & zclk->mask; clk_writel(val, zclk->reg); /* @@ -127,7 +129,8 @@ static const struct clk_ops cpg_z_clk_ops = { static struct clk * __init cpg_z_clk_register(const char *name, const char *parent_name, - void __iomem *reg) + void __iomem *reg, + unsigned long mask) { struct clk_init_data init; struct cpg_z_clk *zclk; @@ -146,6 +149,7 @@ static struct clk * __init cpg_z_clk_register(const char *name, zclk->reg = reg + CPG_FRQCRC; zclk->kick_reg = reg + CPG_FRQCRB; zclk->hw.init = &init; + zclk->mask = mask; clk = clk_register(NULL, &zclk->hw); if (IS_ERR(clk)) @@ -499,7 +503,11 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev, case CLK_TYPE_GEN3_Z: return cpg_z_clk_register(core->name, __clk_get_name(parent), - base); + base, CPG_FRQCRC_ZFC_MASK); + + case CLK_TYPE_GEN3_Z2: + return cpg_z_clk_register(core->name, __clk_get_name(parent), + base, CPG_FRQCRC_Z2FC_MASK); default: return ERR_PTR(-EINVAL); diff --git a/drivers/clk/renesas/rcar-gen3-cpg.h b/drivers/clk/renesas/rcar-gen3-cpg.h index 89da28f6f71b..c03fd498c96b 100644 --- a/drivers/clk/renesas/rcar-gen3-cpg.h +++ b/drivers/clk/renesas/rcar-gen3-cpg.h @@ -22,6 +22,7 @@ enum rcar_gen3_clk_types { CLK_TYPE_GEN3_R, CLK_TYPE_GEN3_PE, CLK_TYPE_GEN3_Z, + CLK_TYPE_GEN3_Z2, }; #define DEF_GEN3_SD(_name, _id, _parent, _offset) \