[PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[Aaron Lu]

Currently, the retuning timer for retuning mode 1 will be deleted in
function sdhci_tasklet_finish after a mmc request done, which will make
retuning timing never trigger again. This patch fixed this problem.

Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
---
 drivers/mmc/host/sdhci.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 91d9892..6250bac 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long param)
 
 	del_timer(&host->timer);
 
-	if (host->version >= SDHCI_SPEC_300)
-		del_timer(&host->tuning_timer);
-
 	mrq = host->mrq;
 
 	/*
-- 
1.7.1

RE: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[Nath, Arindam]

Hi Philip, Zhangfei

Do you have any comments on this patch?

Thanks,
Arindam

> -----Original Message-----
> From: Aaron Lu [mailto:Aaron.Lu@amd.com]
> Sent: Monday, July 11, 2011 10:57 AM
> To: Chris Ball
> Cc: Nath, Arindam; linux-mmc@vger.kernel.org; Lu, Aaron
> Subject: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in
> sdhci_tasklet_finish
> 
> Currently, the retuning timer for retuning mode 1 will be deleted in
> function sdhci_tasklet_finish after a mmc request done, which will make
> retuning timing never trigger again. This patch fixed this problem.
> 
> Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
> ---
>  drivers/mmc/host/sdhci.c |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 91d9892..6250bac 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long
> param)
> 
>  	del_timer(&host->timer);
> 
> -	if (host->version >= SDHCI_SPEC_300)
> -		del_timer(&host->tuning_timer);
> -
>  	mrq = host->mrq;
> 
>  	/*
> --
> 1.7.1

Re: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[Aaron Lu]

On Fri, Jul 15, 2011 at 02:51:34PM +0800, Nath, Arindam wrote:
> Hi Philip, Zhangfei
> 
> Do you have any comments on this patch?
>

Hi all,

This patch is sent for a while now and didn't seem to receive any
notice yet...So, can you please take a look and give your comments?

This is a bug fix for exsting code, if the re-tuning timer is deleted,
the re-tuning will not happen again, that will cause problems for SDHC
3.0 hosts which utilize re-tuning mode 1.

Thanks.
 
> 
> > -----Original Message-----
> > From: Aaron Lu [mailto:Aaron.Lu@amd.com]
> > Sent: Monday, July 11, 2011 10:57 AM
> > To: Chris Ball
> > Cc: Nath, Arindam; linux-mmc@vger.kernel.org; Lu, Aaron
> > Subject: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in
> > sdhci_tasklet_finish
> > 
> > Currently, the retuning timer for retuning mode 1 will be deleted in
> > function sdhci_tasklet_finish after a mmc request done, which will
> make
> > retuning timing never trigger again. This patch fixed this problem.
> > 
> > Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
> > ---
> >  drivers/mmc/host/sdhci.c |    3 ---
> >  1 files changed, 0 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> > index 91d9892..6250bac 100644
> > --- a/drivers/mmc/host/sdhci.c
> > +++ b/drivers/mmc/host/sdhci.c
> > @@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long
> > param)
> > 
> >  	del_timer(&host->timer);
> > 
> > -	if (host->version >= SDHCI_SPEC_300)
> > -		del_timer(&host->tuning_timer);
> > -
> >  	mrq = host->mrq;
> > 
> >  	/*
> > --
> > 1.7.1
> 
> 

Re: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[zhangfei gao]

> This is a bug fix for exsting code, if the re-tuning timer is deleted,
> the re-tuning will not happen again, that will cause problems for SDHC
> 3.0 hosts which utilize re-tuning mode 1.
>
> Thanks.
>
>>
>> > -----Original Message-----
>> > From: Aaron Lu [mailto:Aaron.Lu@amd.com]
>> > Sent: Monday, July 11, 2011 10:57 AM
>> > To: Chris Ball
>> > Cc: Nath, Arindam; linux-mmc@vger.kernel.org; Lu, Aaron
>> > Subject: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in
>> > sdhci_tasklet_finish
>> >
>> > Currently, the retuning timer for retuning mode 1 will be deleted in
>> > function sdhci_tasklet_finish after a mmc request done, which will
>> make
>> > retuning timing never trigger again. This patch fixed this problem.

Does the execute_tuning is called again?
del_timer is not delete timer really, but deactivate the timer, which
could be re-activated by mod_timer.
So if execute_tuning is called, the mod_timer will tigger the tuning
timer again.

>> >
>> > Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
>> > ---
>> >  drivers/mmc/host/sdhci.c |    3 ---
>> >  1 files changed, 0 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>> > index 91d9892..6250bac 100644
>> > --- a/drivers/mmc/host/sdhci.c
>> > +++ b/drivers/mmc/host/sdhci.c
>> > @@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long
>> > param)
>> >
>> >     del_timer(&host->timer);
>> >
>> > -   if (host->version >= SDHCI_SPEC_300)
>> > -           del_timer(&host->tuning_timer);
>> > -
>> >     mrq = host->mrq;
>> >
>> >     /*
>> > --
>> > 1.7.1
>>
>>
>
>

Re: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[Aaron Lu]

On Thu, Jul 21, 2011 at 05:35:02PM +0800, zhangfei gao wrote:
> 
> Does the execute_tuning is called again?
> del_timer is not delete timer really, but deactivate the timer, which
> could be re-activated by mod_timer.
> So if execute_tuning is called, the mod_timer will tigger the tuning
> timer again.
>

Hi zhangfei,

Thanks for the comment.

The execute_tuning will be called at two places:
1 In mmc_sd_init_uhs_card, when host is initializing an UHS card,
and the re-tuning timer will be activated for the first time;
2 When re-tuning timer expired

So if the re-tuning timer is deactivated in sdhci_tasklet_finish,
execute_tuning will have no chance of getting called again, and the
host will not be able to do the re-tuning anymore.
 
> >> >
> >> > Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
> >> > ---
> >> >  drivers/mmc/host/sdhci.c |    3 ---
> >> >  1 files changed, 0 insertions(+), 3 deletions(-)
> >> >
> >> > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> >> > index 91d9892..6250bac 100644
> >> > --- a/drivers/mmc/host/sdhci.c
> >> > +++ b/drivers/mmc/host/sdhci.c
> >> > @@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long
> >> > param)
> >> >
> >> >     del_timer(&host->timer);
> >> >
> >> > -   if (host->version >= SDHCI_SPEC_300)
> >> > -           del_timer(&host->tuning_timer);
> >> > -
> >> >     mrq = host->mrq;
> >> >
> >> >     /*
> >> > --
> >> > 1.7.1
> >>
> >>
> >
> >
> 

Re: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[Philip Rakity]

Aaron,

Code is fine.  Do you want to also fix the problem with suspend or should I do the patch ?

When we are suspending we should kill the tuning timer.

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 4da6a4d..88c25e8 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2289,18 +2289,14 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state)
 
 	sdhci_disable_card_detection(host);
 
-	/* Disable tuning since we are suspending */
-	if (host->version >= SDHCI_SPEC_300 && host->tuning_count &&
-	    host->tuning_mode == SDHCI_TUNING_MODE_1) {
-		host->flags &= ~SDHCI_NEEDS_RETUNING;
-		mod_timer(&host->tuning_timer, jiffies +
-			host->tuning_count * HZ);
-	}
-
 	ret = mmc_suspend_host(host->mmc);
 	if (ret)
 		return ret;
 
+	/* Disable tuning since we are suspending */
+	if (host->version >= SDHCI_SPEC_300)
+		del_timer_sync(&host->tuning_timer);
+
 	free_irq(host->irq, host);
 
 	if (host->vmmc)



Philip

On Jul 21, 2011, at 3:03 AM, Aaron Lu wrote:

> On Thu, Jul 21, 2011 at 05:35:02PM +0800, zhangfei gao wrote:
>> 
>> Does the execute_tuning is called again?
>> del_timer is not delete timer really, but deactivate the timer, which
>> could be re-activated by mod_timer.
>> So if execute_tuning is called, the mod_timer will tigger the tuning
>> timer again.
>> 
> 
> Hi zhangfei,
> 
> Thanks for the comment.
> 
> The execute_tuning will be called at two places:
> 1 In mmc_sd_init_uhs_card, when host is initializing an UHS card,
> and the re-tuning timer will be activated for the first time;
> 2 When re-tuning timer expired
> 
> So if the re-tuning timer is deactivated in sdhci_tasklet_finish,
> execute_tuning will have no chance of getting called again, and the
> host will not be able to do the re-tuning anymore.
> 
>>>>> 
>>>>> Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
>>>>> ---
>>>>>  drivers/mmc/host/sdhci.c |    3 ---
>>>>>  1 files changed, 0 insertions(+), 3 deletions(-)
>>>>> 
>>>>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>>>>> index 91d9892..6250bac 100644
>>>>> --- a/drivers/mmc/host/sdhci.c
>>>>> +++ b/drivers/mmc/host/sdhci.c
>>>>> @@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long
>>>>> param)
>>>>> 
>>>>>     del_timer(&host->timer);
>>>>> 
>>>>> -   if (host->version >= SDHCI_SPEC_300)
>>>>> -           del_timer(&host->tuning_timer);
>>>>> -
>>>>>     mrq = host->mrq;
>>>>> 
>>>>>     /*
>>>>> --
>>>>> 1.7.1
>>>> 
>>>> 
>>> 
>>> 
>> 
> 

Re: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[Aaron Lu]

Hi Philip,

On Thu, Jul 21, 2011 at 01:27:11PM -0700, Philip Rakity wrote:
> 
> Aaron,
> 
> Code is fine.
Thanks.

> Do you want to also fix the problem with suspend or should I do the patch ?
> When we are suspending we should kill the tuning timer.
Yes, that is a problem.

I've another patch to add support for re-tuning mode 2 queued for
submit which should have fixed this problem, but I didn't touch anything
if mmc_suspend_host failed, so when I submit the other patch, please
take you time to review it and let's see how we can fix the problem
altogether :-)

> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 4da6a4d..88c25e8 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -2289,18 +2289,14 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state)
>  
>  	sdhci_disable_card_detection(host);
>  
> -	/* Disable tuning since we are suspending */
> -	if (host->version >= SDHCI_SPEC_300 && host->tuning_count &&
> -	    host->tuning_mode == SDHCI_TUNING_MODE_1) {
> -		host->flags &= ~SDHCI_NEEDS_RETUNING;
> -		mod_timer(&host->tuning_timer, jiffies +
> -			host->tuning_count * HZ);
> -	}
> -
>  	ret = mmc_suspend_host(host->mmc);
>  	if (ret)
>  		return ret;
>  
> +	/* Disable tuning since we are suspending */
> +	if (host->version >= SDHCI_SPEC_300)
> +		del_timer_sync(&host->tuning_timer);
> +
>  	free_irq(host->irq, host);
>  
>  	if (host->vmmc)
> 
> 
> 
> Philip
> 
> On Jul 21, 2011, at 3:03 AM, Aaron Lu wrote:
> 
> > On Thu, Jul 21, 2011 at 05:35:02PM +0800, zhangfei gao wrote:
> >> 
> >> Does the execute_tuning is called again?
> >> del_timer is not delete timer really, but deactivate the timer, which
> >> could be re-activated by mod_timer.
> >> So if execute_tuning is called, the mod_timer will tigger the tuning
> >> timer again.
> >> 
> > 
> > Hi zhangfei,
> > 
> > Thanks for the comment.
> > 
> > The execute_tuning will be called at two places:
> > 1 In mmc_sd_init_uhs_card, when host is initializing an UHS card,
> > and the re-tuning timer will be activated for the first time;
> > 2 When re-tuning timer expired
> > 
> > So if the re-tuning timer is deactivated in sdhci_tasklet_finish,
> > execute_tuning will have no chance of getting called again, and the
> > host will not be able to do the re-tuning anymore.
> > 
> >>>>> 
> >>>>> Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
> >>>>> ---
> >>>>>  drivers/mmc/host/sdhci.c |    3 ---
> >>>>>  1 files changed, 0 insertions(+), 3 deletions(-)
> >>>>> 
> >>>>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> >>>>> index 91d9892..6250bac 100644
> >>>>> --- a/drivers/mmc/host/sdhci.c
> >>>>> +++ b/drivers/mmc/host/sdhci.c
> >>>>> @@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long
> >>>>> param)
> >>>>> 
> >>>>>     del_timer(&host->timer);
> >>>>> 
> >>>>> -   if (host->version >= SDHCI_SPEC_300)
> >>>>> -           del_timer(&host->tuning_timer);
> >>>>> -
> >>>>>     mrq = host->mrq;
> >>>>> 
> >>>>>     /*
> >>>>> --
> >>>>> 1.7.1
> >>>> 
> >>>> 
> >>> 
> >>> 
> >> 
> > 
> 
> 

Re: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[zhangfei gao]

On Thu, Jul 21, 2011 at 6:03 PM, Aaron Lu <aaron.lu@amd.com> wrote:
> On Thu, Jul 21, 2011 at 05:35:02PM +0800, zhangfei gao wrote:
>>
>> Does the execute_tuning is called again?
>> del_timer is not delete timer really, but deactivate the timer, which
>> could be re-activated by mod_timer.
>> So if execute_tuning is called, the mod_timer will tigger the tuning
>> timer again.
>>
>
> Hi zhangfei,
>
> Thanks for the comment.
>
> The execute_tuning will be called at two places:
> 1 In mmc_sd_init_uhs_card, when host is initializing an UHS card,
> and the re-tuning timer will be activated for the first time;
> 2 When re-tuning timer expired
>
> So if the re-tuning timer is deactivated in sdhci_tasklet_finish,
> execute_tuning will have no chance of getting called again, and the
> host will not be able to do the re-tuning anymore.

Thanks for explanation, looks good to me.

>
>> >> >
>> >> > Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
>> >> > ---
>> >> >  drivers/mmc/host/sdhci.c |    3 ---
>> >> >  1 files changed, 0 insertions(+), 3 deletions(-)
>> >> >
>> >> > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>> >> > index 91d9892..6250bac 100644
>> >> > --- a/drivers/mmc/host/sdhci.c
>> >> > +++ b/drivers/mmc/host/sdhci.c
>> >> > @@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long
>> >> > param)
>> >> >
>> >> >     del_timer(&host->timer);
>> >> >
>> >> > -   if (host->version >= SDHCI_SPEC_300)
>> >> > -           del_timer(&host->tuning_timer);
>> >> > -
>> >> >     mrq = host->mrq;
>> >> >
>> >> >     /*
>> >> > --
>> >> > 1.7.1
>> >>
>> >>
>> >
>> >
>>
>
>

Re: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[Aaron Lu]

On Fri, Jul 22, 2011 at 06:21:11PM +0800, zhangfei gao wrote:
> 
> Thanks for explanation, looks good to me.
> 

Hi Philip & Zhangfei,

Can I have your reviewed-by tag in the patch?

Thanks,
Aaron

> >> >> >
> >> >> > Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
> >> >> > ---
> >> >> >  drivers/mmc/host/sdhci.c |    3 ---
> >> >> >  1 files changed, 0 insertions(+), 3 deletions(-)
> >> >> >
> >> >> > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> >> >> > index 91d9892..6250bac 100644
> >> >> > --- a/drivers/mmc/host/sdhci.c
> >> >> > +++ b/drivers/mmc/host/sdhci.c
> >> >> > @@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long
> >> >> > param)
> >> >> >
> >> >> >     del_timer(&host->timer);
> >> >> >
> >> >> > -   if (host->version >= SDHCI_SPEC_300)
> >> >> > -           del_timer(&host->tuning_timer);
> >> >> > -
> >> >> >     mrq = host->mrq;
> >> >> >
> >> >> >     /*
> >> >> > --
> >> >> > 1.7.1
> >> >>
> >> >>
> >> >
> >> >
> >>
> >
> >
> 

RE: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[Philip Rakity]

Reviewed-by: Philip Rakity  <prakity@marvell.com>
________________________________________
From: Aaron Lu [aaron.lu@amd.com]
Sent: Wednesday, July 27, 2011 2:15 AM
To: zhangfei gao; Philip Rakity
Cc: Nath, Arindam; Chris Ball; linux-mmc@vger.kernel.org
Subject: Re: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

On Fri, Jul 22, 2011 at 06:21:11PM +0800, zhangfei gao wrote:
>
> Thanks for explanation, looks good to me.
>

Hi Philip & Zhangfei,

Can I have your reviewed-by tag in the patch?

Thanks,
Aaron

> >> >> >
> >> >> > Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
> >> >> > ---
> >> >> >  drivers/mmc/host/sdhci.c |    3 ---
> >> >> >  1 files changed, 0 insertions(+), 3 deletions(-)
> >> >> >
> >> >> > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> >> >> > index 91d9892..6250bac 100644
> >> >> > --- a/drivers/mmc/host/sdhci.c
> >> >> > +++ b/drivers/mmc/host/sdhci.c
> >> >> > @@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long
> >> >> > param)
> >> >> >
> >> >> >     del_timer(&host->timer);
> >> >> >
> >> >> > -   if (host->version >= SDHCI_SPEC_300)
> >> >> > -           del_timer(&host->tuning_timer);
> >> >> > -
> >> >> >     mrq = host->mrq;
> >> >> >
> >> >> >     /*
> >> >> > --
> >> >> > 1.7.1
> >> >>
> >> >>
> >> >
> >> >
> >>
> >
> >
>

Re: [PATCH] mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish

[Chris Ball]

Hi Aaron,

On Mon, Jul 11 2011, Aaron Lu wrote:
> Currently, the retuning timer for retuning mode 1 will be deleted in
> function sdhci_tasklet_finish after a mmc request done, which will make
> retuning timing never trigger again. This patch fixed this problem.
>
> Signed-off-by: Aaron Lu <Aaron.Lu@amd.com>
> ---
>  drivers/mmc/host/sdhci.c |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 91d9892..6250bac 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1863,9 +1863,6 @@ static void sdhci_tasklet_finish(unsigned long param)
>  
>  	del_timer(&host->timer);
>  
> -	if (host->version >= SDHCI_SPEC_300)
> -		del_timer(&host->tuning_timer);
> -
>  	mrq = host->mrq;
>  
>  	/*

Pushed to mmc-next for 3.1 with Philip's Reviewed-by, thanks.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child