From patchwork Fri Oct 19 10:10:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 12364 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 E19CF23F58 for ; Fri, 19 Oct 2012 10:10:58 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 87D51A18744 for ; Fri, 19 Oct 2012 10:10:58 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so335119iej.11 for ; Fri, 19 Oct 2012 03:10:58 -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:in-reply-to:references :x-gm-message-state; bh=sBb8upT0j4nqGFaOIC0qFmHC4qE4AcxHc739+otvosE=; b=midx2Cw5zlYKDUwgNlU14R5omYMmgpHPM+ob0q+DEImoLf7XM5v4ary+DReUZZmIN8 Mrih0A7sTpcda5Nyr4IOR/SJgOLylSWG//MRWCWN14lD/A1SVGBg+jRmhuRq/Qw7pSSW 9+1sQYpvpnHqdv0AoOGS/Q6hIG0mfvdffKYPLTgxwlKK2T0QkJBoKFGfBqNO48s9oB+U yLBS/RxDuYjFte1WKM6WcW5TPagoB0eG8y90vxJiYWXlHFJafBuIiyrN7fHXcvhH4ChF zoOlDf87fyILJWtJ1UL01mELMYOnC0A2rnsxeISeI66D/QCzPoVeBKsCrAci7YcQw4y6 F68g== Received: by 10.50.152.137 with SMTP id uy9mr586174igb.62.1350641457903; Fri, 19 Oct 2012 03:10:57 -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.67.148 with SMTP id n20csp56178igt; Fri, 19 Oct 2012 03:10:56 -0700 (PDT) Received: by 10.216.203.1 with SMTP id e1mr542848weo.103.1350641456100; Fri, 19 Oct 2012 03:10:56 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id o11si1292045wee.113.2012.10.19.03.10.55 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 03:10:56 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of daniel.lezcano@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.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 mail-wg0-f50.google.com with SMTP id 16so236852wgi.31 for ; Fri, 19 Oct 2012 03:10:55 -0700 (PDT) Received: by 10.180.96.129 with SMTP id ds1mr2023573wib.17.1350641455410; Fri, 19 Oct 2012 03:10:55 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-1-158.w90-5.abo.wanadoo.fr. [90.5.56.158]) by mx.google.com with ESMTPS id v3sm2565519wiy.5.2012.10.19.03.10.51 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 03:10:54 -0700 (PDT) From: Daniel Lezcano To: rjw@sisk.pl Cc: linux-pm@vger.kernel.org, lorenzo.pieralisi@arm.com, pdeschrijver@nvidia.com, patches@linaro.org, linaro-dev@lists.linaro.org Subject: [PATCH 1/4][V2] cpuidle: move driver's refcount to cpuidle Date: Fri, 19 Oct 2012 12:10:46 +0200 Message-Id: <1350641449-22863-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1350641449-22863-1-git-send-email-daniel.lezcano@linaro.org> References: <1350641449-22863-1-git-send-email-daniel.lezcano@linaro.org> X-Gm-Message-State: ALoCoQmJmFDA3kMh4Iumj53+CZNpLtmclNfuCl+g/iTduhbEjoEz1NyUUe3XSs+j9W+z6j0/zM0Y We want to support different cpuidle drivers co-existing together. 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 Acked-by: Peter De Schrijver --- drivers/cpuidle/driver.c | 13 ++++++++----- include/linux/cpuidle.h | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 87db387..39ba8e1 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) { @@ -61,6 +60,8 @@ int cpuidle_register_driver(struct cpuidle_driver *drv) if (!drv->power_specified) set_power_states(drv); + drv->refcnt = 0; + cpuidle_curr_driver = drv; spin_unlock(&cpuidle_driver_lock); @@ -92,7 +93,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 +107,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 +115,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 7daf0e3..d08e1af 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -124,6 +124,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). */