From patchwork Mon Jul 21 16:06:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 33995 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6B18A20492 for ; Mon, 21 Jul 2014 16:06:59 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id ft15sf51778713pdb.6 for ; Mon, 21 Jul 2014 09:06:58 -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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=QLZPaaLGs0plJjSGCYUwRnYKX4jjiyj/wgas5Dg5FvE=; b=FNpAt2SDJwQyFF+m09c44KULnzSjEe7PS+KkuGkAkz7oiftiMGsftmKBCL7pU/A21E 8yVkg0OmIQyliGrmo1goJYFaiC4Njn9g0wQArA4veAfQppRiCZWDb2JntUndS3CnVnUV YTTE2H/dnLEIWEXfwQqCz/bRDGKBAPLpG87IO8ppaLJV3Tu4t7wFOI9qQn02XsPyBV2G DgqSejh2S+olrH/7l4uJcnfFIBJ5KxVaRJ3XwvLgL+ff9B4Xpzzi4KfmDND3cARkejlk MUwTBTwzGJJQ9MWuLou81skZjj+iTYQixgL6Bf4NGjoD4HLCbdLYM5jp5hp6THs7IN4c XRNg== X-Gm-Message-State: ALoCoQnF0szmL6kva+cnVilbwGcRask5zQjc5+G6PfnxlLKbON+2n/ecTloEBT5QH+j+nN+O+maL X-Received: by 10.66.157.67 with SMTP id wk3mr12922477pab.24.1405958818700; Mon, 21 Jul 2014 09:06:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.193 with SMTP id i59ls1961180qge.20.gmail; Mon, 21 Jul 2014 09:06:58 -0700 (PDT) X-Received: by 10.220.1.70 with SMTP id 6mr5409995vce.62.1405958818495; Mon, 21 Jul 2014 09:06:58 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id su5si11718942vec.27.2014.07.21.09.06.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jul 2014 09:06:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id hy4so12728260vcb.13 for ; Mon, 21 Jul 2014 09:06:54 -0700 (PDT) X-Received: by 10.221.34.13 with SMTP id sq13mr30966008vcb.16.1405958813836; Mon, 21 Jul 2014 09:06:53 -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.221.37.5 with SMTP id tc5csp124821vcb; Mon, 21 Jul 2014 09:06:53 -0700 (PDT) X-Received: by 10.68.134.198 with SMTP id pm6mr26479613pbb.9.1405958812486; Mon, 21 Jul 2014 09:06:52 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qe5si14693995pac.103.2014.07.21.09.06.51; Mon, 21 Jul 2014 09:06:51 -0700 (PDT) Received-SPF: none (google.com: devicetree-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 S932699AbaGUQGo (ORCPT + 8 others); Mon, 21 Jul 2014 12:06:44 -0400 Received: from service87.mimecast.com ([91.220.42.44]:41699 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932838AbaGUQGn (ORCPT ); Mon, 21 Jul 2014 12:06:43 -0400 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Mon, 21 Jul 2014 17:06:41 +0100 Received: from red-moon.cambridge.arm.com ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 21 Jul 2014 17:06:38 +0100 From: Lorenzo Pieralisi To: linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Cc: devicetree@vger.kernel.org, Lorenzo Pieralisi , Mark Rutland , Sudeep Holla , Catalin Marinas , Charles Garcia Tobin , Nicolas Pitre , Rob Herring , Grant Likely , Peter De Schrijver , Santosh Shilimkar , Daniel Lezcano , Amit Kucheria , Vincent Guittot , Antti Miettinen , Stephen Boyd , Kevin Hilman , Sebastian Capella , Tomasz Figa , Mark Brown , Paul Walmsley , Chander Kashyap , Geoff Levand , Bartlomiej Zolnierkiewicz Subject: [PATCH v6 4/7] arm64: add PSCI CPU_SUSPEND based cpu_suspend support Date: Mon, 21 Jul 2014 17:06:23 +0100 Message-Id: <1405958786-17243-5-git-send-email-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1405958786-17243-1-git-send-email-lorenzo.pieralisi@arm.com> References: <1405958786-17243-1-git-send-email-lorenzo.pieralisi@arm.com> X-OriginalArrivalTime: 21 Jul 2014 16:06:38.0852 (UTC) FILETIME=[C0FCFC40:01CFA4FD] X-MC-Unique: 114072117064100701 Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lorenzo.pieralisi@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 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: , This patch implements the cpu_suspend cpu operations method through the PSCI CPU SUSPEND API. The PSCI implementation translates the idle state index passed by the cpu_suspend core call into a valid PSCI state according to the PSCI states initialized at boot through the cpu_init_idle() CPU operations hook. Entry point is set to cpu_resume physical address, that represents the default kernel execution address following a CPU reset; for standby states the entry point address is useless and will therefore be ignored by the PSCI implementation. Signed-off-by: Lorenzo Pieralisi Reviewed-by: Ashwin Chaugule --- arch/arm64/kernel/psci.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index a623c44..bbdf41d 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -28,6 +29,7 @@ #include #include #include +#include #include #define PSCI_POWER_STATE_TYPE_STANDBY 0 @@ -65,6 +67,8 @@ enum psci_function { PSCI_FN_MAX, }; +static DEFINE_PER_CPU_READ_MOSTLY(struct psci_power_state *, psci_power_state); + static u32 psci_function_id[PSCI_FN_MAX]; static int psci_to_linux_errno(int errno) @@ -93,6 +97,18 @@ static u32 psci_power_state_pack(struct psci_power_state state) & PSCI_0_2_POWER_STATE_AFFL_MASK); } +static void psci_power_state_unpack(u32 power_state, + struct psci_power_state *state) +{ + state->id = (power_state & PSCI_0_2_POWER_STATE_ID_MASK) >> + PSCI_0_2_POWER_STATE_ID_SHIFT; + state->type = (power_state & PSCI_0_2_POWER_STATE_TYPE_MASK) >> + PSCI_0_2_POWER_STATE_TYPE_SHIFT; + state->affinity_level = + (power_state & PSCI_0_2_POWER_STATE_AFFL_MASK) >> + PSCI_0_2_POWER_STATE_AFFL_SHIFT; +} + /* * The following two functions are invoked via the invoke_psci_fn pointer * and will not be inlined, allowing us to piggyback on the AAPCS. @@ -199,6 +215,61 @@ static int psci_migrate_info_type(void) return err; } +static int cpu_psci_cpu_init_idle(struct device_node *cpu_node, + unsigned int cpu) +{ + int i, ret, count = 0; + struct psci_power_state *psci_states; + struct device_node *state_node; + + /* + * 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 idle states */ + while ((state_node = of_parse_phandle(cpu_node, "cpu-idle-states", + count))) + count++; + + if (!count) + return -ENODEV; + + psci_states = kcalloc(count, sizeof(*psci_states), GFP_KERNEL); + if (!psci_states) { + pr_warn("idle state psci_state allocation failed\n"); + return -ENOMEM; + } + + for (i = 0; i < count; i++) { + u32 psci_power_state; + + state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i); + + ret = of_property_read_u32(state_node, + "arm,psci-suspend-param", + &psci_power_state); + if (ret) { + pr_warn(" * %s missing arm,psci-suspend-param property\n", + state_node->full_name); + goto free_mem; + } + + pr_debug("psci-power-state %#x index %d\n", psci_power_state, + i); + psci_power_state_unpack(psci_power_state, &psci_states[i]); + } + /* Idle states parsed correctly, initialize per-cpu pointer */ + per_cpu(psci_power_state, cpu) = psci_states; + return 0; + +free_mem: + kfree(psci_states); + return ret; +} + static int get_set_conduit_method(struct device_node *np) { const char *method; @@ -436,8 +507,23 @@ static int cpu_psci_cpu_kill(unsigned int cpu) #endif #endif +static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index) +{ + struct psci_power_state *state = __get_cpu_var(psci_power_state); + /* + * idle state index 0 corresponds to wfi, should never be called + * from the cpu_suspend operations + */ + if (WARN_ON_ONCE(!index)) + return -EINVAL; + + return psci_ops.cpu_suspend(state[index - 1], + virt_to_phys(cpu_resume)); +} + const struct cpu_operations cpu_psci_ops = { .name = "psci", + .cpu_init_idle = cpu_psci_cpu_init_idle, #ifdef CONFIG_SMP .cpu_init = cpu_psci_cpu_init, .cpu_prepare = cpu_psci_cpu_prepare, @@ -448,5 +534,8 @@ const struct cpu_operations cpu_psci_ops = { .cpu_kill = cpu_psci_cpu_kill, #endif #endif +#ifdef CONFIG_ARM64_CPU_SUSPEND + .cpu_suspend = cpu_psci_cpu_suspend, +#endif };