| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <fbf00a15-9faf-4455-ad4b-c351ffae6598@tuxon.dev>
Date: Fri, 30 Jan 2026 08:56:37 +0200
From: claudiu beznea <claudiu.beznea@...on.dev>
To: ryan.wanner@...rochip.com, mturquette@...libre.com, sboyd@...nel.org,
nicolas.ferre@...rochip.com, alexandre.belloni@...tlin.com,
bmasney@...hat.com, alexander.sverdlin@...il.com,
varshini.rajendran@...rochip.com
Cc: cristian.birsan@...rochip.com, balamanikandan.gunasundar@...rochip.com,
linux-clk@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v5 10/31] clk: at91: clk-generated: use clk_parent_data
Hi, Ryan,
On 1/16/26 22:07, ryan.wanner@...rochip.com wrote:
> From: Claudiu Beznea <claudiu.beznea@...on.dev>
>
> Use struct clk_parent_data instead of struct parent_hw as this leads
> to less usage of __clk_get_hw() in SoC specific clock drivers and simpler
> conversion of existing SoC specific clock drivers from parent_names to
> modern clk_parent_data structures.
>
> Remove the last of the usage of __clk_get_hw().
>
> Signed-off-by: Claudiu Beznea <claudiu.beznea@...on.dev>
> [ryan.wanner@...rochip.com: Added SAMA7D65 and SAM9X75 SoCs to the
> clk-generated changes. Adjust clk name variable order.]
> Signed-off-by: Ryan Wanner <Ryan.Wanner@...rochip.com>
> ---
> drivers/clk/at91/clk-generated.c | 8 +++----
> drivers/clk/at91/pmc.h | 2 +-
> drivers/clk/at91/sam9x7.c | 37 ++++++++++++++++----------------
> drivers/clk/at91/sama7d65.c | 37 ++++++++++++++++----------------
> drivers/clk/at91/sama7g5.c | 35 +++++++++++++++---------------
> 5 files changed, 58 insertions(+), 61 deletions(-)
>
> diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
> index 4b4edeecc889..d9e00167dbc8 100644
> --- a/drivers/clk/at91/clk-generated.c
> +++ b/drivers/clk/at91/clk-generated.c
> @@ -319,7 +319,7 @@ struct clk_hw * __init
> at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
> const struct clk_pcr_layout *layout,
> const char *name, const char **parent_names,
> - struct clk_hw **parent_hws,
> + struct clk_parent_data *parent_data,
> u32 *mux_table, u8 num_parents, u8 id,
> const struct clk_range *range,
> int chg_pid)
> @@ -329,7 +329,7 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
> struct clk_hw *hw;
> int ret;
>
> - if (!(parent_names || parent_hws))
> + if (!(parent_names || parent_data))
> return ERR_PTR(-ENOMEM);
>
> gck = kzalloc(sizeof(*gck), GFP_KERNEL);
> @@ -338,8 +338,8 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
>
> init.name = name;
> init.ops = &generated_ops;
> - if (parent_hws)
> - init.parent_hws = (const struct clk_hw **)parent_hws;
> + if (parent_data)
> + init.parent_data = (const struct clk_parent_data *)parent_data;
> else
> init.parent_names = parent_names;
> init.num_parents = num_parents;
> diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
> index 3d06b1c41f13..d8d491096c0d 100644
> --- a/drivers/clk/at91/pmc.h
> +++ b/drivers/clk/at91/pmc.h
> @@ -174,7 +174,7 @@ struct clk_hw * __init
> at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
> const struct clk_pcr_layout *layout,
> const char *name, const char **parent_names,
> - struct clk_hw **parent_hws, u32 *mux_table,
> + struct clk_parent_data *parent_data, u32 *mux_table,
> u8 num_parents, u8 id,
> const struct clk_range *range, int chg_pid);
>
> diff --git a/drivers/clk/at91/sam9x7.c b/drivers/clk/at91/sam9x7.c
> index f98aecdd6f88..d549bdd988e8 100644
> --- a/drivers/clk/at91/sam9x7.c
> +++ b/drivers/clk/at91/sam9x7.c
> @@ -744,16 +744,15 @@ static const struct {
> static void __init sam9x7_pmc_setup(struct device_node *np)
> {
> struct clk_range range = CLK_RANGE(0, 0);
> - const char *main_xtal_name;
> + const char *main_xtal_name, *td_slck_name, *md_slck_name;
> struct pmc_data *sam9x7_pmc;
> const char *parent_names[9];
> void **clk_mux_buffer = NULL;
> int clk_mux_buffer_size = 0;
> struct regmap *regmap;
> struct clk_hw *hw, *main_rc_hw, *main_osc_hw, *main_xtal_hw;
> - struct clk_hw *td_slck_hw, *md_slck_hw, *usbck_hw;
> + struct clk_hw *usbck_hw;
> struct clk_parent_data parent_data[9];
> - struct clk_hw *parent_hws[9];
> int i, j;
>
> i = of_property_match_string(np, "clock-names", "main_xtal");
> @@ -762,11 +761,15 @@ static void __init sam9x7_pmc_setup(struct device_node *np)
> return;
> main_xtal_name = of_clk_get_parent_name(np, i);
>
> - td_slck_hw = __clk_get_hw(of_clk_get_by_name(np, "td_slck"));
> - md_slck_hw = __clk_get_hw(of_clk_get_by_name(np, "md_slck"));
> + i = of_property_match_string(np, "clock-names", "td_slck");
> + if (i < 0)
> + return;
> + td_slck_name = of_clk_get_parent_name(np, i);
>
> - if (!td_slck_hw || !md_slck_hw)
> + i = of_property_match_string(np, "clock-names", "md_slck");
> + if (i < 0)
> return;
> + md_slck_name = of_clk_get_parent_name(np, i);
>
> regmap = device_node_to_regmap(np);
> if (IS_ERR(regmap))
> @@ -862,7 +865,7 @@ static void __init sam9x7_pmc_setup(struct device_node *np)
> }
> }
>
> - parent_data[0] = AT91_CLK_PD_NAME("md_slck");
> + parent_data[0] = AT91_CLK_PD_NAME(md_slck_name);
> parent_data[1] = AT91_CLK_PD_HW(sam9x7_pmc->chws[PMC_MAIN]);
> parent_data[2] = AT91_CLK_PD_HW(sam9x7_plls[PLL_ID_PLLA][PLL_COMPID_DIV0].hw);
> parent_data[3] = AT91_CLK_PD_HW(sam9x7_plls[PLL_ID_UPLL][PLL_COMPID_DIV0].hw);
> @@ -888,8 +891,8 @@ static void __init sam9x7_pmc_setup(struct device_node *np)
> if (IS_ERR(usbck_hw))
> goto err_free;
>
> - parent_data[0] = AT91_CLK_PD_NAME("md_slck");
> - parent_data[1] = AT91_CLK_PD_NAME("td_slck");
> + parent_data[0] = AT91_CLK_PD_NAME(md_slck_name);
> + parent_data[1] = AT91_CLK_PD_NAME(td_slck_name);
> parent_data[2] = AT91_CLK_PD_HW(sam9x7_pmc->chws[PMC_MAIN]);
> parent_data[3] = AT91_CLK_PD_HW(sam9x7_pmc->chws[PMC_MCK]);
> parent_data[4] = AT91_CLK_PD_HW(sam9x7_plls[PLL_ID_PLLA][PLL_COMPID_DIV0].hw);
> @@ -940,13 +943,12 @@ static void __init sam9x7_pmc_setup(struct device_node *np)
> sam9x7_pmc->phws[sam9x7_periphck[i].id] = hw;
> }
>
> - parent_hws[0] = md_slck_hw;
> - parent_hws[1] = td_slck_hw;
> - parent_hws[2] = sam9x7_pmc->chws[PMC_MAIN];
> - parent_hws[3] = sam9x7_pmc->chws[PMC_MCK];
> + parent_data[0] = AT91_CLK_PD_NAME(md_slck_name);
> + parent_data[1] = AT91_CLK_PD_NAME(td_slck_name);
> + parent_data[2] = AT91_CLK_PD_HW(sam9x7_pmc->chws[PMC_MAIN]);
> + parent_data[3] = AT91_CLK_PD_HW(sam9x7_pmc->chws[PMC_MCK]);
> for (i = 0; i < ARRAY_SIZE(sam9x7_gck); i++) {
> u8 num_parents = 4 + sam9x7_gck[i].pp_count;
> - struct clk_hw *tmp_parent_hws[6];
> u32 *mux_table;
>
> mux_table = kmalloc_array(num_parents, sizeof(*mux_table),
> @@ -962,16 +964,13 @@ static void __init sam9x7_pmc_setup(struct device_node *np)
> u8 pll_id = sam9x7_gck[i].pp[j].pll_id;
> u8 pll_compid = sam9x7_gck[i].pp[j].pll_compid;
>
> - tmp_parent_hws[j] = sam9x7_plls[pll_id][pll_compid].hw;
> + parent_data[4 + j] = AT91_CLK_PD_HW(sam9x7_plls[pll_id][pll_compid].hw);
> }
>
> - PMC_FILL_TABLE(&parent_hws[4], tmp_parent_hws,
> - sam9x7_gck[i].pp_count);
> -
Ideally, these kind of changes should have been done through a different patch.
Could you please create a different patch for all changes like in this series?
With that addressed:
Reviewed-by: Claudiu Beznea <claudiu.beznea@...on.dev>
Powered by blists - more mailing lists