From patchwork Tue Jun 28 13:55:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 71086 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1599173qgy; Tue, 28 Jun 2016 06:57:10 -0700 (PDT) X-Received: by 10.157.47.189 with SMTP id r58mr1893679otb.163.1467122225557; Tue, 28 Jun 2016 06:57:05 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j132si16012182oib.211.2016.06.28.06.57.05; Tue, 28 Jun 2016 06:57:05 -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 S1752613AbcF1N4Y (ORCPT + 5 others); Tue, 28 Jun 2016 09:56:24 -0400 Received: from foss.arm.com ([217.140.101.70]:47621 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752465AbcF1N4W (ORCPT ); Tue, 28 Jun 2016 09:56:22 -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 22BD4474; Tue, 28 Jun 2016 06:57:04 -0700 (PDT) Received: from e107155-lin.cambridge.arm.com (unknown [10.1.207.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E377E3F445; Tue, 28 Jun 2016 06:56:09 -0700 (PDT) From: Sudeep Holla To: linux-acpi@vger.kernel.org, "Rafael J . Wysocki" Cc: Sudeep Holla , Vikas Sajjan , Sunil , Lorenzo Pieralisi , PrashanthPrakash , Al Stone , Ashwin Chaugule , Daniel Lezcano , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Rutland Subject: [PATCH v7 5/6] arm64: add support for ACPI Low Power Idle(LPI) Date: Tue, 28 Jun 2016 14:55:51 +0100 Message-Id: <1467122152-5604-6-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467122152-5604-1-git-send-email-sudeep.holla@arm.com> References: <1467122152-5604-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: Daniel Lezcano Cc: "Rafael J. Wysocki" Signed-off-by: Sudeep Holla --- arch/arm64/kernel/cpuidle.c | 16 ++++++ drivers/firmware/psci.c | 122 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 116 insertions(+), 22 deletions(-) -- 2.7.4 -- 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/cpuidle.c b/arch/arm64/kernel/cpuidle.c index bade1b04ff12..dc241e8de75c 100644 --- a/arch/arm64/kernel/cpuidle.c +++ b/arch/arm64/kernel/cpuidle.c @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ +#include #include #include #include @@ -39,3 +40,18 @@ int cpuidle_generic_enter(int index) return cpu_ops[cpu]->cpu_suspend(index); } + +#ifdef CONFIG_ACPI + +#include + +int acpi_processor_ffh_lpi_probe(unsigned int cpu) +{ + return arm_cpuidle_init(cpu); +} + +int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi) +{ + return cpuidle_generic_enter_state(lpi->index); +} +#endif diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 03e04582791c..edd83c884a1d 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 @@ -250,12 +251,84 @@ static int __init psci_features(u32 psci_func_id) #ifdef CONFIG_CPU_IDLE static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state); -static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) +static int psci_dt_get_state_count(struct device_node *cpu_dn) { - int i, ret, count = 0; - u32 *psci_states; + int count = 0; struct device_node *state_node; + /* Count idle states */ + while ((state_node = of_parse_phandle(cpu_dn, "cpu-idle-states", + count))) { + count++; + of_node_put(state_node); + } + + return count; +} + +static int psci_dt_get_idle_state(struct device_node *node, int idx, u32 *state) +{ + int ret; + struct device_node *state_node; + + state_node = of_parse_phandle(node, "cpu-idle-states", idx); + + ret = of_property_read_u32(state_node, "arm,psci-suspend-param", + state); + if (ret) + pr_warn(" * %s missing arm,psci-suspend-param property\n", + state_node->full_name); + + of_node_put(state_node); + + return ret; +} + +#ifdef CONFIG_ACPI +#include + +static int psci_acpi_get_state_count(unsigned int cpu) +{ + struct acpi_processor *pr = per_cpu(processors, cpu); + + if (unlikely(!pr || !pr->flags.has_lpi)) + return -EINVAL; + + return pr->power.count - 1; +} + +static int psci_acpi_get_idle_state(unsigned int cpu, int idx, u32 *state) +{ + struct acpi_processor *pr = per_cpu(processors, cpu); + struct acpi_lpi_state *lpi = &pr->power.lpi_states[idx + 1]; + + if (!lpi) + return -EINVAL; + + /* + * Only bits[31:0] represent a PSCI power_state while + * bits[63:32] must be 0x0 as per ARM ACPI FFH Specification + */ + *state = lpi->address; + return 0; +} +#else +static int psci_acpi_get_state_count(unsigned int cpu) +{ + return -EINVAL; +} + +static int psci_acpi_get_idle_state(unsigned int cpu, int idx, u32 *state) +{ + return -EINVAL; +} +#endif + +static int __psci_cpu_init_idle(struct device_node *cpu_dn, int cpu, bool acpi) +{ + int i, count, ret; + u32 *psci_states; + /* * If the PSCI cpu_suspend function hook has not been initialized * idle states must not be enabled, so bail out @@ -263,14 +336,12 @@ static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) if (!psci_ops.cpu_suspend) return -EOPNOTSUPP; - /* Count idle states */ - while ((state_node = of_parse_phandle(cpu_node, "cpu-idle-states", - count))) { - count++; - of_node_put(state_node); - } + if (acpi) + count = psci_acpi_get_state_count(cpu); + else + count = psci_dt_get_state_count(cpu_dn); - if (!count) + if (count <= 0) return -ENODEV; psci_states = kcalloc(count, sizeof(*psci_states), GFP_KERNEL); @@ -278,21 +349,15 @@ static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) return -ENOMEM; for (i = 0; i < count; i++) { - u32 state; - - state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i); + u32 state = 0; - ret = of_property_read_u32(state_node, - "arm,psci-suspend-param", - &state); - if (ret) { - pr_warn(" * %s missing arm,psci-suspend-param property\n", - state_node->full_name); - of_node_put(state_node); + if (acpi) + ret = psci_acpi_get_idle_state(cpu, i, &state); + else + ret = psci_dt_get_idle_state(cpu_dn, i, &state); + if (ret) goto free_mem; - } - of_node_put(state_node); pr_debug("psci-power-state %#x index %d\n", state, i); if (!psci_power_state_is_valid(state)) { pr_warn("Invalid PSCI power state %#x\n", state); @@ -310,11 +375,24 @@ static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) return ret; } +static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) +{ + return __psci_cpu_init_idle(cpu_node, cpu, false); +} + +static int psci_acpi_cpu_init_idle(unsigned int cpu) +{ + return __psci_cpu_init_idle(NULL, cpu, true); +} + 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;