From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754990AbcBBNF4 (ORCPT ); Tue, 2 Feb 2016 08:05:56 -0500 Received: from www.linutronix.de ([62.245.132.108]:48984 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754365AbcBBNFx (ORCPT ); Tue, 2 Feb 2016 08:05:53 -0500 Date: Tue, 2 Feb 2016 14:04:29 +0100 (CET) From: Thomas Gleixner To: Vladimir Murzin cc: arnd@arndb.de, linux@arm.linux.org.uk, gregkh@linuxfoundation.org, daniel.lezcano@linaro.org, u.kleine-koenig@pengutronix.de, andy.shevchenko@gmail.com, mark.rutland@arm.com, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, jslaby@suse.cz, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-serial@vger.kernel.org, linux-api@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 02/10] clockevents/drivers: add MPS2 Timer driver In-Reply-To: <1454413199-26573-3-git-send-email-vladimir.murzin@arm.com> Message-ID: References: <1454413199-26573-1-git-send-email-vladimir.murzin@arm.com> <1454413199-26573-3-git-send-email-vladimir.murzin@arm.com> User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2 Feb 2016, Vladimir Murzin wrote: > +static int __init mps2_clockevent_init(struct device_node *np) > +{ > + void __iomem *base; > + struct clk *clk; > + struct clockevent_mps2 *ce; > + u32 rate; > + int irq, ret; > + const char *name = "mps2-clkevt"; > + > + ret = of_property_read_u32(np, "clock-frequency", &rate); > + if (ret) { > + clk = of_clk_get(np, 0); > + if (IS_ERR(clk)) { > + ret = PTR_ERR(clk); > + pr_err("failed to get clock for clockevent: %d\n", ret); > + goto err_clk_get; > + } > + > + ret = clk_prepare_enable(clk); > + if (ret) { > + pr_err("failed to enable clock for clockevent: %d\n", ret); > + clk_put(clk); > + goto err_clk_enable; > + } > + > + rate = clk_get_rate(clk); > + } So in case that "clock-frequency" is available in DT, what enables and configures the clock? > +err_ia_alloc: > + kfree(ce); > +err_ce_alloc: > +err_get_irq: > + iounmap(base); > +err_iomap: > + clk_disable_unprepare(clk); clk is not initialized when "clock-frequency" is available in DT. The compiler should have told you .... > +err_clk_enable: > + clk_put(clk); Put without get .... > +static int __init mps2_clocksource_init(struct device_node *np) > +{ > + void __iomem *base; > + struct clk *clk; > + u32 rate; > + int ret; > + const char *name = "mps2-clksrc"; > + > + ret = of_property_read_u32(np, "clock-frequency", &rate); > + if (ret) { > + clk = of_clk_get(np, 0); > + if (IS_ERR(clk)) { > + ret = PTR_ERR(clk); > + pr_err("failed to get clock for clocksource: %d\n", ret); > + goto err_clk_get; > + } > + > + ret = clk_prepare_enable(clk); > + if (ret) { > + pr_err("failed to enable clock for clocksource: %d\n", ret); > + clk_put(clk); > + goto err_clk_enable; > + } > + > + rate = clk_get_rate(clk); > + } Same problem as above. > +err_clocksource_init: > + iounmap(base); > +err_iomap: > + clk_disable_unprepare(clk); Ditto. > +err_clk_enable: > + clk_put(clk); Ditto. > +err_clk_get: > + return ret; > +} > + > +static void __init mps2_timer_init(struct device_node *np) > +{ > + static int has_clocksource, has_clockevent; > + int ret; > + > + if (!has_clocksource) { > + ret = mps2_clocksource_init(np); > + if (!ret) { > + has_clocksource = 1; > + return; > + } > + } > + > + if (!has_clockevent) { > + ret = mps2_clockevent_init(np); > + if (!ret) { > + has_clockevent = 1; > + return; > + } > + } You take randomly the first timer as clocksource and the second one as clockevent. If clocksource init fails, you try to install it as clockevent. Sorry, but I really cannot follow the logic here. Thanks, tglx