From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris BREZILLON Subject: Re: [PATCHv2 4/4] clocksource: tcb_clksrc: unprepare clock in case of failure Date: Wed, 3 Sep 2014 12:10:15 +0200 Message-ID: <20140903121015.2f756e4d@bbrezillon> References: <1409329003-17252-1-git-send-email-g.portay@overkiz.com> <1409329003-17252-5-git-send-email-g.portay@overkiz.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1409329003-17252-5-git-send-email-g.portay@overkiz.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: =?UTF-8?B?R2HDq2w=?= PORTAY Cc: linux-pwm@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman , Daniel Lezcano , Nicolas Ferre , linux-kernel@vger.kernel.org, Thierry Reding , Alexandre Belloni , Thomas Gleixner , Jean-Christophe PLAGNIOL-VILLARD , linux-arm-kernel@lists.infradead.org List-Id: linux-pwm@vger.kernel.org T24gRnJpLCAyOSBBdWcgMjAxNCAxODoxNjo0MyArMDIwMApHYcOrbCBQT1JUQVkgPGcucG9ydGF5 QG92ZXJraXouY29tPiB3cm90ZToKCj4gVGhlIGNsb2NrIGlzIG5vdCB1bnByZXBhcmVkIGluIGNh c2Ugb2YgdGhlIHJlcXVlc3QgSVJRIGZhaWxzLgo+IAo+IEFsc28gdXBkYXRlIHRvIHJlcXVlc3Rf aXJxLgoKQXMgeW91J3JlIGRvaW5nIDIgZGlmZmVyZW50IHRoaW5ncyBpbiB0aGlzIGNvbW1pdCAo Zmlyc3QgbW92ZSB0bwpyZXF1ZXN0X2lycSBhbmQgdGhlbiBkaXNhYmxlIHRoZSBUQyBjbGsgaWYg dGhlIHJlcXVlc3QgZmFpbHMpIEkgd291bGQKaGF2ZSBjaG9zZW4gYW5vdGhlciBjb21taXQgdGl0 bGUsIGxpa2UKImNsb2Nrc291cmNlOiB0Y2JfY2xrc3JjOiBzYW5pdGl6ZSBJUlEgcmVxdWVzdCIK Ck90aGVyd2lzZSwgeW91IGhhdmUgbXkKCkFja2VkLWJ5OiBCb3JpcyBCcmV6aWxsb24gPGJvcmlz LmJyZXppbGxvbkBmcmVlLWVsZWN0cm9ucy5jb20+Cgo+IAo+IFNpZ25lZC1vZmYtYnk6IEdhw6ts IFBPUlRBWSA8Zy5wb3J0YXlAb3Zlcmtpei5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvY2xvY2tzb3Vy Y2UvdGNiX2Nsa3NyYy5jIHwgMTMgKysrKy0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgNCBp bnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2Ns b2Nrc291cmNlL3RjYl9jbGtzcmMuYyBiL2RyaXZlcnMvY2xvY2tzb3VyY2UvdGNiX2Nsa3NyYy5j Cj4gaW5kZXggZjkyMmU4MS4uOGJkYmM0NSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2Nsb2Nrc291 cmNlL3RjYl9jbGtzcmMuYwo+ICsrKyBiL2RyaXZlcnMvY2xvY2tzb3VyY2UvdGNiX2Nsa3NyYy5j Cj4gQEAgLTE3OCwxMiArMTc4LDYgQEAgc3RhdGljIGlycXJldHVybl90IGNoMl9pcnEoaW50IGly cSwgdm9pZCAqaGFuZGxlKQo+ICAJcmV0dXJuIElSUV9OT05FOwo+ICB9Cj4gIAo+IC1zdGF0aWMg c3RydWN0IGlycWFjdGlvbiB0Y19pcnFhY3Rpb24gPSB7Cj4gLQkubmFtZQkJPSAidGNfY2xrZXZ0 IiwKPiAtCS5mbGFncwkJPSBJUlFGX1RJTUVSLAo+IC0JLmhhbmRsZXIJPSBjaDJfaXJxLAo+IC19 Owo+IC0KPiAgc3RhdGljIGludCBfX2luaXQgc2V0dXBfY2xrZXZlbnRzKHN0cnVjdCBhdG1lbF90 YyAqdGMsIGludCBjbGszMmtfZGl2aXNvcl9pZHgpCj4gIHsKPiAgCWludCByZXQ7Cj4gQEAgLTE5 OCwxNSArMTkyLDE2IEBAIHN0YXRpYyBpbnQgX19pbml0IHNldHVwX2Nsa2V2ZW50cyhzdHJ1Y3Qg YXRtZWxfdGMgKnRjLCBpbnQgY2xrMzJrX2Rpdmlzb3JfaWR4KQo+ICAKPiAgCWNsa2V2dC5yZWdz ID0gdGMtPnJlZ3M7Cj4gIAljbGtldnQuY2xrID0gdDJfY2xrOwo+IC0JdGNfaXJxYWN0aW9uLmRl dl9pZCA9ICZjbGtldnQ7Cj4gIAo+ICAJdGltZXJfY2xvY2sgPSBjbGszMmtfZGl2aXNvcl9pZHg7 Cj4gIAo+ICAJY2xrZXZ0LmNsa2V2dC5jcHVtYXNrID0gY3B1bWFza19vZigwKTsKPiAgCj4gLQly ZXQgPSBzZXR1cF9pcnEoaXJxLCAmdGNfaXJxYWN0aW9uKTsKPiAtCWlmIChyZXQpCj4gKwlyZXQg PSByZXF1ZXN0X2lycShpcnEsIGNoMl9pcnEsIElSUUZfVElNRVIsICJ0Y19jbGtldnQiLCAmY2xr ZXZ0KTsKPiArCWlmIChyZXQpIHsKPiArCQljbGtfZGlzYWJsZV91bnByZXBhcmUodDJfY2xrKTsK PiAgCQlyZXR1cm4gcmV0Owo+ICsJfQo+ICAKPiAgCWNsb2NrZXZlbnRzX2NvbmZpZ19hbmRfcmVn aXN0ZXIoJmNsa2V2dC5jbGtldnQsIDMyNzY4LCAxLCAweGZmZmYpOwo+ICAKCgoKLS0gCkJvcmlz IEJyZXppbGxvbiwgRnJlZSBFbGVjdHJvbnMKRW1iZWRkZWQgTGludXggYW5kIEtlcm5lbCBlbmdp bmVlcmluZwpodHRwOi8vZnJlZS1lbGVjdHJvbnMuY29tCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdAps aW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVh ZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: boris.brezillon@free-electrons.com (Boris BREZILLON) Date: Wed, 3 Sep 2014 12:10:15 +0200 Subject: [PATCHv2 4/4] clocksource: tcb_clksrc: unprepare clock in case of failure In-Reply-To: <1409329003-17252-5-git-send-email-g.portay@overkiz.com> References: <1409329003-17252-1-git-send-email-g.portay@overkiz.com> <1409329003-17252-5-git-send-email-g.portay@overkiz.com> Message-ID: <20140903121015.2f756e4d@bbrezillon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 29 Aug 2014 18:16:43 +0200 Ga?l PORTAY wrote: > The clock is not unprepared in case of the request IRQ fails. > > Also update to request_irq. As you're doing 2 different things in this commit (first move to request_irq and then disable the TC clk if the request fails) I would have chosen another commit title, like "clocksource: tcb_clksrc: sanitize IRQ request" Otherwise, you have my Acked-by: Boris Brezillon > > Signed-off-by: Ga?l PORTAY > --- > drivers/clocksource/tcb_clksrc.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c > index f922e81..8bdbc45 100644 > --- a/drivers/clocksource/tcb_clksrc.c > +++ b/drivers/clocksource/tcb_clksrc.c > @@ -178,12 +178,6 @@ static irqreturn_t ch2_irq(int irq, void *handle) > return IRQ_NONE; > } > > -static struct irqaction tc_irqaction = { > - .name = "tc_clkevt", > - .flags = IRQF_TIMER, > - .handler = ch2_irq, > -}; > - > static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) > { > int ret; > @@ -198,15 +192,16 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) > > clkevt.regs = tc->regs; > clkevt.clk = t2_clk; > - tc_irqaction.dev_id = &clkevt; > > timer_clock = clk32k_divisor_idx; > > clkevt.clkevt.cpumask = cpumask_of(0); > > - ret = setup_irq(irq, &tc_irqaction); > - if (ret) > + ret = request_irq(irq, ch2_irq, IRQF_TIMER, "tc_clkevt", &clkevt); > + if (ret) { > + clk_disable_unprepare(t2_clk); > return ret; > + } > > clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff); > -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932688AbaICKKW (ORCPT ); Wed, 3 Sep 2014 06:10:22 -0400 Received: from top.free-electrons.com ([176.31.233.9]:44608 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932511AbaICKKS convert rfc822-to-8bit (ORCPT ); Wed, 3 Sep 2014 06:10:18 -0400 Date: Wed, 3 Sep 2014 12:10:15 +0200 From: Boris BREZILLON To: =?UTF-8?B?R2HDq2w=?= PORTAY Cc: Arnd Bergmann , Daniel Lezcano , Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, Nicolas Ferre , Thomas Gleixner , Thierry Reding , Alexandre Belloni , Jean-Christophe PLAGNIOL-VILLARD Subject: Re: [PATCHv2 4/4] clocksource: tcb_clksrc: unprepare clock in case of failure Message-ID: <20140903121015.2f756e4d@bbrezillon> In-Reply-To: <1409329003-17252-5-git-send-email-g.portay@overkiz.com> References: <1409329003-17252-1-git-send-email-g.portay@overkiz.com> <1409329003-17252-5-git-send-email-g.portay@overkiz.com> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 29 Aug 2014 18:16:43 +0200 Gaël PORTAY wrote: > The clock is not unprepared in case of the request IRQ fails. > > Also update to request_irq. As you're doing 2 different things in this commit (first move to request_irq and then disable the TC clk if the request fails) I would have chosen another commit title, like "clocksource: tcb_clksrc: sanitize IRQ request" Otherwise, you have my Acked-by: Boris Brezillon > > Signed-off-by: Gaël PORTAY > --- > drivers/clocksource/tcb_clksrc.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c > index f922e81..8bdbc45 100644 > --- a/drivers/clocksource/tcb_clksrc.c > +++ b/drivers/clocksource/tcb_clksrc.c > @@ -178,12 +178,6 @@ static irqreturn_t ch2_irq(int irq, void *handle) > return IRQ_NONE; > } > > -static struct irqaction tc_irqaction = { > - .name = "tc_clkevt", > - .flags = IRQF_TIMER, > - .handler = ch2_irq, > -}; > - > static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) > { > int ret; > @@ -198,15 +192,16 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) > > clkevt.regs = tc->regs; > clkevt.clk = t2_clk; > - tc_irqaction.dev_id = &clkevt; > > timer_clock = clk32k_divisor_idx; > > clkevt.clkevt.cpumask = cpumask_of(0); > > - ret = setup_irq(irq, &tc_irqaction); > - if (ret) > + ret = request_irq(irq, ch2_irq, IRQF_TIMER, "tc_clkevt", &clkevt); > + if (ret) { > + clk_disable_unprepare(t2_clk); > return ret; > + } > > clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff); > -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com