From patchwork Wed May 11 15:37:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 67553 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp290304qge; Wed, 11 May 2016 08:38:21 -0700 (PDT) X-Received: by 10.98.44.149 with SMTP id s143mr5948174pfs.31.1462981088166; Wed, 11 May 2016 08:38:08 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vy4si10495356pab.231.2016.05.11.08.38.08; Wed, 11 May 2016 08:38:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932631AbcEKPiC (ORCPT + 5 others); Wed, 11 May 2016 11:38:02 -0400 Received: from foss.arm.com ([217.140.101.70]:53529 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932517AbcEKPiA (ORCPT ); Wed, 11 May 2016 11:38:00 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9B39F49; Wed, 11 May 2016 08:38:12 -0700 (PDT) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.207.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5FA143F487; Wed, 11 May 2016 08:37:58 -0700 (PDT) From: Sudeep Holla To: linux-acpi@vger.kernel.org, "Rafael J. Wysocki" Cc: Sudeep Holla , linux-kernel@vger.kernel.org, Vikas Sajjan , Sunil , Prashanth Prakash , Ashwin Chaugule , Al Stone , Lorenzo Pieralisi , Mark Rutland , linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 4/5] arm64: add support for ACPI Low Power Idle(LPI) Date: Wed, 11 May 2016 16:37:41 +0100 Message-Id: <1462981062-24909-5-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462981062-24909-1-git-send-email-sudeep.holla@arm.com> References: <1462981062-24909-1-git-send-email-sudeep.holla@arm.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org This patch adds appropriate callbacks to support ACPI Low Power Idle (LPI) on ARM64. Cc: Lorenzo Pieralisi Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Sudeep Holla --- arch/arm64/kernel/acpi.c | 48 +++++++++++++++++++++++++++++++++++++++++ drivers/firmware/psci.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index d1ce8e2f98b9..bf82ce5c8fce 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -25,6 +26,9 @@ #include #include +#include + +#include #include #include #include @@ -211,6 +215,50 @@ void __init acpi_boot_table_init(void) } } +int acpi_processor_ffh_lpi_probe(unsigned int cpu) +{ + return arm_cpuidle_init(cpu); +} + +#define ACPI_FFH_LPI_ARM_FLAGS_CORE_CONTEXT BIT(0) +#define ACPI_FFH_LPI_ARM_FLAGS_TRACE_CONTEXT BIT(1) +#define ACPI_FFH_LPI_ARM_FLAGS_GICR_CONTEXT BIT(2) +#define ACPI_FFH_LPI_ARM_FLAGS_GICD_CONTEXT BIT(3) +#define ACPI_FFH_LPI_ARM_FLAGS_ALL_CONTEXT \ + (ACPI_FFH_LPI_ARM_FLAGS_CORE_CONTEXT | \ + ACPI_FFH_LPI_ARM_FLAGS_TRACE_CONTEXT | \ + ACPI_FFH_LPI_ARM_FLAGS_GICR_CONTEXT | \ + ACPI_FFH_LPI_ARM_FLAGS_GICD_CONTEXT) + +struct acpi_lpi_state *lpi; +int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi, int idx) +{ + int ret = 0; + bool save_ctx = lpi->arch_flags & ACPI_FFH_LPI_ARM_FLAGS_ALL_CONTEXT; + + if (!idx) { + cpu_do_idle(); + return idx; + } + + /* TODO cpu_pm_{enter,exit} can be done in generic code ? */ + if (save_ctx) + ret = cpu_pm_enter(); + if (!ret) { + /* + * Pass idle state index to cpu_suspend which in turn will + * call the CPU ops suspend protocol with idle index as a + * parameter. + */ + ret = arm_cpuidle_suspend(idx); + + if (save_ctx) + cpu_pm_exit(); + } + + return ret ? -1 : idx; +} + #ifdef CONFIG_ACPI_APEI pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) { diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index fa4ea22ca12e..e06bfee68e1d 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -13,6 +13,7 @@ #define pr_fmt(fmt) "psci: " fmt +#include #include #include #include @@ -310,11 +311,66 @@ static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) return ret; } +#ifdef CONFIG_ACPI +#include + +static int __maybe_unused psci_acpi_cpu_init_idle(unsigned int cpu) +{ + int i, count; + u32 *psci_states; + struct acpi_processor *pr; + struct acpi_lpi_state *lpi; + + pr = per_cpu(processors, cpu); + if (unlikely(!pr || !pr->flags.has_lpi)) + return -EINVAL; + + /* + * If the PSCI cpu_suspend function hook has not been initialized + * idle states must not be enabled, so bail out + */ + if (!psci_ops.cpu_suspend) + return -EOPNOTSUPP; + + count = pr->power.count - 1; + if (!count) + return -ENODEV; + + psci_states = kcalloc(count, sizeof(*psci_states), GFP_KERNEL); + if (!psci_states) + return -ENOMEM; + + for (i = 0; i < count; i++) { + u32 state; + + lpi = &pr->power.lpi_states[i + 1]; + state = lpi->address & 0xFFFFFFFF; + if (!psci_power_state_is_valid(state)) { + pr_warn("Invalid PSCI power state %#x\n", state); + kfree(psci_states); + return -EINVAL; + } + psci_states[i] = state; + } + /* Idle states parsed correctly, initialize per-cpu pointer */ + per_cpu(psci_power_state, cpu) = psci_states; + return 0; +} +#else +static int __maybe_unused psci_acpi_cpu_init_idle(unsigned int cpu) +{ + return -EINVAL; +} +#endif + int psci_cpu_init_idle(unsigned int cpu) { struct device_node *cpu_node; int ret; + if (!acpi_disabled) + return psci_acpi_cpu_init_idle(cpu); + cpu_node = of_get_cpu_node(cpu, NULL); if (!cpu_node) return -ENODEV;