[PATCH 1/1] [Maverick] Enable CONFIG_PCIEASPM=y

[Andy Whitcroft]

On Sun, May 23, 2010 at 10:42:27PM -0700, Leann Ogasawara wrote:
> >From 5b00f35635007a49bff3ff0f9ae1cb6b752f1a86 Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara at canonical.com>
> Date: Sun, 23 May 2010 13:44:37 -0700
> Subject: [PATCH] UBUNTU: [Config] Enable CONFIG_PCIEASPM=y
> 
> BugLink: http://bugs.launchpad.net/bugs/333990
> 
> Enable CONFIG_PCIEASPM=y for ports and ubuntu.  This option enables PCI
> Express ASPM (Active State Power Management) and Clock Power Management.
> Users have confirmed powersaving after having enabled this option.
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
> ---
>  debian.master/config/config.common.ports           |    1 +
>  debian.master/config/config.common.ubuntu          |    3 ++-
>  debian.master/config/ia64/config.common.ia64       |    1 -
>  .../config/powerpc/config.flavour.powerpc          |    1 -
>  .../config/powerpc/config.flavour.powerpc-smp      |    1 -
>  .../config/powerpc/config.flavour.powerpc64-smp    |    1 -
>  6 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
> index bd3e95d..97b350b 100644
> --- a/debian.master/config/config.common.ports
> +++ b/debian.master/config/config.common.ports
> @@ -2464,6 +2464,7 @@ CONFIG_PCI=y
>  CONFIG_PCI200SYN=m
>  CONFIG_PCIEAER=y
>  # CONFIG_PCIEAER_INJECT is not set
> +CONFIG_PCIEASPM=y
>  # CONFIG_PCIEASPM_DEBUG is not set
>  CONFIG_PCIEPORTBUS=y
>  # CONFIG_PCIE_ECRC is not set
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index bc34653..1ed3937 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -2933,7 +2933,8 @@ CONFIG_PCI=y
>  CONFIG_PCI200SYN=m
>  CONFIG_PCIEAER=y
>  # CONFIG_PCIEAER_INJECT is not set
> -# CONFIG_PCIEASPM is not set
> +CONFIG_PCIEASPM=y
> +# CONFIG_PCIEASPM_DEBUG is not set
>  CONFIG_PCIEPORTBUS=y
>  # CONFIG_PCIE_ECRC is not set
>  CONFIG_PCIE_PME=y
> diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
> index 0d4b5b7..f4b89f5 100644
> --- a/debian.master/config/ia64/config.common.ia64
> +++ b/debian.master/config/ia64/config.common.ia64
> @@ -159,7 +159,6 @@ CONFIG_NODES_SHIFT=4
>  CONFIG_NR_CPUS=4096
>  CONFIG_OSF_PARTITION=y
>  CONFIG_PAGE_OFFSET=0xc0000000
> -# CONFIG_PCIEASPM is not set
>  CONFIG_PCI_MSI=y
>  CONFIG_PHYS_ADDR_T_64BIT=y
>  # CONFIG_PPC64 is not set
> diff --git a/debian.master/config/powerpc/config.flavour.powerpc b/debian.master/config/powerpc/config.flavour.powerpc
> index e1aa824..b6a9233 100644
> --- a/debian.master/config/powerpc/config.flavour.powerpc
> +++ b/debian.master/config/powerpc/config.flavour.powerpc
> @@ -28,7 +28,6 @@ CONFIG_MAX_ACTIVE_REGIONS=32
>  # CONFIG_NEED_DMA_MAP_STATE is not set
>  # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
>  CONFIG_PAGE_OFFSET=0xc0000000
> -# CONFIG_PCIEASPM is not set
>  # CONFIG_PHYS_ADDR_T_64BIT is not set
>  # CONFIG_PPC64 is not set
>  # CONFIG_PPC_970_NAP is not set
> diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
> index 029b1ff..60a29f6 100644
> --- a/debian.master/config/powerpc/config.flavour.powerpc-smp
> +++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
> @@ -29,7 +29,6 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
>  # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
>  CONFIG_NR_CPUS=4
>  CONFIG_PAGE_OFFSET=0xc0000000
> -CONFIG_PCIEASPM=y
>  # CONFIG_PHYS_ADDR_T_64BIT is not set
>  # CONFIG_PPC64 is not set
>  # CONFIG_PPC_970_NAP is not set
> diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-smp b/debian.master/config/powerpc/config.flavour.powerpc64-smp
> index 35f67af..406f98f 100644
> --- a/debian.master/config/powerpc/config.flavour.powerpc64-smp
> +++ b/debian.master/config/powerpc/config.flavour.powerpc64-smp
> @@ -29,7 +29,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
>  CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
>  CONFIG_NR_CPUS=1024
>  CONFIG_PAGE_OFFSET=0xc000000000000000
> -# CONFIG_PCIEASPM is not set
>  CONFIG_PHYS_ADDR_T_64BIT=y
>  CONFIG_PPC64=y
>  CONFIG_PPC_970_NAP=y

Matches my memory of the session.  Slam it in.  

Acked-by: Andy Whitcroft <apw at canonical.com>

-apw