From patchwork Mon May 24 05:42:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 53376 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 78E3FB7D52 for ; Mon, 24 May 2010 15:42:43 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OGQQw-00068s-RL; Mon, 24 May 2010 06:42:38 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OGQQu-00067t-SK for kernel-team@lists.ubuntu.com; Mon, 24 May 2010 06:42:36 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OGQQu-00064o-PV for ; Mon, 24 May 2010 06:42:36 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OGQQu-0006HP-CB for kernel-team@lists.ubuntu.com; Mon, 24 May 2010 06:42:36 +0100 Subject: [PATCH 1/1] [Maverick] Enable CONFIG_PCIEASPM=y From: Leann Ogasawara To: kernel-team Date: Sun, 23 May 2010 22:42:27 -0700 Message-ID: <1274679747.24569.3446.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From 5b00f35635007a49bff3ff0f9ae1cb6b752f1a86 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara 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 Acked-by: Andy Whitcroft --- 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