From: Biju Das <biju.das.jz@bp.renesas.com>
Add support for parent mod clock to register core clocks that has a
parent module clock on the Renesas RZ/G3E SoC (eg: GPT has two clocks
bus clock and core clock. The core clock is controlled by the bus
clock).
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
drivers/clk/renesas/rzv2h-cpg.c | 11 +++++++++++
drivers/clk/renesas/rzv2h-cpg.h | 22 +++++++++++++++++-----
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/renesas/rzv2h-cpg.c b/drivers/clk/renesas/rzv2h-cpg.c
index 8511b7154e90..43fd3fadc5f7 100644
--- a/drivers/clk/renesas/rzv2h-cpg.c
+++ b/drivers/clk/renesas/rzv2h-cpg.c
@@ -823,6 +823,17 @@ rzv2h_cpg_register_mod_clk(const struct rzv2h_mod_clk *mod,
}
priv->clks[id] = clock->hw.clk;
+ if (mod->child_name) {
+ WARN_DEBUG(mod->child >= priv->num_core_clks);
+ WARN_DEBUG(PTR_ERR(priv->clks[mod->child]) != -ENOENT);
+
+ clk = rzv2h_cpg_mod_status_clk_register(priv, mod->child_name, mod->name, 1, 1,
+ FIXED_MOD_CONF_PACK(mod->mon_index,
+ mod->mon_bit));
+ if (IS_ERR_OR_NULL(clk))
+ goto fail;
+ priv->clks[mod->child] = clk;
+ }
/*
* Ensure the module clocks and MSTOP bits are synchronized when they are
diff --git a/drivers/clk/renesas/rzv2h-cpg.h b/drivers/clk/renesas/rzv2h-cpg.h
index 840eed25aeda..c4205c8fd426 100644
--- a/drivers/clk/renesas/rzv2h-cpg.h
+++ b/drivers/clk/renesas/rzv2h-cpg.h
@@ -235,8 +235,10 @@ enum clk_types {
*/
struct rzv2h_mod_clk {
const char *name;
+ const char *child_name;
u32 mstop_data;
u16 parent;
+ u16 child;
bool critical;
bool no_pm;
u8 on_index;
@@ -247,11 +249,13 @@ struct rzv2h_mod_clk {
};
#define DEF_MOD_BASE(_name, _mstop, _parent, _critical, _no_pm, _onindex, \
- _onbit, _monindex, _monbit, _ext_clk_mux_index) \
+ _onbit, _monindex, _monbit, _ext_clk_mux_index, _childname, _child) \
{ \
.name = (_name), \
+ .child_name = (_childname), \
.mstop_data = (_mstop), \
.parent = (_parent), \
+ .child = (_child), \
.critical = (_critical), \
.no_pm = (_no_pm), \
.on_index = (_onindex), \
@@ -262,18 +266,26 @@ struct rzv2h_mod_clk {
}
#define DEF_MOD(_name, _parent, _onindex, _onbit, _monindex, _monbit, _mstop) \
- DEF_MOD_BASE(_name, _mstop, _parent, false, false, _onindex, _onbit, _monindex, _monbit, -1)
+ DEF_MOD_BASE(_name, _mstop, _parent, false, false, _onindex, _onbit, _monindex, \
+ _monbit, -1, NULL, 0)
#define DEF_MOD_CRITICAL(_name, _parent, _onindex, _onbit, _monindex, _monbit, _mstop) \
- DEF_MOD_BASE(_name, _mstop, _parent, true, false, _onindex, _onbit, _monindex, _monbit, -1)
+ DEF_MOD_BASE(_name, _mstop, _parent, true, false, _onindex, _onbit, _monindex, \
+ _monbit, -1, NULL, 0)
#define DEF_MOD_NO_PM(_name, _parent, _onindex, _onbit, _monindex, _monbit, _mstop) \
- DEF_MOD_BASE(_name, _mstop, _parent, false, true, _onindex, _onbit, _monindex, _monbit, -1)
+ DEF_MOD_BASE(_name, _mstop, _parent, false, true, _onindex, _onbit, _monindex, \
+ _monbit, -1, NULL, 0)
#define DEF_MOD_MUX_EXTERNAL(_name, _parent, _onindex, _onbit, _monindex, _monbit, _mstop, \
_ext_clk_mux_index) \
DEF_MOD_BASE(_name, _mstop, _parent, false, false, _onindex, _onbit, _monindex, _monbit, \
- _ext_clk_mux_index)
+ _ext_clk_mux_index, NULL, 0)
+
+#define DEF_MOD_PARENT(_name, _parent, _onindex, _onbit, _monindex, _monbit, _mstop, \
+ _child_name, _child) \
+ DEF_MOD_BASE(_name, _mstop, _parent, false, false, _onindex, _onbit, _monindex, _monbit, \
+ -1, _child_name, _child)
/**
* struct rzv2h_reset - Reset definitions
--
2.43.0Hi Biju,
kernel test robot noticed the following build warnings:
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Biju/clk-renesas-rzv2h-Refactor-rzv2h_cpg_fixed_mod_status_clk_register/20250814-205111
base: https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-clk
patch link: https://lore.kernel.org/r/20250814124832.76266-3-biju.das.jz%40bp.renesas.com
patch subject: [PATCH 2/4] clk: renesas: rzv2h: Add support for parent mod clocks
config: hexagon-randconfig-r072-20250815 (https://download.01.org/0day-ci/archive/20250816/202508160958.ounSAlER-lkp@intel.com/config)
compiler: clang version 22.0.0git (https://github.com/llvm/llvm-project 93d24b6b7b148c47a2fa228a4ef31524fa1d9f3f)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
| Closes: https://lore.kernel.org/r/202508160958.ounSAlER-lkp@intel.com/
New smatch warnings:
drivers/clk/renesas/rzv2h-cpg.c:875 rzv2h_cpg_register_mod_clk() warn: passing zero to 'PTR_ERR'
vim +/PTR_ERR +875 drivers/clk/renesas/rzv2h-cpg.c
dd22e56217495e Lad Prabhakar 2024-07-29 770 static void __init
dd22e56217495e Lad Prabhakar 2024-07-29 771 rzv2h_cpg_register_mod_clk(const struct rzv2h_mod_clk *mod,
dd22e56217495e Lad Prabhakar 2024-07-29 772 struct rzv2h_cpg_priv *priv)
dd22e56217495e Lad Prabhakar 2024-07-29 773 {
dd22e56217495e Lad Prabhakar 2024-07-29 774 struct mod_clock *clock = NULL;
dd22e56217495e Lad Prabhakar 2024-07-29 775 struct device *dev = priv->dev;
dd22e56217495e Lad Prabhakar 2024-07-29 776 struct clk_init_data init;
dd22e56217495e Lad Prabhakar 2024-07-29 777 struct clk *parent, *clk;
dd22e56217495e Lad Prabhakar 2024-07-29 778 const char *parent_name;
dd22e56217495e Lad Prabhakar 2024-07-29 779 unsigned int id;
dd22e56217495e Lad Prabhakar 2024-07-29 780 int ret;
dd22e56217495e Lad Prabhakar 2024-07-29 781
dd22e56217495e Lad Prabhakar 2024-07-29 782 id = GET_MOD_CLK_ID(priv->num_core_clks, mod->on_index, mod->on_bit);
dd22e56217495e Lad Prabhakar 2024-07-29 783 WARN_DEBUG(id >= priv->num_core_clks + priv->num_mod_clks);
dd22e56217495e Lad Prabhakar 2024-07-29 784 WARN_DEBUG(mod->parent >= priv->num_core_clks + priv->num_mod_clks);
dd22e56217495e Lad Prabhakar 2024-07-29 785 WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT);
dd22e56217495e Lad Prabhakar 2024-07-29 786
dd22e56217495e Lad Prabhakar 2024-07-29 787 parent = priv->clks[mod->parent];
dd22e56217495e Lad Prabhakar 2024-07-29 788 if (IS_ERR(parent)) {
dd22e56217495e Lad Prabhakar 2024-07-29 789 clk = parent;
dd22e56217495e Lad Prabhakar 2024-07-29 790 goto fail;
dd22e56217495e Lad Prabhakar 2024-07-29 791 }
dd22e56217495e Lad Prabhakar 2024-07-29 792
dd22e56217495e Lad Prabhakar 2024-07-29 793 clock = devm_kzalloc(dev, sizeof(*clock), GFP_KERNEL);
dd22e56217495e Lad Prabhakar 2024-07-29 794 if (!clock) {
dd22e56217495e Lad Prabhakar 2024-07-29 795 clk = ERR_PTR(-ENOMEM);
dd22e56217495e Lad Prabhakar 2024-07-29 796 goto fail;
dd22e56217495e Lad Prabhakar 2024-07-29 797 }
dd22e56217495e Lad Prabhakar 2024-07-29 798
dd22e56217495e Lad Prabhakar 2024-07-29 799 init.name = mod->name;
dd22e56217495e Lad Prabhakar 2024-07-29 800 init.ops = &rzv2h_mod_clock_ops;
dd22e56217495e Lad Prabhakar 2024-07-29 801 init.flags = CLK_SET_RATE_PARENT;
dd22e56217495e Lad Prabhakar 2024-07-29 802 if (mod->critical)
dd22e56217495e Lad Prabhakar 2024-07-29 803 init.flags |= CLK_IS_CRITICAL;
dd22e56217495e Lad Prabhakar 2024-07-29 804
dd22e56217495e Lad Prabhakar 2024-07-29 805 parent_name = __clk_get_name(parent);
dd22e56217495e Lad Prabhakar 2024-07-29 806 init.parent_names = &parent_name;
dd22e56217495e Lad Prabhakar 2024-07-29 807 init.num_parents = 1;
dd22e56217495e Lad Prabhakar 2024-07-29 808
dd22e56217495e Lad Prabhakar 2024-07-29 809 clock->on_index = mod->on_index;
dd22e56217495e Lad Prabhakar 2024-07-29 810 clock->on_bit = mod->on_bit;
dd22e56217495e Lad Prabhakar 2024-07-29 811 clock->mon_index = mod->mon_index;
dd22e56217495e Lad Prabhakar 2024-07-29 812 clock->mon_bit = mod->mon_bit;
03108a2614ecab Lad Prabhakar 2024-12-02 813 clock->no_pm = mod->no_pm;
899e7ede4c19c6 Lad Prabhakar 2025-05-09 814 clock->ext_clk_mux_index = mod->ext_clk_mux_index;
dd22e56217495e Lad Prabhakar 2024-07-29 815 clock->priv = priv;
dd22e56217495e Lad Prabhakar 2024-07-29 816 clock->hw.init = &init;
9b6e63a777ea5f Biju Das 2024-12-13 817 clock->mstop_data = mod->mstop_data;
dd22e56217495e Lad Prabhakar 2024-07-29 818
dd22e56217495e Lad Prabhakar 2024-07-29 819 ret = devm_clk_hw_register(dev, &clock->hw);
dd22e56217495e Lad Prabhakar 2024-07-29 820 if (ret) {
dd22e56217495e Lad Prabhakar 2024-07-29 821 clk = ERR_PTR(ret);
dd22e56217495e Lad Prabhakar 2024-07-29 822 goto fail;
dd22e56217495e Lad Prabhakar 2024-07-29 823 }
dd22e56217495e Lad Prabhakar 2024-07-29 824
dd22e56217495e Lad Prabhakar 2024-07-29 825 priv->clks[id] = clock->hw.clk;
18610e6bf54faa Biju Das 2025-08-14 826 if (mod->child_name) {
18610e6bf54faa Biju Das 2025-08-14 827 WARN_DEBUG(mod->child >= priv->num_core_clks);
18610e6bf54faa Biju Das 2025-08-14 828 WARN_DEBUG(PTR_ERR(priv->clks[mod->child]) != -ENOENT);
18610e6bf54faa Biju Das 2025-08-14 829
18610e6bf54faa Biju Das 2025-08-14 830 clk = rzv2h_cpg_mod_status_clk_register(priv, mod->child_name, mod->name, 1, 1,
18610e6bf54faa Biju Das 2025-08-14 831 FIXED_MOD_CONF_PACK(mod->mon_index,
18610e6bf54faa Biju Das 2025-08-14 832 mod->mon_bit));
18610e6bf54faa Biju Das 2025-08-14 833 if (IS_ERR_OR_NULL(clk))
18610e6bf54faa Biju Das 2025-08-14 834 goto fail;
This isn't how IS_ERR_OR_NULL() is supposed to work... :( The NULL should
be treated like success, it shouldn't print an error message, unless it's
something like:
WARN_ON_ONCE(!clk); // rzv2h_cpg_mod_status_clk_register() is buggy
I have written a blog about how how IS_ERR_OR_NULL() is supposed to work:
https://staticthinking.wordpress.com/2022/08/01/mixing-error-pointers-and-null/
18610e6bf54faa Biju Das 2025-08-14 835 priv->clks[mod->child] = clk;
18610e6bf54faa Biju Das 2025-08-14 836 }
dd22e56217495e Lad Prabhakar 2024-07-29 837
9b6e63a777ea5f Biju Das 2024-12-13 838 /*
9b6e63a777ea5f Biju Das 2024-12-13 839 * Ensure the module clocks and MSTOP bits are synchronized when they are
9b6e63a777ea5f Biju Das 2024-12-13 840 * turned ON by the bootloader. Enable MSTOP bits for module clocks that were
9b6e63a777ea5f Biju Das 2024-12-13 841 * turned ON in an earlier boot stage.
9b6e63a777ea5f Biju Das 2024-12-13 842 */
9b6e63a777ea5f Biju Das 2024-12-13 843 if (clock->mstop_data != BUS_MSTOP_NONE &&
9b6e63a777ea5f Biju Das 2024-12-13 844 !mod->critical && rzv2h_mod_clock_is_enabled(&clock->hw)) {
9b6e63a777ea5f Biju Das 2024-12-13 845 rzv2h_mod_clock_mstop_enable(priv, clock->mstop_data);
9b6e63a777ea5f Biju Das 2024-12-13 846 } else if (clock->mstop_data != BUS_MSTOP_NONE && mod->critical) {
9b6e63a777ea5f Biju Das 2024-12-13 847 unsigned long mstop_mask = FIELD_GET(BUS_MSTOP_BITS_MASK, clock->mstop_data);
9b6e63a777ea5f Biju Das 2024-12-13 848 u16 mstop_index = FIELD_GET(BUS_MSTOP_IDX_MASK, clock->mstop_data);
69ac2acd209a15 Biju Das 2025-02-22 849 atomic_t *mstop = &priv->mstop_count[mstop_index * 16];
9b6e63a777ea5f Biju Das 2024-12-13 850 unsigned long flags;
9b6e63a777ea5f Biju Das 2024-12-13 851 unsigned int i;
9b6e63a777ea5f Biju Das 2024-12-13 852 u32 val = 0;
9b6e63a777ea5f Biju Das 2024-12-13 853
9b6e63a777ea5f Biju Das 2024-12-13 854 /*
9b6e63a777ea5f Biju Das 2024-12-13 855 * Critical clocks are turned ON immediately upon registration, and the
9b6e63a777ea5f Biju Das 2024-12-13 856 * MSTOP counter is updated through the rzv2h_mod_clock_enable() path.
9b6e63a777ea5f Biju Das 2024-12-13 857 * However, if the critical clocks were already turned ON by the initial
9b6e63a777ea5f Biju Das 2024-12-13 858 * bootloader, synchronize the atomic counter here and clear the MSTOP bit.
9b6e63a777ea5f Biju Das 2024-12-13 859 */
9b6e63a777ea5f Biju Das 2024-12-13 860 spin_lock_irqsave(&priv->rmw_lock, flags);
9b6e63a777ea5f Biju Das 2024-12-13 861 for_each_set_bit(i, &mstop_mask, 16) {
9b6e63a777ea5f Biju Das 2024-12-13 862 if (atomic_read(&mstop[i]))
9b6e63a777ea5f Biju Das 2024-12-13 863 continue;
9b6e63a777ea5f Biju Das 2024-12-13 864 val |= BIT(i) << 16;
9b6e63a777ea5f Biju Das 2024-12-13 865 atomic_inc(&mstop[i]);
9b6e63a777ea5f Biju Das 2024-12-13 866 }
9b6e63a777ea5f Biju Das 2024-12-13 867 if (val)
9b6e63a777ea5f Biju Das 2024-12-13 868 writel(val, priv->base + CPG_BUS_MSTOP(mstop_index));
9b6e63a777ea5f Biju Das 2024-12-13 869 spin_unlock_irqrestore(&priv->rmw_lock, flags);
9b6e63a777ea5f Biju Das 2024-12-13 870 }
9b6e63a777ea5f Biju Das 2024-12-13 871
dd22e56217495e Lad Prabhakar 2024-07-29 872 return;
dd22e56217495e Lad Prabhakar 2024-07-29 873
dd22e56217495e Lad Prabhakar 2024-07-29 874 fail:
dd22e56217495e Lad Prabhakar 2024-07-29 @875 dev_err(dev, "Failed to register module clock %s: %ld\n",
dd22e56217495e Lad Prabhakar 2024-07-29 876 mod->name, PTR_ERR(clk));
dd22e56217495e Lad Prabhakar 2024-07-29 877 }
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2025 Red Hat, Inc.