Commit 69ac2acd authored by Biju Das's avatar Biju Das Committed by Geert Uytterhoeven
Browse files

clk: renesas: rzv2h: Adjust for CPG_BUS_m_MSTOP starting from m = 1 



Avoid using the "- 1" for finding mstop_index in all functions accessing
priv->mstop_count, by adjusting its pointer in rzv2h_cpg_probe().

While at it, drop the intermediate local variable index.

Reported-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Closes: https://lore.kernel.org/all/CAMuHMdX1gPNCFddg_DyK7Bv0BeFLOLi=5eteT_HhMH=Ph2wVvA@mail.gmail.com/


Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/20250222142009.41324-1-biju.das.jz@bp.renesas.com


Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 5288fe0e

drivers/clk/renesas/rzv2h-cpg.c

+6 −6
Original line number Diff line number Diff line
@@ -447,8 +447,7 @@ static void rzv2h_mod_clock_mstop_enable(struct rzv2h_cpg_priv *priv, 
{

	unsigned long mstop_mask = FIELD_GET(BUS_MSTOP_BITS_MASK, mstop_data);

	u16 mstop_index = FIELD_GET(BUS_MSTOP_IDX_MASK, mstop_data);

	unsigned int index = (mstop_index - 1) * 16;

	atomic_t *mstop = &priv->mstop_count[index];

	atomic_t *mstop = &priv->mstop_count[mstop_index * 16];

	unsigned long flags;

	unsigned int i;

	u32 val = 0;
@@ -469,8 +468,7 @@ static void rzv2h_mod_clock_mstop_disable(struct rzv2h_cpg_priv *priv, 
{

	unsigned long mstop_mask = FIELD_GET(BUS_MSTOP_BITS_MASK, mstop_data);

	u16 mstop_index = FIELD_GET(BUS_MSTOP_IDX_MASK, mstop_data);

	unsigned int index = (mstop_index - 1) * 16;

	atomic_t *mstop = &priv->mstop_count[index];

	atomic_t *mstop = &priv->mstop_count[mstop_index * 16];

	unsigned long flags;

	unsigned int i;

	u32 val = 0;
@@ -630,8 +628,7 @@ rzv2h_cpg_register_mod_clk(const struct rzv2h_mod_clk *mod, 
	} else if (clock->mstop_data != BUS_MSTOP_NONE && mod->critical) {

		unsigned long mstop_mask = FIELD_GET(BUS_MSTOP_BITS_MASK, clock->mstop_data);

		u16 mstop_index = FIELD_GET(BUS_MSTOP_IDX_MASK, clock->mstop_data);

		unsigned int index = (mstop_index - 1) * 16;

		atomic_t *mstop = &priv->mstop_count[index];

		atomic_t *mstop = &priv->mstop_count[mstop_index * 16];

		unsigned long flags;

		unsigned int i;

		u32 val = 0;
@@ -926,6 +923,9 @@ static int __init rzv2h_cpg_probe(struct platform_device *pdev) 
	if (!priv->mstop_count)

		return -ENOMEM;



	/* Adjust for CPG_BUS_m_MSTOP starting from m = 1 */

	priv->mstop_count -= 16;



	priv->resets = devm_kmemdup(dev, info->resets, sizeof(*info->resets) *

				    info->num_resets, GFP_KERNEL);

	if (!priv->resets)