[PATCH v6 1/7] omap3: pm: fix for twl4030 script load

[PATCH v6 1/7] omap3: pm: fix for twl4030 script load

[Lesly A M]

This patch will fix the TRITON sleep/wakeup sequence.

Since the function to populate the sleep script is getting called always
irrespective of the flag "TWL4030_SLEEP_SCRIPT", other scripts data
is getting over written by the sleep script.

Print warning if the sleep script is loaded before wakeup script.
Because there is a chance that the Power chip may go to sleep before
the wakeup script is completely loaded, which can cause a system hang.

Signed-off-by: Lesly A M <x0080970@ti.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: David Derrick <dderrick@ti.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
---
 drivers/mfd/twl4030-power.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 7efa878..b4fc190 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -451,12 +451,13 @@ static int __init load_twl4030_script(struct twl4030_script *tscript,
 		if (err)
 			goto out;
 	}
-	if (tscript->flags & TWL4030_SLEEP_SCRIPT)
-		if (order)
+	if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
+		if (!order)
 			pr_warning("TWL4030: Bad order of scripts (sleep "\
 					"script before wakeup) Leads to boot"\
 					"failure on some boards\n");
 		err = twl4030_config_sleep_sequence(address);
+	}
 out:
 	return err;
 }
-- 
1.7.0.4

Re: [PATCH v6 1/7] omap3: pm: fix for twl4030 script load

[Kevin Hilman]

Lesly A M <leslyam@ti.com> writes:

> This patch will fix the TRITON sleep/wakeup sequence.
>
> Since the function to populate the sleep script is getting called always
> irrespective of the flag "TWL4030_SLEEP_SCRIPT", other scripts data
> is getting over written by the sleep script.

OK, this is a clear bug fix and should be a patch on its own.

> Print warning if the sleep script is loaded before wakeup script.
> Because there is a chance that the Power chip may go to sleep before
> the wakeup script is completely loaded, which can cause a system hang.

OK, but your patch doesn't add this warning.  It's already  there.

Kevin

> Signed-off-by: Lesly A M <x0080970@ti.com>
> Cc: Nishanth Menon <nm@ti.com>
> Cc: David Derrick <dderrick@ti.com>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> ---
>  drivers/mfd/twl4030-power.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index 7efa878..b4fc190 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -451,12 +451,13 @@ static int __init load_twl4030_script(struct twl4030_script *tscript,
>  		if (err)
>  			goto out;
>  	}
> -	if (tscript->flags & TWL4030_SLEEP_SCRIPT)
> -		if (order)
> +	if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
> +		if (!order)
>  			pr_warning("TWL4030: Bad order of scripts (sleep "\
>  					"script before wakeup) Leads to boot"\
>  					"failure on some boards\n");
>  		err = twl4030_config_sleep_sequence(address);
> +	}
>  out:
>  	return err;
>  }
> -- 
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH v6 1/7] omap3: pm: fix for twl4030 script load

[Lesly Arackal Manuel]

Hi Kevin,

> -----Original Message-----
> From: Kevin Hilman [mailto:khilman@deeprootsystems.com]
> Sent: Thursday, June 03, 2010 10:47 PM
> To: Lesly A M
> Cc: linux-omap@vger.kernel.org; Lesly A M; Nishanth Menon; David Derrick;
> Samuel Ortiz
> Subject: Re: [PATCH v6 1/7] omap3: pm: fix for twl4030 script load
> 
> Lesly A M <leslyam@ti.com> writes:
> 
> > This patch will fix the TRITON sleep/wakeup sequence.
> >
> > Since the function to populate the sleep script is getting called always
> > irrespective of the flag "TWL4030_SLEEP_SCRIPT", other scripts data
> > is getting over written by the sleep script.
> 
> OK, this is a clear bug fix and should be a patch on its own.

OK, I will split the patch in the next version.

> 
> > Print warning if the sleep script is loaded before wakeup script.
> > Because there is a chance that the Power chip may go to sleep before
> > the wakeup script is completely loaded, which can cause a system hang.
> 
> OK, but your patch doesn't add this warning.  It's already  there.

The variable order is updated to '1' during wakeup script for P1_P2 is
populated, and the warning is printed while loading sleep script if order is
set to '1'(ie: warning is printed, if wakeup script is loaded before loading
the sleep script).

But actually we should print the warning, only if wakeup script is not
loaded before loading the sleep script. 

Regards,
Lesly A M
> 
> Kevin
> 
> > Signed-off-by: Lesly A M <x0080970@ti.com>
> > Cc: Nishanth Menon <nm@ti.com>
> > Cc: David Derrick <dderrick@ti.com>
> > Cc: Samuel Ortiz <sameo@linux.intel.com>
> > ---
> >  drivers/mfd/twl4030-power.c |    5 +++--
> >  1 files changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> > index 7efa878..b4fc190 100644
> > --- a/drivers/mfd/twl4030-power.c
> > +++ b/drivers/mfd/twl4030-power.c
> > @@ -451,12 +451,13 @@ static int __init load_twl4030_script(struct
> twl4030_script *tscript,
> >  		if (err)
> >  			goto out;
> >  	}
> > -	if (tscript->flags & TWL4030_SLEEP_SCRIPT)
> > -		if (order)
> > +	if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
> > +		if (!order)
> >  			pr_warning("TWL4030: Bad order of scripts (sleep "\
> >  					"script before wakeup) Leads to
boot"\
> >  					"failure on some boards\n");
> >  		err = twl4030_config_sleep_sequence(address);
> > +	}
> >  out:
> >  	return err;
> >  }
> > --
> > 1.7.0.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html