Commit b739073a authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Geert Uytterhoeven
Browse files

clk: renesas: rzg2l-cpg: Move PM domain power on in rzg2l_cpg_pd_setup() 



Move the PM domain power on in rzg2l_cpg_pd_setup(). With this the
previously always-on power domains got
struct generic_pm_domain::{power_on, power_off} populated (and
registered with simple_qos_governor if #power-domain-cells = <1> and
with pm_domain_always_on_gov if #power-domain-cells = <0>). The values for
struct generic_pm_domain::{power_on, power_off} are now populated for
all registered domains but used by core only for the domains that can
use them (the PM domain should be non always-on and registered with
simple_qos_governor). Moreover, the power on/off functions check if the
mstop support is valid. The mstop is populated only by the RZ/G3S
initialization code at the moment.

This approach was chosen to keep the code simple and use the same code
across different implementations. There should be no issues with this
approach as the always on domains are registered with GENPD_FLAG_ALWAYS_ON
and the PM domain core takes care of it.

This approach allows doing further cleanups on the rzg2l_cpg power domain
registering code that will be handled by the next commit.

Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/20241015164732.4085249-2-claudiu.beznea.uj@bp.renesas.com


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

drivers/clk/renesas/rzg2l-cpg.c

+23 −18
Original line number Diff line number Diff line
@@ -1680,23 +1680,31 @@ static int rzg2l_cpg_power_off(struct generic_pm_domain *domain) 
	return 0;

}



static int __init rzg2l_cpg_pd_setup(struct rzg2l_cpg_pd *pd, bool always_on)

static int __init rzg2l_cpg_pd_setup(struct rzg2l_cpg_pd *pd)

{

	bool always_on = !!(pd->genpd.flags & GENPD_FLAG_ALWAYS_ON);

	struct dev_power_governor *governor;

	int ret;



	if (always_on)

		governor = &pm_domain_always_on_gov;

	else

		governor = &simple_qos_governor;



	pd->genpd.flags |= GENPD_FLAG_PM_CLK | GENPD_FLAG_ACTIVE_WAKEUP;

	pd->genpd.attach_dev = rzg2l_cpg_attach_dev;

	pd->genpd.detach_dev = rzg2l_cpg_detach_dev;

	if (always_on) {

		pd->genpd.flags |= GENPD_FLAG_ALWAYS_ON;

		governor = &pm_domain_always_on_gov;

	} else {

	pd->genpd.power_on = rzg2l_cpg_power_on;

	pd->genpd.power_off = rzg2l_cpg_power_off;

		governor = &simple_qos_governor;

	}



	return pm_genpd_init(&pd->genpd, governor, !always_on);

	ret = pm_genpd_init(&pd->genpd, governor, !always_on);

	if (ret)

		return ret;



	if (always_on)

		ret = rzg2l_cpg_power_on(&pd->genpd);



	return ret;

}



static int __init rzg2l_cpg_add_clk_domain(struct rzg2l_cpg_priv *priv)
@@ -1711,8 +1719,9 @@ static int __init rzg2l_cpg_add_clk_domain(struct rzg2l_cpg_priv *priv) 
		return -ENOMEM;



	pd->genpd.name = np->name;

	pd->genpd.flags = GENPD_FLAG_ALWAYS_ON;

	pd->priv = priv;

	ret = rzg2l_cpg_pd_setup(pd, true);

	ret = rzg2l_cpg_pd_setup(pd);

	if (ret)

		return ret;
@@ -1785,20 +1794,16 @@ static int __init rzg2l_cpg_add_pm_domains(struct rzg2l_cpg_priv *priv) 
			return -ENOMEM;



		pd->genpd.name = info->pm_domains[i].name;

		if (always_on)

			pd->genpd.flags = GENPD_FLAG_ALWAYS_ON;

		pd->conf = info->pm_domains[i].conf;

		pd->id = info->pm_domains[i].id;

		pd->priv = priv;



		ret = rzg2l_cpg_pd_setup(pd, always_on);

		ret = rzg2l_cpg_pd_setup(pd);

		if (ret)

			return ret;



		if (always_on) {

			ret = rzg2l_cpg_power_on(&pd->genpd);

			if (ret)

				return ret;

		}



		domains->domains[i] = &pd->genpd;

		/* Parent should be on the very first entry of info->pm_domains[]. */

		if (!i) {