On 11/05/16 12:00, Adrian Hunter wrote:
> On 11/05/16 09:48, Ulf Hansson wrote:
>> On 10 May 2016 at 15:03, Adrian Hunter <adrian.hunter@xxxxxxxxx> wrote:
>>> On 10/05/16 15:24, Ulf Hansson wrote:
>>>> On 4 May 2016 at 13:38, Adrian Hunter <adrian.hunter@xxxxxxxxx> wrote:
>>>>> Re-tuning is not possible when switched to the RPMB
>>>>> partition. However re-tuning should not be needed
>>>>> if re-tuning is done immediately before switching,
>>>>> a small set of operations is done, and then we
>>>>> immediately switch back to the main partition.
>>>>>
>>>>> To ensure that re-tuning can't be done for a short
>>>>> while, add a facility to "pause" re-tuning.
>>>>>
>>>>> The existing facility to hold / release re-tuning
>>>>> is used but it also flags re-tuning as needed to cause
>>>>> re-tuning before the next command (which will be the
>>>>> switch to RPMB).
>>>>>
>>>>> We also need to "unpause" in the recovery path, which
>>>>> is catered for by adding it to mmc_retune_disable().
>>>>>
>>>>> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
>>>>> ---
>>>>> drivers/mmc/core/host.c | 22 ++++++++++++++++++++++
>>>>> include/linux/mmc/host.h | 4 ++++
>>>>> 2 files changed, 26 insertions(+)
>>>>>
>>>>> diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
>>>>> index e0a3ee16c0d3..302e5858755a 100644
>>>>> --- a/drivers/mmc/core/host.c
>>>>> +++ b/drivers/mmc/core/host.c
>>>>> @@ -68,8 +68,30 @@ void mmc_retune_enable(struct mmc_host *host)
>>>>> jiffies + host->retune_period * HZ);
>>>>> }
>>>>>
>>>>> +/*
>>>>> + * Pause re-tuning for a small set of operations. The pause begins after the
>>>>> + * next command and after first doing re-tuning.
>>>>> + */
>>>>> +void mmc_retune_pause(struct mmc_host *host)
>>>>> +{
>>>>> + if (!host->retune_paused) {
>>>>> + host->retune_paused = 1;
>>>>> + mmc_retune_needed(host);
>>>>> + mmc_retune_hold(host);
>>>>> + }
>>>>> +}
>>>>> +
>>>>
>>>> When the mmc block device driver is built as a module, this doesn't
>>>> build. I will drop the series from my next branch to sort this out.
>>>
>>> Oops. Sorry!
>>>
>>>> Should we export these via EXPORT_SYMBOL_GPL, or implement them as
>>>> inline functions?
>>>
>>> They need to be exported. I tend to go with what else is in the same file
>>> i.e. host.c is exporting using EXPORT_SYMBOL()
>>
>> Yes, okay!
>>
>>>
>>>>
>>>> This also made me think about the SDIO/WLAN driver issue, during
>>>> system PM suspend/resume, which also needed temporary to disable
>>>> re-tuning.
>>>>
>>>> *If* we are going to export these, I want to make it works for the
>>>> SDIO case well...
>>>
>>> SDIO case is slightly different, and SDIO uses its own header file sdio_func.h.
>>
>> I what way is it different?
>
> In the RPMB case there are 3 things to do:
> 1. Do re-tuning at next command
> 2. Hold re-tuning
> 3. Release re-tuning
>
> In the SDIO case there are 3 things to do:
> 1. Prevent re-tuning at next command
> 2. Hold re-tuning
> 3. Release re-tuning
>
> So the first thing is different.
>
>>
>> Regarding the header file, my point is that I want to keep the numbers
>> of exported functions to a minimum.
>>
>> Do you think there is way to combine these two use cases, such only
>> one pair of new functions would be needed?
>
> To make them the same we would need to add a parameter to mmc_retune_pause()
> i.e. something like
>
> void mmc_retune_pause(struct mmc_host *host, bool retune_now)
> {
> if (!host->retune_paused) {
> host->retune_paused = 1;
> mmc_retune_hold(host);
> if (retune_now)
> mmc_retune_needed(host);
> else
> host->retune_now = 0;
> }
> }
>
> For SDIO we would need to put the function declarations in sdio_func.h as
> well as host.h.
>
> Shall I make a V3 of these patches like that?
I looked again at sdio_func.h and it seems to have its own paradigm i.e. it
is a completely separate set of functions that take the SDIO function as a
parameter, and that hide and encapsulate core and host functions.
It would be inconsistent with that paradigm to expose mmc_retune_pause() and
mmc_retune_unpause() there. Is that what you want to do?
--
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
