Patchwork [Maverick] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap

login
register
mail settings
Submitter Mathieu Poirier
Date June 21, 2010, 11:30 p.m.
Message ID <1277163041.30417.1.camel@black>
Download mbox | patch
Permalink /patch/56376/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Mathieu Poirier - June 21, 2010, 11:30 p.m.
>From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
Date: Mon, 21 Jun 2010 17:19:46 -0600
Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap

This is a temperary fix that allow the system to be usable.  The real fix,
the one that really correct what seems to be an issue with retreiving
the value of the PM_WKST_WKUP register should follow shortly.

BugLink: https://bugs/launchpad.net/bugs/594382

Signed-off-by: Mathieu Poirier <mathieu.poirier@canonical.com>
---
 debian.master/config/amd64/config.common.amd64 |    1 +
 debian.master/config/armel/config.common.armel |    1 +
 debian.master/config/config.common.ubuntu      |    1 -
 debian.master/config/i386/config.common.i386   |    1 +
 4 files changed, 3 insertions(+), 1 deletions(-)
Bryan Wu - June 22, 2010, 2:11 a.m.
On 06/22/2010 07:30 AM, Mathieu Poirier wrote:
>>From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
> From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
> Date: Mon, 21 Jun 2010 17:19:46 -0600
> Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap
> 
> This is a temperary fix that allow the system to be usable.  The real fix,
> the one that really correct what seems to be an issue with retreiving
> the value of the PM_WKST_WKUP register should follow shortly.
> 

Since this is a critical bug, is there any fixing patch in TI omap3 tree or
linux-omap tree or upstream mainline? I think cherry pick them into our Maverick
tree is better.

BTW. CONFIG_CPU_IDLE was disabled in ti-omap4 branch.

Thanks,
-Bryan

> BugLink: https://bugs/launchpad.net/bugs/594382
> 
> Signed-off-by: Mathieu Poirier <mathieu.poirier@canonical.com>
> ---
>  debian.master/config/amd64/config.common.amd64 |    1 +
>  debian.master/config/armel/config.common.armel |    1 +
>  debian.master/config/config.common.ubuntu      |    1 -
>  debian.master/config/i386/config.common.i386   |    1 +
>  4 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index fd43848..783b7ac 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -26,6 +26,7 @@ CONFIG_CDROM_PKTCDVD=y
>  CONFIG_CEPH_FS=m
>  CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
>  CONFIG_COMEDI=m
> +CONFIG_CPU_IDLE=y
>  CONFIG_CRYPTO_HMAC=y
>  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  CONFIG_DISPLAY_SUPPORT=m
> diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
> index ba002ce..262a404 100644
> --- a/debian.master/config/armel/config.common.armel
> +++ b/debian.master/config/armel/config.common.armel
> @@ -8,6 +8,7 @@ CONFIG_ASYNC_TX_DMA=y
>  CONFIG_ATM_BR2684_IPFILTER=y
>  CONFIG_ATM_DUMMY=m
>  # CONFIG_COMEDI is not set
> +# CONFIG_CPU_IDLE is not set
>  CONFIG_DEFAULT_CFQ=y
>  # CONFIG_DEFAULT_DEADLINE is not set
>  CONFIG_DEFAULT_IOSCHED="cfq"
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 902ea7d..231120b 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -787,7 +787,6 @@ CONFIG_CPU_FREQ_TABLE=y
>  CONFIG_CPU_HAS_ASID=y
>  CONFIG_CPU_HAS_PMU=y
>  # CONFIG_CPU_ICACHE_DISABLE is not set
> -CONFIG_CPU_IDLE=y
>  CONFIG_CPU_IDLE_GOV_LADDER=y
>  CONFIG_CPU_IDLE_GOV_MENU=y
>  CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index d883dd0..92110fd 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -24,6 +24,7 @@ CONFIG_CDROM_PKTCDVD=y
>  CONFIG_CEPH_FS=m
>  CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
>  CONFIG_COMEDI=m
> +CONFIG_CPU_IDLE=y
>  CONFIG_CRYPTO_HMAC=y
>  CONFIG_DEFAULT_CFQ=y
>  # CONFIG_DEFAULT_DEADLINE is not set
Amit Kucheria - June 22, 2010, 8:31 a.m.
On 10 Jun 22, Bryan Wu wrote:
> On 06/22/2010 07:30 AM, Mathieu Poirier wrote:
> >>From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
> > From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
> > Date: Mon, 21 Jun 2010 17:19:46 -0600
> > Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap
> > 
> > This is a temperary fix that allow the system to be usable.  The real fix,
> > the one that really correct what seems to be an issue with retreiving
> > the value of the PM_WKST_WKUP register should follow shortly.
> > 
> 
> Since this is a critical bug, is there any fixing patch in TI omap3 tree or
> linux-omap tree or upstream mainline? I think cherry pick them into our Maverick
> tree is better.
> 
> BTW. CONFIG_CPU_IDLE was disabled in ti-omap4 branch.
> 
> Thanks,
> -Bryan
> 

There are a bunch of fixes in the 'pm' branch of the linux-omap kernel tree[1].

[1]. git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
Andy Whitcroft - June 22, 2010, 9:58 a.m.
On Mon, Jun 21, 2010 at 05:30:41PM -0600, Mathieu Poirier wrote:
> >From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
> From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
> Date: Mon, 21 Jun 2010 17:19:46 -0600
> Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap
> 
> This is a temperary fix that allow the system to be usable.  The real fix,
> the one that really correct what seems to be an issue with retreiving
> the value of the PM_WKST_WKUP register should follow shortly.

You really should include which releases patches are destined for.  Here
I assume this is destined for maverick so you should include that in the
subject.  Something like this.

  Subject: [PATCH] [Maverick] UBUNTU: ARM: ....

Also is this critical for Alpha-2?  If so you need to make sure Leann is
aware, contact her direct to ensure its not missed.

-apw
Mathieu Poirier - June 22, 2010, 2:12 p.m.
Sadly enough the problem seems, once again, isolated to the maverick
tree.  Upstream indeed has CONFIG_CPU_IDLE turned off but turning it on
doesn't, like in maverick, trigger the daisy chain messages.

The code in both maverick and upstream follows the *exact* same path,
except that a "__raw_readl" is failing in the former, creating error
messages.  This is - I think - yet another timing issue since adding
mdelay(5) gives enough time for the call to return properly.  

I wouldn't hesitate to turn CONFIG_CPU_IDLE off and forget about it but
the implementation of the "cpuidle" driver in "cpuidle34xx.c" fits
perfectly in the OMAP3 scheme. 

The real problem here lies with "__raw_readl" - why in the world is it
returning too quickly ?

On Tue, 2010-06-22 at 10:11 +0800, Bryan Wu wrote:
> On 06/22/2010 07:30 AM, Mathieu Poirier wrote:
> >>From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
> > From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
> > Date: Mon, 21 Jun 2010 17:19:46 -0600
> > Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap
> > 
> > This is a temperary fix that allow the system to be usable.  The real fix,
> > the one that really correct what seems to be an issue with retreiving
> > the value of the PM_WKST_WKUP register should follow shortly.
> > 
> 
> Since this is a critical bug, is there any fixing patch in TI omap3 tree or
> linux-omap tree or upstream mainline? I think cherry pick them into our Maverick
> tree is better.
> 
> BTW. CONFIG_CPU_IDLE was disabled in ti-omap4 branch.
> 
> Thanks,
> -Bryan
> 
> > BugLink: https://bugs/launchpad.net/bugs/594382
> > 
> > Signed-off-by: Mathieu Poirier <mathieu.poirier@canonical.com>
> > ---
> >  debian.master/config/amd64/config.common.amd64 |    1 +
> >  debian.master/config/armel/config.common.armel |    1 +
> >  debian.master/config/config.common.ubuntu      |    1 -
> >  debian.master/config/i386/config.common.i386   |    1 +
> >  4 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> > index fd43848..783b7ac 100644
> > --- a/debian.master/config/amd64/config.common.amd64
> > +++ b/debian.master/config/amd64/config.common.amd64
> > @@ -26,6 +26,7 @@ CONFIG_CDROM_PKTCDVD=y
> >  CONFIG_CEPH_FS=m
> >  CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
> >  CONFIG_COMEDI=m
> > +CONFIG_CPU_IDLE=y
> >  CONFIG_CRYPTO_HMAC=y
> >  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
> >  CONFIG_DISPLAY_SUPPORT=m
> > diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
> > index ba002ce..262a404 100644
> > --- a/debian.master/config/armel/config.common.armel
> > +++ b/debian.master/config/armel/config.common.armel
> > @@ -8,6 +8,7 @@ CONFIG_ASYNC_TX_DMA=y
> >  CONFIG_ATM_BR2684_IPFILTER=y
> >  CONFIG_ATM_DUMMY=m
> >  # CONFIG_COMEDI is not set
> > +# CONFIG_CPU_IDLE is not set
> >  CONFIG_DEFAULT_CFQ=y
> >  # CONFIG_DEFAULT_DEADLINE is not set
> >  CONFIG_DEFAULT_IOSCHED="cfq"
> > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> > index 902ea7d..231120b 100644
> > --- a/debian.master/config/config.common.ubuntu
> > +++ b/debian.master/config/config.common.ubuntu
> > @@ -787,7 +787,6 @@ CONFIG_CPU_FREQ_TABLE=y
> >  CONFIG_CPU_HAS_ASID=y
> >  CONFIG_CPU_HAS_PMU=y
> >  # CONFIG_CPU_ICACHE_DISABLE is not set
> > -CONFIG_CPU_IDLE=y
> >  CONFIG_CPU_IDLE_GOV_LADDER=y
> >  CONFIG_CPU_IDLE_GOV_MENU=y
> >  CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
> > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> > index d883dd0..92110fd 100644
> > --- a/debian.master/config/i386/config.common.i386
> > +++ b/debian.master/config/i386/config.common.i386
> > @@ -24,6 +24,7 @@ CONFIG_CDROM_PKTCDVD=y
> >  CONFIG_CEPH_FS=m
> >  CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
> >  CONFIG_COMEDI=m
> > +CONFIG_CPU_IDLE=y
> >  CONFIG_CRYPTO_HMAC=y
> >  CONFIG_DEFAULT_CFQ=y
> >  # CONFIG_DEFAULT_DEADLINE is not set
>
Tim Gardner - June 22, 2010, 2:43 p.m.
On 06/22/2010 03:58 AM, Andy Whitcroft wrote:
> On Mon, Jun 21, 2010 at 05:30:41PM -0600, Mathieu Poirier wrote:
>> > From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
>> From: Mathieu J. Poirier<mathieu.poirier@canonical.com>
>> Date: Mon, 21 Jun 2010 17:19:46 -0600
>> Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap
>>
>> This is a temperary fix that allow the system to be usable.  The real fix,
>> the one that really correct what seems to be an issue with retreiving
>> the value of the PM_WKST_WKUP register should follow shortly.
>
> You really should include which releases patches are destined for.  Here
> I assume this is destined for maverick so you should include that in the
> subject.  Something like this.
>
>    Subject: [PATCH] [Maverick] UBUNTU: ARM: ....
>

Eh? It looks like he's specified [Maverick] in the email subject line 
that I received. Are you expecting that the subject also contains omap3 
so as to distinguish it from ti-omap4 ?

> Also is this critical for Alpha-2?  If so you need to make sure Leann is
> aware, contact her direct to ensure its not missed.
>
> -apw
>

rtg
Leann Ogasawara - June 22, 2010, 3:20 p.m.
On Tue, 2010-06-22 at 10:58 +0100, Andy Whitcroft wrote:
> On Mon, Jun 21, 2010 at 05:30:41PM -0600, Mathieu Poirier wrote:
> > >From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
> > From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
> > Date: Mon, 21 Jun 2010 17:19:46 -0600
> > Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap
> > 
> > This is a temperary fix that allow the system to be usable.  The real fix,
> > the one that really correct what seems to be an issue with retreiving
> > the value of the PM_WKST_WKUP register should follow shortly.
> 
> You really should include which releases patches are destined for.  Here
> I assume this is destined for maverick so you should include that in the
> subject.  Something like this.
> 
>   Subject: [PATCH] [Maverick] UBUNTU: ARM: ....
> 
> Also is this critical for Alpha-2?  If so you need to make sure Leann is
> aware, contact her direct to ensure its not missed.

I'd be willing to carry this temporarily if this is critical for
Maverick's Alpha2 release, let me know.  Ideally we would want to get
the "real fix" you mention.  Is this fix already in the form of a patch
somewhere where we can track it, ie on it's way upstream?  I'd like to
make a direct reference to it in the commit message for tracking
purposes.

> -apw
>
Mathieu Poirier - June 22, 2010, 3:42 p.m.
On Tue, 2010-06-22 at 08:20 -0700, Leann Ogasawara wrote:
> On Tue, 2010-06-22 at 10:58 +0100, Andy Whitcroft wrote:
> > On Mon, Jun 21, 2010 at 05:30:41PM -0600, Mathieu Poirier wrote:
> > > >From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
> > > From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
> > > Date: Mon, 21 Jun 2010 17:19:46 -0600
> > > Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap
> > > 
> > > This is a temperary fix that allow the system to be usable.  The real fix,
> > > the one that really correct what seems to be an issue with retreiving
> > > the value of the PM_WKST_WKUP register should follow shortly.
> > 
> > You really should include which releases patches are destined for.  Here
> > I assume this is destined for maverick so you should include that in the
> > subject.  Something like this.
> > 
> >   Subject: [PATCH] [Maverick] UBUNTU: ARM: ....
> > 
> > Also is this critical for Alpha-2?  If so you need to make sure Leann is
> > aware, contact her direct to ensure its not missed.
> 
> I'd be willing to carry this temporarily if this is critical for
> Maverick's Alpha2 release, let me know.  Ideally we would want to get
> the "real fix" you mention.  Is this fix already in the form of a patch
> somewhere where we can track it, ie on it's way upstream?  I'd like to
> make a direct reference to it in the commit message for tracking
> purposes.
> 
> > -apw
> > 
> 
> 
Yes, this is critical for Alpha2.  Without it, the beagleboard is
unusable - please carry forward.

I haven't found the real solution nor do I know where it is...  But I
know disabling CONFIG_CPU_IDLE will just hide the problem.  

Fair enough, upstream has the flag disabled.  Since we share the same
codebase one would logically assume that turning the flag on would also
render upstream inoperable, but it doesn't. 

When CONFIG_CPU_IDLE is set in both upstream and maverick, the path
through the code is the same.  The problem occurs when reading a HW
registers in the ARM core - on maverick the "__raw_readl" fails whereas
in upstream, it works properly.  

If (in maverick) I introduce a small delay, the read operation goes
through properly and the problem is fixed.  Randomly delaying kernel
processes are not the solution - I need to introduce a memory barrier of
some kind that will guarantee a proper read.  Cking set me on the right
track this morning.  Amit also pointed out an upstream power management
branch that has fixes in that area.
Leann Ogasawara - June 22, 2010, 6:52 p.m.
Applied to Maverick linux master.

Thanks,
Leann

On Mon, 2010-06-21 at 17:30 -0600, Mathieu Poirier wrote:
> >From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
> From: Mathieu J. Poirier <mathieu.poirier@canonical.com>
> Date: Mon, 21 Jun 2010 17:19:46 -0600
> Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap
> 
> This is a temperary fix that allow the system to be usable.  The real fix,
> the one that really correct what seems to be an issue with retreiving
> the value of the PM_WKST_WKUP register should follow shortly.
> 
> BugLink: https://bugs/launchpad.net/bugs/594382
> 
> Signed-off-by: Mathieu Poirier <mathieu.poirier@canonical.com>
> ---
>  debian.master/config/amd64/config.common.amd64 |    1 +
>  debian.master/config/armel/config.common.armel |    1 +
>  debian.master/config/config.common.ubuntu      |    1 -
>  debian.master/config/i386/config.common.i386   |    1 +
>  4 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index fd43848..783b7ac 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -26,6 +26,7 @@ CONFIG_CDROM_PKTCDVD=y
>  CONFIG_CEPH_FS=m
>  CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
>  CONFIG_COMEDI=m
> +CONFIG_CPU_IDLE=y
>  CONFIG_CRYPTO_HMAC=y
>  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  CONFIG_DISPLAY_SUPPORT=m
> diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
> index ba002ce..262a404 100644
> --- a/debian.master/config/armel/config.common.armel
> +++ b/debian.master/config/armel/config.common.armel
> @@ -8,6 +8,7 @@ CONFIG_ASYNC_TX_DMA=y
>  CONFIG_ATM_BR2684_IPFILTER=y
>  CONFIG_ATM_DUMMY=m
>  # CONFIG_COMEDI is not set
> +# CONFIG_CPU_IDLE is not set
>  CONFIG_DEFAULT_CFQ=y
>  # CONFIG_DEFAULT_DEADLINE is not set
>  CONFIG_DEFAULT_IOSCHED="cfq"
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 902ea7d..231120b 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -787,7 +787,6 @@ CONFIG_CPU_FREQ_TABLE=y
>  CONFIG_CPU_HAS_ASID=y
>  CONFIG_CPU_HAS_PMU=y
>  # CONFIG_CPU_ICACHE_DISABLE is not set
> -CONFIG_CPU_IDLE=y
>  CONFIG_CPU_IDLE_GOV_LADDER=y
>  CONFIG_CPU_IDLE_GOV_MENU=y
>  CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index d883dd0..92110fd 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -24,6 +24,7 @@ CONFIG_CDROM_PKTCDVD=y
>  CONFIG_CEPH_FS=m
>  CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
>  CONFIG_COMEDI=m
> +CONFIG_CPU_IDLE=y
>  CONFIG_CRYPTO_HMAC=y
>  CONFIG_DEFAULT_CFQ=y
>  # CONFIG_DEFAULT_DEADLINE is not set
> -- 
> 1.7.0.4
> 
> 
> 
>
Tim Gardner - June 22, 2010, 7:19 p.m.
On 06/22/2010 12:52 PM, Leann Ogasawara wrote:
> Applied to Maverick linux master.
>
> Thanks,
> Leann
>
> On Mon, 2010-06-21 at 17:30 -0600, Mathieu Poirier wrote:
>> > From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
>> From: Mathieu J. Poirier<mathieu.poirier@canonical.com>
>> Date: Mon, 21 Jun 2010 17:19:46 -0600
>> Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap
>>
>> This is a temperary fix that allow the system to be usable.  The real fix,
>> the one that really correct what seems to be an issue with retreiving
>> the value of the PM_WKST_WKUP register should follow shortly.
>>
>> BugLink: https://bugs/launchpad.net/bugs/594382

Leann,

Can you amend the buglink?

rtg
Leann Ogasawara - June 22, 2010, 7:27 p.m.
On Tue, 2010-06-22 at 13:19 -0600, Tim Gardner wrote:
> On 06/22/2010 12:52 PM, Leann Ogasawara wrote:
> > Applied to Maverick linux master.
> >
> > Thanks,
> > Leann
> >
> > On Mon, 2010-06-21 at 17:30 -0600, Mathieu Poirier wrote:
> >> > From 7cb2de99fb596c2e9d9abe6fd6273344e397f7d2 Mon Sep 17 00:00:00 2001
> >> From: Mathieu J. Poirier<mathieu.poirier@canonical.com>
> >> Date: Mon, 21 Jun 2010 17:19:46 -0600
> >> Subject: [PATCH] UBUNTU: ARM: Turning off CONFIG_CPU_IDLE on omap
> >>
> >> This is a temperary fix that allow the system to be usable.  The real fix,
> >> the one that really correct what seems to be an issue with retreiving
> >> the value of the PM_WKST_WKUP register should follow shortly.
> >>
> >> BugLink: https://bugs/launchpad.net/bugs/594382
> 
> Leann,
> 
> Can you amend the buglink?

Argh, fixed and pushed.

Thanks,
Leann

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index fd43848..783b7ac 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -26,6 +26,7 @@  CONFIG_CDROM_PKTCDVD=y
 CONFIG_CEPH_FS=m
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_COMEDI=m
+CONFIG_CPU_IDLE=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DISPLAY_SUPPORT=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index ba002ce..262a404 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -8,6 +8,7 @@  CONFIG_ASYNC_TX_DMA=y
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_ATM_DUMMY=m
 # CONFIG_COMEDI is not set
+# CONFIG_CPU_IDLE is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 902ea7d..231120b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -787,7 +787,6 @@  CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_HAS_PMU=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d883dd0..92110fd 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -24,6 +24,7 @@  CONFIG_CDROM_PKTCDVD=y
 CONFIG_CEPH_FS=m
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_COMEDI=m
+CONFIG_CPU_IDLE=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set