From patchwork Fri Nov 28 08:30:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5401921 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C52D7BEEA8 for ; Fri, 28 Nov 2014 08:32:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EBB3020138 for ; Fri, 28 Nov 2014 08:32:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1DCCA2012D for ; Fri, 28 Nov 2014 08:32:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XuGxA-0004fE-BD; Fri, 28 Nov 2014 08:31:00 +0000 Received: from mail-lb0-f175.google.com ([209.85.217.175]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XuGwq-0004BB-LA for linux-arm-kernel@lists.infradead.org; Fri, 28 Nov 2014 08:30:42 +0000 Received: by mail-lb0-f175.google.com with SMTP id u10so5296380lbd.34 for ; Fri, 28 Nov 2014 00:30:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KliPalJ/feLQyIMqAyYq5l5OZu1E9YjSjAdrd4qZgDg=; b=kwzHfops75RiEp0XgbwaV+cZDG41GDNiZUeoZD8VfCjl9MIWsV1vdlaAK73vIw/RcG xsC38LH/GvDtpq5GmmbkLNJtVQKAFQUoXltZJW7ZbsujUpLlJjfSyXXK6sBFKYNxwEeO p5xHBNHKiVLH+oI3o8am9MRsKgBq5SyjMd0MKo3ycDBbHM5QrSv51JJGx4rgONSmgrgm C0QM3nxCoGYCH9TI0zV7vaoHz++T3VU6dE24pjdCXN8qMfOjDVvyecfqNEzDc0GQInlC Lnak5KZCDVlrkNrWsOlgMbjCSBrY3GMIbK5wz/RkPq71mD/hGENBwucO78R3rOTxdVqI nZQw== X-Gm-Message-State: ALoCoQloVYRJfUJjxTSa3VPNukSeCh91z5k0dq4tA56llmnqAqaLqRixMaWD5cDSgExeaVAJ06eM X-Received: by 10.152.2.41 with SMTP id 9mr41769218lar.47.1417163411426; Fri, 28 Nov 2014 00:30:11 -0800 (PST) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id z1sm2419274lad.40.2014.11.28.00.30.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Nov 2014 00:30:10 -0800 (PST) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Kevin Hilman , Simon Horman , linux-pm@vger.kernel.org Subject: [PATCH V3 1/3] PM / Domains: Initial PM clock support for genpd Date: Fri, 28 Nov 2014 09:30:01 +0100 Message-Id: <1417163403-7070-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417163403-7070-1-git-send-email-ulf.hansson@linaro.org> References: <1417163403-7070-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141128_003040_911326_03FAAB55 X-CRM114-Status: GOOD ( 14.94 ) X-Spam-Score: -0.7 (/) Cc: Ulf Hansson , linux-samsung-soc@vger.kernel.org, Russell King , Arnd Bergmann , Geert Uytterhoeven , Dmitry Torokhov , Magnus Damm , Grygorii Strashko , Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's quite common for PM domains to use PM clocks. Typically from SOC specific code, the per device PM clock list is created and pm_clk_suspend|resume() are invoked to handle clock gating/ungating. A step towards consolidation is to integrate PM clock support into genpd, which is what this patch does. In this initial step, the calls to the pm_clk_suspend|resume() are handled within genpd, but the per device PM clock list still needs to be created from SOC specific code. It seems reasonable to have gendp to handle that as well, but that left to future patches to address. It's not every users of genpd that are keen on using PM clocks, thus we need to provide this a configuration option for genpd. Therefore let's add flag field in the genpd struct to keep this information and define a new GENDP_PM_CLK bit for it. Signed-off-by: Ulf Hansson --- Changes in v3: Moved define out of struct definition. Don't use bitops.h Rename define to GENDP_PM_CLK. Changes in v2: Set ->start() callback to pm_clk_resume() and fixed comment. --- drivers/base/power/domain.c | 7 +++++++ include/linux/pm_domain.h | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 735c473..a2424a7 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -1928,6 +1929,12 @@ void pm_genpd_init(struct generic_pm_domain *genpd, genpd->domain.ops.complete = pm_genpd_complete; genpd->dev_ops.save_state = pm_genpd_default_save_state; genpd->dev_ops.restore_state = pm_genpd_default_restore_state; + + if (genpd->flags & GENPD_PM_CLK) { + genpd->dev_ops.stop = pm_clk_suspend; + genpd->dev_ops.start = pm_clk_resume; + } + mutex_lock(&gpd_list_lock); list_add(&genpd->gpd_list_node, &gpd_list); mutex_unlock(&gpd_list_lock); diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 8cbd32e..173cc67 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -17,6 +17,9 @@ #include #include +/* Defines used for the flags field in the struct generic_pm_domain */ +#define GENPD_PM_CLK (1U << 0) /* PM domain uses PM clk */ + enum gpd_status { GPD_STATE_ACTIVE = 0, /* PM domain is active */ GPD_STATE_WAIT_MASTER, /* PM domain's master is being waited for */ @@ -76,6 +79,7 @@ struct generic_pm_domain { struct device *dev); void (*detach_dev)(struct generic_pm_domain *domain, struct device *dev); + unsigned int flags; /* Bit field of configs for genpd */ }; static inline struct generic_pm_domain *pd_to_genpd(struct dev_pm_domain *pd)