From patchwork Mon Sep 24 22:43:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 11695 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 6D13B23E54 for ; Mon, 24 Sep 2012 22:44: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 1AB6DA1812A for ; Mon, 24 Sep 2012 22:44:01 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so11389513iej.11 for ; Mon, 24 Sep 2012 15:44: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=PrZzM6RY70giaeX8yZT5DEkKPdnM11RQFNNlERs4cs4=; b=gQJ65IFCYg//RoKuA12ZRNHCK/QeIZbAT4baim1/jOsZznBea6p9DLVD8wZk5M69JO GphBtVg6SMyuYbU4/5swGUBmHxvwFJ77RfSacvqZSJtqlkeaVZ6BoQpJN3aWP/cmoSuD jFnyStImjfcgB066JpXjf9EgVjV4Apbmr6V0C+Rnz0oXHtwfm0wJhWhk/AV1jtAyl36u wbZZJO+M4x24t0NulejO289c+0nH8GvQzlqXaF5JDwyPi7xf/lvhCCfJWOUJ9MNtMAn7 o4qc3wO+vKy/EJ0A5NLF/lzULJ7URmrpBLO3di6GrlkNF/WWuWgz9S4pdqmL61OmocBD SNFw== Received: by 10.50.195.134 with SMTP id ie6mr6637992igc.28.1348526640862; Mon, 24 Sep 2012 15:44: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.184.232 with SMTP id ex8csp265881igc; Mon, 24 Sep 2012 15:44:00 -0700 (PDT) Received: by 10.216.143.96 with SMTP id k74mr4603996wej.2.1348526639089; Mon, 24 Sep 2012 15:43:59 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id p49si24630193wea.135.2012.09.24.15.43.58 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 15:43:59 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of daniel.lezcano@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 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-we0-f178.google.com with SMTP id r6so1739205wey.37 for ; Mon, 24 Sep 2012 15:43:58 -0700 (PDT) Received: by 10.180.76.69 with SMTP id i5mr17228240wiw.9.1348526638629; Mon, 24 Sep 2012 15:43:58 -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 k2sm19286398wiz.7.2012.09.24.15.43.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 15:43:57 -0700 (PDT) From: Daniel Lezcano To: rjw@sisk.pl, lenb@kernel.org Cc: linux-pm@vger.kernel.org, lorenzo.pieralisi@arm.com, pdeschrijver@nvidia.com, linux-acpi@vger.kernel.org, patches@linaro.org, linaro-dev@lists.linaro.org Subject: [PATCH 1/4] cpuidle : move driver's refcount to cpuidle Date: Tue, 25 Sep 2012 00:43:51 +0200 Message-Id: <1348526634-19029-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1348526634-19029-1-git-send-email-daniel.lezcano@linaro.org> References: <1348526634-19029-1-git-send-email-daniel.lezcano@linaro.org> X-Gm-Message-State: ALoCoQmcoO+xm7kXvqFzUcs+k83mZzgYL5B+w8cUJvmZ5iOZ+a2bYcEZpVXAFIMyESw+juFssPrq 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 --- 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 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). */