From patchwork Wed Nov 5 22:43:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 5238461 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 797859F295 for ; Wed, 5 Nov 2014 22:43:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B68E201C0 for ; Wed, 5 Nov 2014 22:43:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8218820166 for ; Wed, 5 Nov 2014 22:43:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751062AbaKEWnh (ORCPT ); Wed, 5 Nov 2014 17:43:37 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:62970 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751033AbaKEWng (ORCPT ); Wed, 5 Nov 2014 17:43:36 -0500 Received: by mail-pa0-f52.google.com with SMTP id fa1so1686081pad.39 for ; Wed, 05 Nov 2014 14:43:36 -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:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=eIkuQUaHy//rTlPpQibK4J7BWaA73GuGUHuIZNgE0ko=; b=KpXwIdqlymMN0FYe5pOh86GBBYJm6JuVSZ92rdjqRPi5ZPRyY6woWz7r4pUBqwpMmn Pnx42xGtgnQYOLPPYUGkw4vwuzeHTrPq5aLESa1FgEAdnqwCysY6nwOIhp0Ww+XKw4eV jEeE14yVjatEwLiIx/i3TNG7JJLjmLJEg2OUrZ1BkT41imDv20SPPLBR1d8+5EJ7rkR/ TwBUOkZoeFhNuwVMSOhW12klfxzZJh56RQ1vj9cyQ3r0pWmbCn3qYpIYw2ce/G4raRCH kxrkANtIJfLJ7FX+4IHCMfNx0ZM10qJaASFJdY9XivLpqWWgKSphs3ev5oIOZBTM3EMl 4P7A== X-Gm-Message-State: ALoCoQmA7lVh3nTa9hSTIbcndDQGHLrQj9id0lL0fl3uUyX0KXNSJ+hDelzZnO45+t2WWu2vV5q6 X-Received: by 10.66.220.3 with SMTP id ps3mr478930pac.8.1415227415896; Wed, 05 Nov 2014 14:43:35 -0800 (PST) Received: from localhost (c-67-183-17-239.hsd1.wa.comcast.net. [67.183.17.239]) by mx.google.com with ESMTPSA id kk7sm4141893pab.31.2014.11.05.14.43.33 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 05 Nov 2014 14:43:34 -0800 (PST) From: Kevin Hilman To: Dmitry Torokhov Cc: "Rafael J. Wysocki" , Ulf Hansson , Len Brown , Pavel Machek , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Geert Uytterhoeven , Alan Stern , Greg Kroah-Hartman , Tomasz Figa , Simon Horman , Magnus Damm , Ben Dooks , Kukjin Kim , Philipp Zabel , Mark Brown , Wolfram Sang , Russell King , Jack Dai , Jinkun Hong , Aaron Lu , Sylwester Nawrocki Subject: Re: [PATCH] PM / Domains: Change prototype for the ->attach_dev() callback References: <1414670569-3002-1-git-send-email-ulf.hansson@linaro.org> <3981560.mBph1QJkfl@vostro.rjw.lan> <7h4mul9ttl.fsf@deeprootsystems.com> <20141105013353.GA19238@dtor-ws> Date: Wed, 05 Nov 2014 14:43:31 -0800 In-Reply-To: <20141105013353.GA19238@dtor-ws> (Dmitry Torokhov's message of "Tue, 4 Nov 2014 17:33:53 -0800") Message-ID: <7h7fz92rqk.fsf@deeprootsystems.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Dmitry Torokhov writes: > On Thu, Oct 30, 2014 at 01:38:30PM -0700, Kevin Hilman wrote: >> "Rafael J. Wysocki" writes: >> >> > On Thursday, October 30, 2014 01:02:49 PM Ulf Hansson wrote: >> >> Convert the prototype to return and int. This is just an initial step, >> >> needed to support error handling. >> >> >> >> Signed-off-by: Ulf Hansson >> >> Acked-by: Kevin Hilman >> >> >> >> >> This patch is intended as fix for 3.18 rc[n]. Why? >> >> >> >> There are other SOC specific patches around that adds genpd support and which >> >> implements the ->attach_dev() callback. To prevent having an "atomic" patch >> >> during the next release cycle, let's change the prototype now instead. >> >> >> >> Further patches will add the actual error handling in genpd and these can then >> >> be reviewed and tested thoroughly. >> > >> > So we have no users of ->attach_dev at the moment, right? >> >> Not in mainline, but there are a couple getting ready to hit -next, so >> we wanted to fix this before they arrive so that adding the error >> handling will be easier. > > BTW, while we are at it, can we also pass the domain itself to > attach_dev() and detach_dev()? If anything it helps with debugging (you > can print domain name from the callbacks). Agreed, and it makes it match the other callbacks (power_off, power_on) which currently take struct generic_pm_domain *domain. Updated version of $SUBJECT patch below. Kevin ----- >8 ------ From 353a62ffae2f9228142c8a2093108f9eda8dc6b4 Mon Sep 17 00:00:00 2001 From: Ulf Hansson Date: Thu, 30 Oct 2014 13:02:49 +0100 Subject: [PATCH] PM / Domains: Change prototype for the ->attach_dev() callback Convert the prototype to return and int. This is just an initial step, needed to support error handling. Cc: Dmitry Torokhov [khilman: added domain as parameter to callbacks, as suggested by Dmitry] Signed-off-by: Ulf Hansson Signed-off-by: Kevin Hilman Acked-by: Dmitry Torokhov --- drivers/base/power/domain.c | 4 ++-- include/linux/pm_domain.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 40bc2f4072cc..b520687046d4 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1437,7 +1437,7 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, spin_unlock_irq(&dev->power.lock); if (genpd->attach_dev) - genpd->attach_dev(dev); + genpd->attach_dev(genpd, dev); mutex_lock(&gpd_data->lock); gpd_data->base.dev = dev; @@ -1499,7 +1499,7 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd, genpd->max_off_time_changed = true; if (genpd->detach_dev) - genpd->detach_dev(dev); + genpd->detach_dev(genpd, dev); spin_lock_irq(&dev->power.lock); diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 73e938b7e937..b3ed7766a291 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -72,8 +72,10 @@ struct generic_pm_domain { bool max_off_time_changed; bool cached_power_down_ok; struct gpd_cpuidle_data *cpuidle_data; - void (*attach_dev)(struct device *dev); - void (*detach_dev)(struct device *dev); + int (*attach_dev)(struct generic_pm_domain *domain, + struct device *dev); + void (*detach_dev)(struct generic_pm_domain *domain, + struct device *dev); }; static inline struct generic_pm_domain *pd_to_genpd(struct dev_pm_domain *pd)