From patchwork Thu Sep 20 13:14:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 11571 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id EF45223EFE for ; Thu, 20 Sep 2012 13:14:48 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4D28FA180AD for ; Thu, 20 Sep 2012 13:14:48 +0000 (UTC) Received: by iafj25 with SMTP id j25so1605419iaf.11 for ; Thu, 20 Sep 2012 06:14:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=psyX+6hrKcu2HONzyWtO0nnRSElfEimgkEfkgDO5kgY=; b=kaI26qWRtlvtsgbT80cVkG/5i7cEoviIFTB1oKZTxoWW3E/1dzn1k4aq/hH+L6q/Fp JqhcGnEGz4PtmwTJYxgudTTCyxjaWecjeOeUMLOjPQVl8SrTPAf7MVmaZNbwdxwjVwrK qV2xhwAR/zsjm8kpsApGpfiTB7NQ2KFlUpXZuI0tJO264YPhakpupBxfS7blcsEdY73K itlWWMjHgSrKaNSY5eKtDU3xXsv13Pqi5DtkUO8W2bUS+ldV9RYa9+96+76Y9r2D0sx9 xB6Fe9js3tBBHBifLHAv24VsapIYzDErI1KPdZ9VzX7nQWEjiTtUrhSfuPty7QCPnCPO /dEg== Received: by 10.42.84.69 with SMTP id k5mr1411597icl.5.1348146887653; Thu, 20 Sep 2012 06:14:47 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp74113igc; Thu, 20 Sep 2012 06:14:46 -0700 (PDT) Received: by 10.204.133.196 with SMTP id g4mr668779bkt.89.1348146886024; Thu, 20 Sep 2012 06:14:46 -0700 (PDT) Received: from mail-bk0-f50.google.com (mail-bk0-f50.google.com [209.85.214.50]) by mx.google.com with ESMTPS id fo7si5131424bkc.99.2012.09.20.06.14.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 06:14:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.50 is neither permitted nor denied by best guess record for domain of daniel.lezcano@linaro.org) client-ip=209.85.214.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.50 is neither permitted nor denied by best guess record for domain of daniel.lezcano@linaro.org) smtp.mail=daniel.lezcano@linaro.org Received: by bkwq16 with SMTP id q16so217467bkw.37 for ; Thu, 20 Sep 2012 06:14:45 -0700 (PDT) Received: by 10.204.7.91 with SMTP id c27mr666475bkc.17.1348146884805; Thu, 20 Sep 2012 06:14:44 -0700 (PDT) Received: from localhost.localdomain (AToulouse-651-1-259-252.w109-214.abo.wanadoo.fr. [109.214.174.252]) by mx.google.com with ESMTPS id t27sm887074bkv.10.2012.09.20.06.14.42 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 06:14:43 -0700 (PDT) From: Daniel Lezcano To: rjw@sisk.pl, lenb@kernel.org Cc: linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, patches@linaro.org, linaro-dev@lists.linaro.org Subject: [PATCH 1/2][RFC] cpuidle : move driver's refcount to cpuidle Date: Thu, 20 Sep 2012 15:14:39 +0200 Message-Id: <1348146880-17320-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQlPh8o/C87iZBV0iL0FRceQ3K6OHwnh/J0WGyNO8rLkybFQ5869yQpq8mG7T6DQYh7OAxd0 In the next patch, we will support different cpuidle drivers tied with a cpu. In this case we should move the refcount to the cpuidle_driver structure to handle several drivers at a time. Signed-off-by: Daniel Lezcano --- drivers/cpuidle/driver.c | 11 ++++++----- include/linux/cpuidle.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 87db387..676febd 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -16,7 +16,6 @@ static struct cpuidle_driver *cpuidle_curr_driver; DEFINE_SPINLOCK(cpuidle_driver_lock); -int cpuidle_driver_refcount; static void set_power_states(struct cpuidle_driver *drv) { @@ -92,7 +91,7 @@ void cpuidle_unregister_driver(struct cpuidle_driver *drv) spin_lock(&cpuidle_driver_lock); - if (!WARN_ON(cpuidle_driver_refcount > 0)) + if (!WARN_ON(drv->refcnt > 0)) cpuidle_curr_driver = NULL; spin_unlock(&cpuidle_driver_lock); @@ -106,7 +105,7 @@ struct cpuidle_driver *cpuidle_driver_ref(void) spin_lock(&cpuidle_driver_lock); drv = cpuidle_curr_driver; - cpuidle_driver_refcount++; + drv->refcnt++; spin_unlock(&cpuidle_driver_lock); return drv; @@ -114,10 +113,12 @@ struct cpuidle_driver *cpuidle_driver_ref(void) void cpuidle_driver_unref(void) { + struct cpuidle_driver *drv = cpuidle_curr_driver; + spin_lock(&cpuidle_driver_lock); - if (!WARN_ON(cpuidle_driver_refcount <= 0)) - cpuidle_driver_refcount--; + if (drv && !WARN_ON(drv->refcnt <= 0)) + drv->refcnt--; spin_unlock(&cpuidle_driver_lock); } diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 279b1ea..a4ff9f8 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -131,6 +131,7 @@ static inline int cpuidle_get_last_residency(struct cpuidle_device *dev) struct cpuidle_driver { const char *name; struct module *owner; + int refcnt; unsigned int power_specified:1; /* set to 1 to use the core cpuidle time keeping (for all states). */