From patchwork Fri Mar 13 08:14:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 45754 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 90CB8214BF for ; Fri, 13 Mar 2015 08:15:05 +0000 (UTC) Received: by widex7 with SMTP id ex7sf2282277wid.2 for ; Fri, 13 Mar 2015 01:15:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=LvlE3f3rKyuxqQyD+gGxhRYAKgjTN3W+GP8DVhcvfrQ=; b=iq3VJU+4nLjysneMOhN0PrQUPC/cmPgk4wmj/vpKNtDddBEGGpzN4zUU5FGfLY/I3S +qqUBL0Q9jGZO5SMeFv3K1+qo2aRqlTvYtZeZsyHxqM21LXlm5WHzHlkd8rr+USH1mhR m8tt+tZf/oFUm6sZGQoLc8hLOjEFv/uzgebwMiRu1Tt9VxL4o+WVxiMPks99MKJfYPo2 Dk2CI+y1zLZ4iHvguL8CuJmCz38Ky+L2QPtdBYpsfnhsVXgq0WB6oi/gTQGlJeItwpCw F0s2GgpPjLOa7zuGENL++O3ULWtpc7cTToDnQ4OuPkOVnrVKLUefcI8BnuRXM1Oti0YM J9vw== X-Gm-Message-State: ALoCoQlGXqEHNjeU2GLOooCJUeMOtWhyynnA6U+uhMdlVikAE0HOss6imAsf8GYMgtjF//jfZwO5 X-Received: by 10.152.87.141 with SMTP id ay13mr2920132lab.3.1426234504801; Fri, 13 Mar 2015 01:15:04 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.225.132 with SMTP id rk4ls388613lac.50.gmail; Fri, 13 Mar 2015 01:15:04 -0700 (PDT) X-Received: by 10.152.2.130 with SMTP id 2mr33390947lau.120.1426234504398; Fri, 13 Mar 2015 01:15:04 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id eq5si853269lac.66.2015.03.13.01.15.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Mar 2015 01:15:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by labgd6 with SMTP id gd6so20923476lab.6 for ; Fri, 13 Mar 2015 01:15:04 -0700 (PDT) X-Received: by 10.112.201.231 with SMTP id kd7mr21739816lbc.35.1426234504169; Fri, 13 Mar 2015 01:15:04 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp743429lbj; Fri, 13 Mar 2015 01:15:03 -0700 (PDT) X-Received: by 10.70.48.5 with SMTP id h5mr61844931pdn.58.1426234502170; Fri, 13 Mar 2015 01:15:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w9si2544057pds.256.2015.03.13.01.15.00; Fri, 13 Mar 2015 01:15:02 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753689AbbCMIO4 (ORCPT + 28 others); Fri, 13 Mar 2015 04:14:56 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:37536 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752844AbbCMIOq (ORCPT ); Fri, 13 Mar 2015 04:14:46 -0400 Received: by paceu11 with SMTP id eu11so27656205pac.4 for ; Fri, 13 Mar 2015 01:14:46 -0700 (PDT) X-Received: by 10.66.66.75 with SMTP id d11mr99023766pat.132.1426234486278; Fri, 13 Mar 2015 01:14:46 -0700 (PDT) Received: from localhost ([180.150.153.56]) by mx.google.com with ESMTPSA id t13sm2122547pdl.20.2015.03.13.01.14.44 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 13 Mar 2015 01:14:45 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely Cc: Lorenzo Pieralisi , Arnd Bergmann , Mark Rutland , Graeme Gregory , Sudeep Holla , Jon Masters , Marc Zyngier , Mark Brown , Robert Richter , Timur Tabi , Ashwin Chaugule , suravee.suthikulpanit@amd.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Tomasz Nowicki , Hanjun Guo Subject: [update][PATCH v10 06/21] ACPI / sleep: Introduce CONFIG_ACPI_GENERIC_SLEEP Date: Fri, 13 Mar 2015 16:14:29 +0800 Message-Id: <1426234469-6434-1-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Graeme Gregory ACPI 5.1 does not currently support S states for ARM64 hardware but ACPI code will call acpi_target_system_state() and acpi_sleep_init() for device power management, so introduce CONFIG_ACPI_GENERIC_SLEEP and select it for x86 and ia64 only to make sleep functions available, and also introduce stub function to allow other drivers to function until S states are defined for ARM64. It will be no functional change for x86 and IA64. CC: Rafael J. Wysocki Suggested-by: Rafael J. Wysocki Acked-by: Robert Richter Acked-by: Lorenzo Pieralisi Signed-off-by: Graeme Gregory Signed-off-by: Tomasz Nowicki Signed-off-by: Hanjun Guo --- arch/ia64/Kconfig | 1 + arch/x86/Kconfig | 1 + drivers/acpi/Kconfig | 4 ++++ drivers/acpi/Makefile | 2 +- drivers/acpi/internal.h | 4 ++++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 074e52b..e8728d7 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -10,6 +10,7 @@ config IA64 select ARCH_MIGHT_HAVE_PC_SERIO select PCI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM) + select ACPI_GENERIC_SLEEP if ACPI select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_IDE diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b7d31ca..9804431 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -22,6 +22,7 @@ config X86_64 ### Arch settings config X86 def_bool y + select ACPI_GENERIC_SLEEP if ACPI select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS select ARCH_HAS_FAST_MULTIPLIER diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index e6c3ddd..a7b9120 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -48,9 +48,13 @@ config ACPI_LEGACY_TABLES_LOOKUP config ARCH_MIGHT_HAVE_ACPI_PDC bool +config ACPI_GENERIC_SLEEP + bool + config ACPI_SLEEP bool depends on SUSPEND || HIBERNATION + depends on ACPI_GENERIC_SLEEP default y config ACPI_PROCFS_POWER diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 623b117..2397822 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -23,7 +23,7 @@ acpi-y += nvs.o # Power management related files acpi-y += wakeup.o -acpi-y += sleep.o +acpi-$(CONFIG_ACPI_GENERIC_SLEEP) += sleep.o acpi-y += device_pm.o acpi-$(CONFIG_ACPI_SLEEP) += proc.o diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 56b321a..6f08c85 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -161,7 +161,11 @@ void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit); /*-------------------------------------------------------------------------- Suspend/Resume -------------------------------------------------------------------------- */ +#ifdef CONFIG_ACPI_GENERIC_SLEEP extern int acpi_sleep_init(void); +#else +static inline int acpi_sleep_init(void) { return -ENXIO; } +#endif #ifdef CONFIG_ACPI_SLEEP int acpi_sleep_proc_init(void);