Commit ce5e8392 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Ulf Hansson
Browse files

pmdomain: renesas: rcar-sysc: Absorb rcar_sysc_ch into rcar_sysc_pd 



Until commit 7e8a50df ("soc: renesas: rcar-sysc: Drop legacy
handling") in v4.19, the rcar_sysc_ch structure was part of the API for
legacy board code not yet using DT.  Since then, there is no longer a
reason to keep it as a separate structure.

Moreover, a future quirk handling will need access to the rcar_sysc_pd
structure's flags member in rcar_sysc_pwr_on_off().  Hence absorb the
rcar_sysc_ch structure into the rcar_sysc_pd structure, and pass around
the latter instead of the former.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/672805a8c52ce63200e342212bbe6f84a445397b.1713348705.git.geert+renesas@glider.be


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent dff14aff

drivers/pmdomain/renesas/rcar-sysc.c

+24 −30
Original line number Diff line number Diff line
@@ -56,17 +56,20 @@ 


#define RCAR_PD_ALWAYS_ON	32	/* Always-on power area */



struct rcar_sysc_ch {

struct rcar_sysc_pd {

	struct generic_pm_domain genpd;

	u16 chan_offs;

	u8 chan_bit;

	u8 isr_bit;

	unsigned int flags;

	char name[];

};



static void __iomem *rcar_sysc_base;

static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */

static u32 rcar_sysc_extmask_offs, rcar_sysc_extmask_val;



static int rcar_sysc_pwr_on_off(const struct rcar_sysc_ch *sysc_ch, bool on)

static int rcar_sysc_pwr_on_off(const struct rcar_sysc_pd *pd, bool on)

{

	unsigned int sr_bit, reg_offs;

	u32 val;
@@ -88,16 +91,15 @@ static int rcar_sysc_pwr_on_off(const struct rcar_sysc_ch *sysc_ch, bool on) 
		return -EAGAIN;



	/* Submit power shutoff or power resume request */

	iowrite32(BIT(sysc_ch->chan_bit),

		  rcar_sysc_base + sysc_ch->chan_offs + reg_offs);

	iowrite32(BIT(pd->chan_bit), rcar_sysc_base + pd->chan_offs + reg_offs);



	return 0;

}



static int rcar_sysc_power(const struct rcar_sysc_ch *sysc_ch, bool on)

static int rcar_sysc_power(const struct rcar_sysc_pd *pd, bool on)

{

	unsigned int isr_mask = BIT(sysc_ch->isr_bit);

	unsigned int chan_mask = BIT(sysc_ch->chan_bit);

	unsigned int isr_mask = BIT(pd->isr_bit);

	unsigned int chan_mask = BIT(pd->chan_bit);

	unsigned int status, k;

	unsigned long flags;

	int ret;
@@ -125,12 +127,11 @@ static int rcar_sysc_power(const struct rcar_sysc_ch *sysc_ch, bool on) 


	/* Submit power shutoff or resume request until it was accepted */

	for (k = 0; k < PWRER_RETRIES; k++) {

		ret = rcar_sysc_pwr_on_off(sysc_ch, on);

		ret = rcar_sysc_pwr_on_off(pd, on);

		if (ret)

			goto out;



		status = ioread32(rcar_sysc_base +

				  sysc_ch->chan_offs + PWRER_OFFS);

		status = ioread32(rcar_sysc_base + pd->chan_offs + PWRER_OFFS);

		if (!(status & chan_mask))

			break;
@@ -158,28 +159,21 @@ static int rcar_sysc_power(const struct rcar_sysc_ch *sysc_ch, bool on) 
	spin_unlock_irqrestore(&rcar_sysc_lock, flags);



	pr_debug("sysc power %s domain %d: %08x -> %d\n", on ? "on" : "off",

		 sysc_ch->isr_bit, ioread32(rcar_sysc_base + SYSCISR), ret);

		 pd->isr_bit, ioread32(rcar_sysc_base + SYSCISR), ret);

	return ret;

}



static bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch)

static bool rcar_sysc_power_is_off(const struct rcar_sysc_pd *pd)

{

	unsigned int st;



	st = ioread32(rcar_sysc_base + sysc_ch->chan_offs + PWRSR_OFFS);

	if (st & BIT(sysc_ch->chan_bit))

	st = ioread32(rcar_sysc_base + pd->chan_offs + PWRSR_OFFS);

	if (st & BIT(pd->chan_bit))

		return true;



	return false;

}



struct rcar_sysc_pd {

	struct generic_pm_domain genpd;

	struct rcar_sysc_ch ch;

	unsigned int flags;

	char name[];

};



static inline struct rcar_sysc_pd *to_rcar_pd(struct generic_pm_domain *d)

{

	return container_of(d, struct rcar_sysc_pd, genpd);
@@ -190,7 +184,7 @@ static int rcar_sysc_pd_power_off(struct generic_pm_domain *genpd) 
	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);



	pr_debug("%s: %s\n", __func__, genpd->name);

	return rcar_sysc_power(&pd->ch, false);

	return rcar_sysc_power(pd, false);

}



static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
@@ -198,7 +192,7 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd) 
	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);



	pr_debug("%s: %s\n", __func__, genpd->name);

	return rcar_sysc_power(&pd->ch, true);

	return rcar_sysc_power(pd, true);

}



static bool has_cpg_mstp;
@@ -252,12 +246,12 @@ static int __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd) 
		goto finalize;

	}



	if (!rcar_sysc_power_is_off(&pd->ch)) {

	if (!rcar_sysc_power_is_off(pd)) {

		pr_debug("%s: %s is already powered\n", __func__, genpd->name);

		goto finalize;

	}



	rcar_sysc_power(&pd->ch, true);

	rcar_sysc_power(pd, true);



finalize:

	error = pm_genpd_init(genpd, &simple_qos_governor, false);
@@ -412,9 +406,9 @@ static int __init rcar_sysc_pd_init(void) 


		memcpy(pd->name, area->name, n);

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

		pd->ch.chan_offs = area->chan_offs;

		pd->ch.chan_bit = area->chan_bit;

		pd->ch.isr_bit = area->isr_bit;

		pd->chan_offs = area->chan_offs;

		pd->chan_bit = area->chan_bit;

		pd->isr_bit = area->isr_bit;

		pd->flags = area->flags;



		error = rcar_sysc_pd_setup(pd);
@@ -473,10 +467,10 @@ static int rcar_sysc_power_cpu(unsigned int idx, bool on) 
			continue;



		pd = to_rcar_pd(genpd);

		if (!(pd->flags & PD_CPU) || pd->ch.chan_bit != idx)

		if (!(pd->flags & PD_CPU) || pd->chan_bit != idx)

			continue;



		return rcar_sysc_power(&pd->ch, on);

		return rcar_sysc_power(pd, on);

	}



	return -ENOENT;