From patchwork Wed Mar 18 18:46:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 45997 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E908B2153B for ; Wed, 18 Mar 2015 18:48:00 +0000 (UTC) Received: by wghl18 with SMTP id l18sf8826037wgh.1 for ; Wed, 18 Mar 2015 11:48:00 -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; bh=fsbryLWb77jdp6O7lxmLYfGEySaFWoUS2wxzW4WxNvo=; b=XumGqInXI+GCSO/jCVfF/U8EZh6pjJxibCx7gm7Y1ydW9tr/dtgEtSEiVnh/F+5cac IPbgNIxpzz5bQUNYV9gmbi1jS7NB/p8wF64oAW4Q586fE02MZwy4hvepUuYs7s3XpZe/ fKyu/S1B8BfoxyGVvrfHuLlowF2bj0fkNlMKP1HlzcM3vvSPXD+mDsTOMMdV0j+N/qks a6U28w/H+d5Wt4ZkKFibD5yuEK0rPeowojHqsSppudfAOBiExTJrN2a8eMAc34PhruWr VWDoyG1jel2pVUkU265wYZxttOkAueVR9MYFxCnQwuxdjAkrz4kSzcZydK5LAjsmf5zN MBQw== X-Gm-Message-State: ALoCoQlBAM8YOLt5iV6U4ziW20Aeu1L6/GXgSqlRKaGHdfsayFmwJhDz5Pc+XJl2xtXVUVONXyB6 X-Received: by 10.112.97.37 with SMTP id dx5mr2654692lbb.15.1426704480205; Wed, 18 Mar 2015 11:48:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.14 with SMTP id t14ls200883laz.61.gmail; Wed, 18 Mar 2015 11:47:59 -0700 (PDT) X-Received: by 10.112.131.66 with SMTP id ok2mr62333050lbb.51.1426704479896; Wed, 18 Mar 2015 11:47:59 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id d1si13530635lag.45.2015.03.18.11.47.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 11:47:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lagg8 with SMTP id g8so43838290lag.1 for ; Wed, 18 Mar 2015 11:47:59 -0700 (PDT) X-Received: by 10.152.8.15 with SMTP id n15mr38318459laa.41.1426704479756; Wed, 18 Mar 2015 11:47:59 -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 h5csp1338983lbj; Wed, 18 Mar 2015 11:47:58 -0700 (PDT) X-Received: by 10.70.138.105 with SMTP id qp9mr24855639pdb.67.1426704477825; Wed, 18 Mar 2015 11:47:57 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j9si37698739pdn.171.2015.03.18.11.47.56; Wed, 18 Mar 2015 11:47:57 -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 S1756823AbbCRSrx (ORCPT + 27 others); Wed, 18 Mar 2015 14:47:53 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:38731 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756269AbbCRSqc (ORCPT ); Wed, 18 Mar 2015 14:46:32 -0400 Received: by wifj2 with SMTP id j2so47845533wif.1 for ; Wed, 18 Mar 2015 11:46:31 -0700 (PDT) X-Received: by 10.194.24.103 with SMTP id t7mr142557876wjf.15.1426704391181; Wed, 18 Mar 2015 11:46:31 -0700 (PDT) Received: from localhost.localdomain (135-224-190-109.dsl.ovh.fr. [109.190.224.135]) by mx.google.com with ESMTPSA id uc18sm4345931wib.0.2015.03.18.11.46.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Mar 2015 11:46:30 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net, lorenzo.pieralisi@arm.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Catalin.Marinas@arm.com, robherring2@gmail.com, arnd@arndb.de, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, lina.iyer@linaro.org Subject: [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device Date: Wed, 18 Mar 2015 19:46:11 +0100 Message-Id: <1426704372-20406-8-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426704372-20406-1-git-send-email-daniel.lezcano@linaro.org> References: <1426704372-20406-1-git-send-email-daniel.lezcano@linaro.org> 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: daniel.lezcano@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.46 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: , Some architectures have some cpus which does not support idle states. Let the underlying low level code to return -ENOSYS when it is not possible to set an idle state. Signed-off-by: Daniel Lezcano --- drivers/cpuidle/cpuidle-arm.c | 45 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c index 1c94b88..0682ed0 100644 --- a/drivers/cpuidle/cpuidle-arm.c +++ b/drivers/cpuidle/cpuidle-arm.c @@ -17,11 +17,14 @@ #include #include #include +#include #include #include "dt_idle_states.h" +static DEFINE_PER_CPU(struct cpuidle_device, *cpuidle_arm_dev); + /* * arm_enter_idle_state - Programs CPU to enter the specified state * @@ -94,6 +97,7 @@ static int __init arm_idle_init(void) { int cpu, ret; struct cpuidle_driver *drv = &arm_idle_driver; + struct cpuidle_device *dev; /* * Initialize idle states data, starting at index 1. @@ -105,18 +109,55 @@ static int __init arm_idle_init(void) if (ret <= 0) return ret ? : -ENODEV; + ret = cpuidle_register_driver(drv); + if (ret) { + pr_err("Failed to register cpuidle driver\n"); + return ret; + } + /* * Call arch CPU operations in order to initialize * idle states suspend back-end specific data */ for_each_possible_cpu(cpu) { ret = arm_cpuidle_init(cpu); + + /* This cpu does not support any idle states */ + if (ret == -ENOSYS) + continue; + if (ret) { pr_err("CPU %d failed to init idle CPU ops\n", cpu); - return ret; + goto out_fail; + } + + dev = kzalloc(sizeof(*dev), GFP_KERNEL); + if (!dev) { + pr_err("Failed to allocate cpuidle device\n"); + goto out_fail; + } + + dev->cpu = cpu; + per_cpu(cpuidle_arm_dev, cpu) = dev; + + ret = cpuidle_register_device(dev); + if (ret) { + pr_err("Failed to register cpuidle device for CPU %d\n", + cpu); + kfree(dev); + goto out_fail; } } +out: + return ret; - return cpuidle_register(drv, NULL); +out_fail: + for (cpu--; cpu <= 0; cpu--) { + dev = per_cpu(cpuidle_arm_dev, cpu); + cpuidle_unregister_device(dev); + kfree(dev); + } + cpuidle_unregister_driver(drv); + goto out; } device_initcall(arm_idle_init);