From patchwork Wed Oct 31 16:44:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 12638 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 6B20523EFB for ; Wed, 31 Oct 2012 16:45:01 +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 1CBC8A18695 for ; Wed, 31 Oct 2012 16:45:01 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so2267660iej.11 for ; Wed, 31 Oct 2012 09:45:00 -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=n+o//J7YzNXVeJpzB7fKKrICCSKFFI+UKt5uxToUA5tSw6+MdTcTJqYcyVOoRnzceL 4dQde3md2tkLJPMZ0azTMUXKZpChgwhgPMIFQjkVjRgrl+wC41FulQB3YgsvGWBYfaij bIRhDqT2+xHabOOI7WpnflyqgZf/kEK2bSiODFWul0qBuSLBzui3b4sW5NjjEEYEM+5k 2HFSZLYEV/lOVJSyaCJMy/cDmsE8ZKkEzpnP3TpxVSCEewLaIfnzwhUp1pY6KOxffTa5 IC/hNsiZPr1Nx8CoUYcaZFBo3WxoALNG75GLDBfueWzstiT9mqslna5Aa7biwUfOv4CN KT7A== Received: by 10.42.21.68 with SMTP id j4mr13588256icb.18.1351701900824; Wed, 31 Oct 2012 09:45:00 -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 n20csp653066igt; Wed, 31 Oct 2012 09:45:00 -0700 (PDT) Received: by 10.204.136.197 with SMTP id s5mr11727762bkt.88.1351701899086; Wed, 31 Oct 2012 09:44:59 -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 fk9si5868631bkc.55.2012.10.31.09.44.58 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 09:44:59 -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 mail-bk0-f50.google.com with SMTP id q16so834989bkw.37 for ; Wed, 31 Oct 2012 09:44:58 -0700 (PDT) Received: by 10.205.130.148 with SMTP id hm20mr11370870bkc.71.1351701898485; Wed, 31 Oct 2012 09:44:58 -0700 (PDT) Received: from localhost.localdomain ([91.224.175.20]) by mx.google.com with ESMTPS id e13sm3909744bkw.12.2012.10.31.09.44.53 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 09:44:56 -0700 (PDT) From: Daniel Lezcano To: rjw@sisk.pl Cc: linux-pm@vger.kernel.org, pdeschrijver@nvidia.com, lorenzo.pieralisi@arm.com, linaro-dev@lists.linaro.org Subject: [PATCH V3 1/4] cpuidle: move driver's refcount to cpuidle Date: Wed, 31 Oct 2012 17:44:45 +0100 Message-Id: <1351701888-19963-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1351701888-19963-1-git-send-email-daniel.lezcano@linaro.org> References: <1351701888-19963-1-git-send-email-daniel.lezcano@linaro.org> X-Gm-Message-State: ALoCoQlveUkL5EsGoTi6Ljz7AX/zsQC8GlLQHtqxEs5CJ4ABktKm6dy5ZfhQJL1TwZOxZ+Utlr6+ 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). */