From patchwork Wed Jun 25 14:10:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 32487 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5916C23B18 for ; Wed, 25 Jun 2014 14:10:48 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id bs8sf1739180wib.11 for ; Wed, 25 Jun 2014 07:10:44 -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=yyXb6rMu6nkH3jpgNF73geO5Ev9ILNqTAlAzXJ9qDwg=; b=HDjsVA/V7esePrv79eKo03rE0+sYXfEAs28fYelpyl7/sBCJS9bYbdtarNLu74uQ71 X7J9bC6H/GRUGRR1MKF1E0IsNcySfplz2iIF7uWtq67AuWVRhANrTTNOGUREAqTaZydZ tfre/Fj8kO5ROxO0sKOP5L5s2fA2Vsdw9r/E4jDgMfdpKPkNfCmJyhdcCnjmCiQmBOdu e11G07FHelZHQnRmB0u7uuPCFyCQ4IQB7ffm9JQqWm0FTdH0f4gYUAIhUovj/S2mrXme kIcDjgS8V9L4SQ+T+KEfKDvRIWgphppW/9D5A+I4aWqTAkqKjHuzTqbBaHc7nwazYHA8 jn+w== X-Gm-Message-State: ALoCoQln6YmKZ5t7P8rKYCTRpKH5RqacozYw6+hrekzTREzVre8D04KoCBJ1eKueGKKeQL33/+Q3 X-Received: by 10.152.42.129 with SMTP id o1mr346335lal.7.1403705444560; Wed, 25 Jun 2014 07:10:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.18 with SMTP id q18ls2215167qgq.70.gmail; Wed, 25 Jun 2014 07:10:44 -0700 (PDT) X-Received: by 10.221.64.20 with SMTP id xg20mr7111517vcb.3.1403705444402; Wed, 25 Jun 2014 07:10:44 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id mw5si2340503vec.34.2014.06.25.07.10.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Jun 2014 07:10:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id jz11so2053672veb.30 for ; Wed, 25 Jun 2014 07:10:44 -0700 (PDT) X-Received: by 10.220.53.72 with SMTP id l8mr7232114vcg.16.1403705444290; Wed, 25 Jun 2014 07:10:44 -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 tc5csp292797vcb; Wed, 25 Jun 2014 07:10:43 -0700 (PDT) X-Received: by 10.68.138.227 with SMTP id qt3mr12343391pbb.6.1403705443279; Wed, 25 Jun 2014 07:10:43 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id co3si5320147pad.238.2014.06.25.07.10.42; Wed, 25 Jun 2014 07:10:42 -0700 (PDT) Received-SPF: none (google.com: linux-pm-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 S1757067AbaFYOKj (ORCPT + 13 others); Wed, 25 Jun 2014 10:10:39 -0400 Received: from service87.mimecast.com ([91.220.42.44]:48644 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757357AbaFYOKe (ORCPT ); Wed, 25 Jun 2014 10:10:34 -0400 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Wed, 25 Jun 2014 15:10:32 +0100 Received: from red-moon.cambridge.arm.com ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 25 Jun 2014 15:10:21 +0100 From: Lorenzo Pieralisi To: linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org Cc: Lorenzo Pieralisi , Chander Kashyap , 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 Subject: [PATCH v5 6/8] drivers: cpuidle: initialize big.LITTLE driver through DT Date: Wed, 25 Jun 2014 15:10:19 +0100 Message-Id: <1403705421-17597-7-git-send-email-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1403705421-17597-1-git-send-email-lorenzo.pieralisi@arm.com> References: <1403705421-17597-1-git-send-email-lorenzo.pieralisi@arm.com> X-OriginalArrivalTime: 25 Jun 2014 14:10:21.0952 (UTC) FILETIME=[33B10800:01CF907F] X-MC-Unique: 114062515103204301 Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@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.128.171 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: , With the introduction of DT based idle states, CPUidle drivers for ARM can now initialize idle states data through properties in the device tree. This patch adds code to the big.LITTLE CPUidle driver to dynamically initialize idle states data through the updated device tree source file. Cc: Chander Kashyap Signed-off-by: Lorenzo Pieralisi --- Documentation/devicetree/bindings/arm/vexpress.txt | 25 +++++++++++++ arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 25 +++++++++++++ drivers/cpuidle/Kconfig.arm | 1 + drivers/cpuidle/cpuidle-big_little.c | 43 +++++++++++----------- 4 files changed, 73 insertions(+), 21 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/vexpress.txt b/Documentation/devicetree/bindings/arm/vexpress.txt index 39844cd..7f52ac8 100644 --- a/Documentation/devicetree/bindings/arm/vexpress.txt +++ b/Documentation/devicetree/bindings/arm/vexpress.txt @@ -67,6 +67,28 @@ with device_type = "cpu" property for every available core, eg.: }; }; +idle-states node +---------------- + +On Versatile Express platforms with power management capabilities, the device +tree source file must contain the idle-states node[1]. As defined in [1] the +idle-states node must contain an entry-method property that for Versatile +Express platforms can be one of: + + - "arm,vexpress-v2p-ca15_a7" + +Versatile Express idle-states nodes example: + + idle-states { + entry-method = "arm,vexpress-v2p-ca15_a7"; + + cluster-sleep-0 { + compatible = "arm,idle-state"; + entry-latency-us = <1000>; + exit-latency-us = <700>; + min-residency-us = <3500>; + }; + }; Configuration infrastructure ---------------------------- @@ -227,3 +249,6 @@ Example of a VE tile description (simplified) }; }; + +[1] ARM Linux Kernel documentation - Idle states bindings + Documentation/devicetree/bindings/arm/idle-states.txt diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts index a25c262..ad28242 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts @@ -33,11 +33,32 @@ #address-cells = <1>; #size-cells = <0>; + idle-states { + entry-method = "arm,vexpress-v2p-ca15_a7"; + + CLUSTER_SLEEP_BIG: cluster-sleep-big { + compatible = "arm,idle-state"; + power-rank = <0>; + entry-latency-us = <1000>; + exit-latency-us = <700>; + min-residency-us = <3500>; + }; + + CLUSTER_SLEEP_LITTLE: cluster-sleep-little { + compatible = "arm,idle-state"; + power-rank = <0>; + entry-latency-us = <1000>; + exit-latency-us = <500>; + min-residency-us = <3000>; + }; + }; + cpu0: cpu@0 { device_type = "cpu"; compatible = "arm,cortex-a15"; reg = <0>; cci-control-port = <&cci_control1>; + cpu-idle-states = <&CLUSTER_SLEEP_BIG>; }; cpu1: cpu@1 { @@ -45,6 +66,7 @@ compatible = "arm,cortex-a15"; reg = <1>; cci-control-port = <&cci_control1>; + cpu-idle-states = <&CLUSTER_SLEEP_BIG>; }; cpu2: cpu@2 { @@ -52,6 +74,7 @@ compatible = "arm,cortex-a7"; reg = <0x100>; cci-control-port = <&cci_control2>; + cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>; }; cpu3: cpu@3 { @@ -59,6 +82,7 @@ compatible = "arm,cortex-a7"; reg = <0x101>; cci-control-port = <&cci_control2>; + cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>; }; cpu4: cpu@4 { @@ -66,6 +90,7 @@ compatible = "arm,cortex-a7"; reg = <0x102>; cci-control-port = <&cci_control2>; + cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>; }; }; diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index b6d69e8..a9b089c 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm @@ -12,6 +12,7 @@ config ARM_BIG_LITTLE_CPUIDLE depends on ARCH_VEXPRESS_TC2_PM select ARM_CPU_SUSPEND select CPU_IDLE_MULTIPLE_DRIVERS + select DT_IDLE_STATES help Select this option to enable CPU idle driver for big.LITTLE based ARM systems. Driver manages CPUs coordination through MCPM and diff --git a/drivers/cpuidle/cpuidle-big_little.c b/drivers/cpuidle/cpuidle-big_little.c index b45fc62..6712441 100644 --- a/drivers/cpuidle/cpuidle-big_little.c +++ b/drivers/cpuidle/cpuidle-big_little.c @@ -24,6 +24,8 @@ #include #include +#include "dt_idle_states.h" + static int bl_enter_powerdown(struct cpuidle_device *dev, struct cpuidle_driver *drv, int idx); @@ -61,32 +63,12 @@ static struct cpuidle_driver bl_idle_little_driver = { .name = "little_idle", .owner = THIS_MODULE, .states[0] = ARM_CPUIDLE_WFI_STATE, - .states[1] = { - .enter = bl_enter_powerdown, - .exit_latency = 700, - .target_residency = 2500, - .flags = CPUIDLE_FLAG_TIME_VALID | - CPUIDLE_FLAG_TIMER_STOP, - .name = "C1", - .desc = "ARM little-cluster power down", - }, - .state_count = 2, }; static struct cpuidle_driver bl_idle_big_driver = { .name = "big_idle", .owner = THIS_MODULE, .states[0] = ARM_CPUIDLE_WFI_STATE, - .states[1] = { - .enter = bl_enter_powerdown, - .exit_latency = 500, - .target_residency = 2000, - .flags = CPUIDLE_FLAG_TIME_VALID | - CPUIDLE_FLAG_TIMER_STOP, - .name = "C1", - .desc = "ARM big-cluster power down", - }, - .state_count = 2, }; /* @@ -165,7 +147,8 @@ static int __init bl_idle_driver_init(struct cpuidle_driver *drv, int cpu_id) static int __init bl_idle_init(void) { - int ret; + int ret, i; + struct cpuidle_driver *drv; /* * Initialize the driver just for a compliant set of machines @@ -187,6 +170,24 @@ static int __init bl_idle_init(void) if (ret) goto out_uninit_little; + /* Start at index 1, index 0 standard WFI */ + ret = dt_init_idle_driver(&bl_idle_big_driver, NULL, 1, false); + if (ret) + goto out_uninit_big; + + /* Start at index 1, index 0 standard WFI */ + ret = dt_init_idle_driver(&bl_idle_little_driver, NULL, 1, false); + if (ret) + goto out_uninit_big; + + drv = &bl_idle_big_driver; + for (i = 1; i < drv->state_count; i++) + drv->states[i].enter = bl_enter_powerdown; + + drv = &bl_idle_little_driver; + for (i = 1; i < drv->state_count; i++) + drv->states[i].enter = bl_enter_powerdown; + ret = cpuidle_register(&bl_idle_little_driver, NULL); if (ret) goto out_uninit_big;