Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757758Ab1FFTTW (ORCPT ); Mon, 6 Jun 2011 15:19:22 -0400 Received: from d1.icnet.pl ([212.160.220.21]:46166 "EHLO d1.icnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752956Ab1FFTTU (ORCPT ); Mon, 6 Jun 2011 15:19:20 -0400 From: Janusz Krzysztofik Organization: Tele-Info-System, Poznan, PL To: "Rafael J. Wysocki" Subject: Re: [PATCH 3.0-rc1] PM / runtime: fix broken iteration over clock ids Date: Mon, 6 Jun 2011 21:18:17 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.36-gentoo-r5; KDE/4.4.5; i686; ; ) 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> <201106061947.36238.rjw@sisk.pl> In-Reply-To: <201106061947.36238.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201106062118.18734.jkrzyszt@tis.icnet.pl> X-SA-Exim-Scanned: No (on d1.icnet); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4156 Lines: 131 On Mon 06 Jun 2011 at 19:47:36 Rafael J. Wysocki wrote: > 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. That's right, please take it over. Thanks, Janusz > Thanks, > Rafael > > --- > drivers/base/power/clock_ops.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > 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); > } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/