On Mon, Aug 15, 2011 at 12:03 PM, Mika Westerberg
<mika.westerberg@xxxxxxxxxxxxxxx> wrote:
> There are few places where we want to make sure that no clock gating takes
> place. For example when we are updating several related fields in ios
> structure and we don't want to accidentally pass the partially filled ios
> to the host driver.
>
> To solve this we add two functions to enable/disable the aggressive clock
> gating where this is needed.
OK I realize the problem.
There is a terminologty problem here: "disable" is a word used
in the clock framework clk.h and can be very cofusing, since it
means "turn off the clock" or "decrease refcount on clock by one",
whereas here the meaning is the exact opposite.
Please use some other word like "gate inhibit" or so.
> diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
> index b29d3e8..ee52246 100644
> --- a/drivers/mmc/core/host.c
> +++ b/drivers/mmc/core/host.c
> @@ -178,7 +178,7 @@ void mmc_host_clk_gate(struct mmc_host *host)
> spin_lock_irqsave(&host->clk_lock, flags);
> host->clk_requests--;
> if (mmc_host_may_gate_card(host->card) &&
> - !host->clk_requests)
> + !host->clk_requests && !host->clk_disabled)
> schedule_work(&host->clk_gate_work);
> spin_unlock_irqrestore(&host->clk_lock, flags);
> }
> @@ -204,6 +204,42 @@ unsigned int mmc_host_clk_rate(struct mmc_host *host)
> }
>
> /**
> + * mmc_host_clk_gate_disable - temporarily disable clock gating
> + * @host: host to disable clock gating
> + *
> + * Function temporarily disables aggressive clock gating. This is to
> + * prevent clock gating worker to kick in for example in a middle of
> + * ios structure update.
> + *
> + * After this function returns, it is guaranteed that no clock gating
> + * takes place until it is re-enabled again.
> + */
> +void mmc_host_clk_gate_disable(struct mmc_host *host)
So rename "mmc_host_clk_gate_inhibit() or so.
> +{
> + spin_lock_irq(&host->clk_lock);
> + WARN_ON(host->clk_disabled);
> + host->clk_disabled = true;
> + spin_unlock_irq(&host->clk_lock);
> +
> + cancel_work_sync(&host->clk_gate_work);
> +}
To inhibit clock gating it should be enough to increase
the refcount on the requests:
spin_lock_*(&host->clk_lock);
host->clk_requests++;
spin_unlock_*(&host->clk_lock);
But if you look closer at mmc_host_clk_gate() that is
exactly what that function does.
> +/**
> + * mmc_host_clk_gate_enable - re-enables clock gating
> + * @host: host to re-enable clock gating
> + *
> + * Allows aggressive clock gating framework to continue gating the
> + * host clock.
> + */
> +void mmc_host_clk_gate_enable(struct mmc_host *host)
> +{
> + spin_lock_irq(&host->clk_lock);
> + WARN_ON(!host->clk_disabled);
> + host->clk_disabled = false;
> + spin_unlock_irq(&host->clk_lock);
> +}
spin_lock_*(&host->clk_lock);
host->clk_requests--;
spin_unlock_*(&host->clk_lock);
But this is equivalent to mmc_host_clk_gate().
> diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h
> index de199f9..7148b24 100644
> --- a/drivers/mmc/core/host.h
> +++ b/drivers/mmc/core/host.h
> @@ -19,6 +19,8 @@ void mmc_unregister_host_class(void);
> void mmc_host_clk_ungate(struct mmc_host *host);
> void mmc_host_clk_gate(struct mmc_host *host);
> unsigned int mmc_host_clk_rate(struct mmc_host *host);
> +void mmc_host_clk_gate_disable(struct mmc_host *host);
> +void mmc_host_clk_gate_enable(struct mmc_host *host);
>
> #else
> static inline void mmc_host_clk_ungate(struct mmc_host *host)
> @@ -33,6 +35,15 @@ static inline unsigned int mmc_host_clk_rate(struct mmc_host *host)
> {
> return host->ios.clock;
> }
> +
> +static inline void mmc_host_clk_gate_disable(struct mmc_host *host)
> +{
> +}
> +
> +static inline void mmc_host_clk_gate_enable(struct mmc_host *host)
> +{
> +}
> +
> #endif
>
> void mmc_host_deeper_disable(struct work_struct *work);
> diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
> index 1d09562..dea6350 100644
> --- a/include/linux/mmc/host.h
> +++ b/include/linux/mmc/host.h
> @@ -240,6 +240,7 @@ struct mmc_host {
> unsigned int clk_old; /* old clock value cache */
> spinlock_t clk_lock; /* lock for clk fields */
> struct mutex clk_gate_mutex; /* mutex for clock gating */
> + bool clk_disabled; /* gating is temporarily disabled */
This name does not work. Please call it "gating_inhibited" or
something similar if you use this approach.
I would suggest that in all patches using these functions, try
to replace:
mmc_host_clk_disable() -> mmc_host_clk_ungate()
mmc_host_clk_enable() -> mmc_host_clk_gate()
Please tell us if this works!
I understand that the names can be a bit confusing by but
I think you can convince yourself that what this will do is
simply increase the refcount host->clk_requests so the
clock is not gated across these sections.
If you think the names of the functions are confusing then
you may rename them, say like this:
mmc_host_clk_ungate() -> mmc_host_clk_hold()
mmc_host_clk_gate() -> mmc_host_clk_release()
Which would make the usecases more clear, I'd be happy
to ACK a patch for this.
Thanks,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
