From patchwork Mon Jun 6 17:47:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 852992 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p56HlCLV017679 for ; Mon, 6 Jun 2011 17:47:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756855Ab1FFRqx (ORCPT ); Mon, 6 Jun 2011 13:46:53 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:60237 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752292Ab1FFRqw (ORCPT ); Mon, 6 Jun 2011 13:46:52 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 02A381B0181; Mon, 6 Jun 2011 19:31:18 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 16055-05; Mon, 6 Jun 2011 19:30:58 +0200 (CEST) Received: from ferrari.rjw.lan (ofq162.internetdsl.tpnet.pl [95.51.144.162]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 989C41B04F6; Mon, 6 Jun 2011 19:30:58 +0200 (CEST) From: "Rafael J. Wysocki" To: Janusz Krzysztofik Subject: Re: [PATCH 3.0-rc1] PM / runtime: fix broken iteration over clock ids Date: Mon, 6 Jun 2011 19:47:36 +0200 User-Agent: KMail/1.13.6 (Linux/2.6.39+; KDE/4.6.0; x86_64; ; ) Cc: linux-pm@lists.linux-foundation.org, Pavel Machek , Len Brown , "Greg Kroah-Hartman" , linux-kernel@vger.kernel.org, "linux-omap@vger.kernel.org" References: <201106051531.32878.jkrzyszt@tis.icnet.pl> In-Reply-To: <201106051531.32878.jkrzyszt@tis.icnet.pl> MIME-Version: 1.0 Message-Id: <201106061947.36238.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 06 Jun 2011 17:47:13 +0000 (UTC) Hi, On Sunday, June 05, 2011, Janusz Krzysztofik wrote: > In its current form, pm_runtime_clk_notify() iterates through sub- > strings of pm_clk_notifier_block.con_ids[0] rather than consecutive > pm_clk_notifier_block.con_ids[] elements. As a noticeable result, McBSP1 > port no longer worked for me on updated arch/arm/mach-omap1/pm_bus.c > (commit 600b776eb39a13a28b090ba9efceb0c69d4508aa, "OMAP1 / PM: Use > generic clock manipulation routines for runtime PM"), not being able to > activate "fck" when required. > > Tested on Amstrad Delta. > > Signed-off-by: Janusz Krzysztofik > --- > drivers/base/power/clock_ops.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > --- git/drivers/base/power/clock_ops.c.orig 2011-05-30 22:16:35.000000000 +0200 > +++ git/drivers/base/power/clock_ops.c 2011-06-05 15:19:55.000000000 +0200 > @@ -291,7 +291,7 @@ static int pm_runtime_clk_notify(struct > { > struct pm_clk_notifier_block *clknb; > struct device *dev = data; > - char *con_id; > + char **con_id; > int error; > > dev_dbg(dev, "%s() %ld\n", __func__, action); > @@ -309,8 +309,8 @@ static int pm_runtime_clk_notify(struct > > dev->pwr_domain = clknb->pwr_domain; > if (clknb->con_ids[0]) { > - for (con_id = clknb->con_ids[0]; *con_id; con_id++) > - pm_runtime_clk_add(dev, con_id); > + for (con_id = &clknb->con_ids[0]; *con_id; con_id++) > + pm_runtime_clk_add(dev, *con_id); > } else { > pm_runtime_clk_add(dev, NULL); > } First off, sorry for the breakage. Second, while the patch is correct in the part is covered, it is incomplete (it also should cover the !CONFIG_PM_RUNTIME case. So, I think the appended patch would be better. Thanks, Rafael --- drivers/base/power/clock_ops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/base/power/clock_ops.c =================================================================== --- linux-2.6.orig/drivers/base/power/clock_ops.c +++ linux-2.6/drivers/base/power/clock_ops.c @@ -291,7 +291,7 @@ static int pm_runtime_clk_notify(struct { struct pm_clk_notifier_block *clknb; struct device *dev = data; - char *con_id; + char **con_id; int error; dev_dbg(dev, "%s() %ld\n", __func__, action); @@ -309,8 +309,8 @@ static int pm_runtime_clk_notify(struct dev->pwr_domain = clknb->pwr_domain; if (clknb->con_ids[0]) { - for (con_id = clknb->con_ids[0]; *con_id; con_id++) - pm_runtime_clk_add(dev, con_id); + for (con_id = clknb->con_ids; *con_id; con_id++) + pm_runtime_clk_add(dev, *con_id); } else { pm_runtime_clk_add(dev, NULL); } @@ -380,7 +380,7 @@ static int pm_runtime_clk_notify(struct { struct pm_clk_notifier_block *clknb; struct device *dev = data; - char *con_id; + char **con_id; dev_dbg(dev, "%s() %ld\n", __func__, action); @@ -389,16 +389,16 @@ static int pm_runtime_clk_notify(struct switch (action) { case BUS_NOTIFY_ADD_DEVICE: if (clknb->con_ids[0]) { - for (con_id = clknb->con_ids[0]; *con_id; con_id++) - enable_clock(dev, con_id); + for (con_id = clknb->con_ids; *con_id; con_id++) + enable_clock(dev, *con_id); } else { enable_clock(dev, NULL); } break; case BUS_NOTIFY_DEL_DEVICE: if (clknb->con_ids[0]) { - for (con_id = clknb->con_ids[0]; *con_id; con_id++) - disable_clock(dev, con_id); + for (con_id = clknb->con_ids; *con_id; con_id++) + disable_clock(dev, *con_id); } else { disable_clock(dev, NULL); }