From patchwork Wed May 6 14:55:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 6350241 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E6E279F373 for ; Wed, 6 May 2015 14:55:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 57D22202EC for ; Wed, 6 May 2015 14:55:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4CB620120 for ; Wed, 6 May 2015 14:55:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751872AbbEFOzm (ORCPT ); Wed, 6 May 2015 10:55:42 -0400 Received: from muru.com ([72.249.23.125]:49511 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751399AbbEFOzl (ORCPT ); Wed, 6 May 2015 10:55:41 -0400 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 040BC8134; Wed, 6 May 2015 14:56:49 +0000 (UTC) Date: Wed, 6 May 2015 07:55:39 -0700 From: Tony Lindgren To: Stephen Boyd Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Michael Turquette , Paul Walmsley , Tero Kristo , Tomeu Vizoso Subject: Re: [PATCH] ARM: OMAP2+: Fix bogus struct clk comparison for timer clock Message-ID: <20150506145539.GI21061@atomide.com> References: <1430848941-27106-1-git-send-email-tony@atomide.com> <20150506053539.GA10871@codeaurora.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150506053539.GA10871@codeaurora.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 * Stephen Boyd [150505 22:36]: > On 05/05, Tony Lindgren wrote: > > With recent changes to use determine_rate, the comparison of two > > clocks won't work without doing __clk_get_hw on the clocks > > first. > > > > Cc: Michael Turquette > > Cc: Paul Walmsley > > Cc: Stephen Boyd > > Cc: Tero Kristo > > Cc: Tomeu Vizoso > > Signed-off-by: Tony Lindgren > > --- > > > > Found one more of these, the coccinelle scripts do not seem > > to match this? > > I don't think the coccinelle script was ever merged... Oh OK, but the wrong comparisons in the kernel code got fixed, right? > > @@ -298,7 +299,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, > > if (IS_ERR(src)) > > return PTR_ERR(src); > > > > - if (clk_get_parent(timer->fclk) != src) { > > + if (__clk_get_hw(clk_get_parent(timer->fclk)) != __clk_get_hw(src)) { > > Please use clk_is_match() instead so we can find these instances > with an easy grep. Thanks here's an updated version with that. Regards, Tony 8< ----------------------------- From: Tony Lindgren Date: Tue, 5 May 2015 09:03:34 -0700 Subject: [PATCH] ARM: OMAP2+: Fix bogus struct clk comparison for timer clock With recent changes to use determine_rate, the comparison of two clocks won't work without clk_is_match that does __clk_get_hw on the clocks first. Cc: Michael Turquette Cc: Paul Walmsley Cc: Stephen Boyd Cc: Tero Kristo Cc: Tomeu Vizoso Signed-off-by: Tony Lindgren Acked-by: Stephen Boyd --- 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 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -298,7 +298,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, if (IS_ERR(src)) return PTR_ERR(src); - if (clk_get_parent(timer->fclk) != src) { + if (!clk_is_match(clk_get_parent(timer->fclk), src)) { r = clk_set_parent(timer->fclk, src); if (r < 0) { pr_warn("%s: %s cannot set source\n", __func__,