From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Rutland Subject: Re: [PATCH v2 08/10] clocksource: exynos_mct: use (request/free)_irq calls for local timer registration Date: Mon, 17 Jun 2013 11:01:52 +0100 Message-ID: <20130617100152.GC6809@e106331-lin.cambridge.arm.com> References: <1370516488-25860-10-git-send-email-chander.kashyap@linaro.org> <1371218572-8993-1-git-send-email-chander.kashyap@linaro.org> <1371218572-8993-9-git-send-email-chander.kashyap@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:37330 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932526Ab3FQKCW (ORCPT ); Mon, 17 Jun 2013 06:02:22 -0400 Content-Disposition: inline In-Reply-To: <1371218572-8993-9-git-send-email-chander.kashyap@linaro.org> Sender: linux-samsung-soc-owner@vger.kernel.org List-Id: linux-samsung-soc@vger.kernel.org To: Chander Kashyap Cc: "linux-arm-kernel@lists.infradead.org" , "linux-samsung-soc@vger.kernel.org" , "linux-serial@vger.kernel.org" , "kgene.kim@samsung.com" , "t.figa@samsung.com" , "s.nawrocki@samsung.com" , "thomas.ab@samsung.com" On Fri, Jun 14, 2013 at 03:02:50PM +0100, Chander Kashyap wrote: > Replace the (setup/remove)_irq calls for local timer registration with > (request/free)_irq calls. This generalizes the local timer registration API. > Suggested by Mark Rutland. > > Signed-off-by: Chander Kashyap > Cc: Mark Rutland > > Replace the (setup/remove)_irq calls for local timer registration with > (request/free)_irq calls. This generalises the local timer registration API. > > Signed-off-by: Chander Kashyap This looks much nicer now. Acked-by: Mark Rutland > --- > drivers/clocksource/exynos_mct.c | 35 +++++++++-------------------------- > 1 file changed, 9 insertions(+), 26 deletions(-) > > diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c > index 662fcc0..a704804 100644 > --- a/drivers/clocksource/exynos_mct.c > +++ b/drivers/clocksource/exynos_mct.c > @@ -400,18 +400,6 @@ static irqreturn_t exynos4_mct_tick_isr(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction mct_tick0_event_irq = { > - .name = "mct_tick0_irq", > - .flags = IRQF_TIMER | IRQF_NOBALANCING, > - .handler = exynos4_mct_tick_isr, > -}; > - > -static struct irqaction mct_tick1_event_irq = { > - .name = "mct_tick1_irq", > - .flags = IRQF_TIMER | IRQF_NOBALANCING, > - .handler = exynos4_mct_tick_isr, > -}; > - > static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt) > { > struct mct_clock_event_device *mevt; > @@ -435,16 +423,15 @@ static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt) > exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET); > > if (mct_int_type == MCT_INT_SPI) { > - if (cpu == 0) { > - mct_tick0_event_irq.dev_id = mevt; > - evt->irq = mct_irqs[MCT_L0_IRQ]; > - setup_irq(evt->irq, &mct_tick0_event_irq); > - } else { > - mct_tick1_event_irq.dev_id = mevt; > - evt->irq = mct_irqs[MCT_L1_IRQ]; > - setup_irq(evt->irq, &mct_tick1_event_irq); > - irq_set_affinity(evt->irq, cpumask_of(1)); > + evt->irq = mct_irqs[MCT_L0_IRQ + cpu]; > + if (request_irq(evt->irq, exynos4_mct_tick_isr, > + IRQF_TIMER | IRQF_NOBALANCING, > + evt->name, mevt)) { > + pr_err("exynos-mct: cannot register IRQ %d\n", > + evt->irq); > + return -EIO; > } > + irq_set_affinity(evt->irq, cpumask_of(cpu)); > } else { > enable_percpu_irq(mct_irqs[MCT_L0_IRQ], 0); > } > @@ -454,13 +441,9 @@ static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt) > > static void exynos4_local_timer_stop(struct clock_event_device *evt) > { > - unsigned int cpu = smp_processor_id(); > evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); > if (mct_int_type == MCT_INT_SPI) > - if (cpu == 0) > - remove_irq(evt->irq, &mct_tick0_event_irq); > - else > - remove_irq(evt->irq, &mct_tick1_event_irq); > + free_irq(evt->irq, this_cpu_ptr(&percpu_mct_tick)); > else > disable_percpu_irq(mct_irqs[MCT_L0_IRQ]); > } > -- > 1.7.9.5 > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.rutland@arm.com (Mark Rutland) Date: Mon, 17 Jun 2013 11:01:52 +0100 Subject: [PATCH v2 08/10] clocksource: exynos_mct: use (request/free)_irq calls for local timer registration In-Reply-To: <1371218572-8993-9-git-send-email-chander.kashyap@linaro.org> References: <1370516488-25860-10-git-send-email-chander.kashyap@linaro.org> <1371218572-8993-1-git-send-email-chander.kashyap@linaro.org> <1371218572-8993-9-git-send-email-chander.kashyap@linaro.org> Message-ID: <20130617100152.GC6809@e106331-lin.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Jun 14, 2013 at 03:02:50PM +0100, Chander Kashyap wrote: > Replace the (setup/remove)_irq calls for local timer registration with > (request/free)_irq calls. This generalizes the local timer registration API. > Suggested by Mark Rutland. > > Signed-off-by: Chander Kashyap > Cc: Mark Rutland > > Replace the (setup/remove)_irq calls for local timer registration with > (request/free)_irq calls. This generalises the local timer registration API. > > Signed-off-by: Chander Kashyap This looks much nicer now. Acked-by: Mark Rutland > --- > drivers/clocksource/exynos_mct.c | 35 +++++++++-------------------------- > 1 file changed, 9 insertions(+), 26 deletions(-) > > diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c > index 662fcc0..a704804 100644 > --- a/drivers/clocksource/exynos_mct.c > +++ b/drivers/clocksource/exynos_mct.c > @@ -400,18 +400,6 @@ static irqreturn_t exynos4_mct_tick_isr(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction mct_tick0_event_irq = { > - .name = "mct_tick0_irq", > - .flags = IRQF_TIMER | IRQF_NOBALANCING, > - .handler = exynos4_mct_tick_isr, > -}; > - > -static struct irqaction mct_tick1_event_irq = { > - .name = "mct_tick1_irq", > - .flags = IRQF_TIMER | IRQF_NOBALANCING, > - .handler = exynos4_mct_tick_isr, > -}; > - > static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt) > { > struct mct_clock_event_device *mevt; > @@ -435,16 +423,15 @@ static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt) > exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET); > > if (mct_int_type == MCT_INT_SPI) { > - if (cpu == 0) { > - mct_tick0_event_irq.dev_id = mevt; > - evt->irq = mct_irqs[MCT_L0_IRQ]; > - setup_irq(evt->irq, &mct_tick0_event_irq); > - } else { > - mct_tick1_event_irq.dev_id = mevt; > - evt->irq = mct_irqs[MCT_L1_IRQ]; > - setup_irq(evt->irq, &mct_tick1_event_irq); > - irq_set_affinity(evt->irq, cpumask_of(1)); > + evt->irq = mct_irqs[MCT_L0_IRQ + cpu]; > + if (request_irq(evt->irq, exynos4_mct_tick_isr, > + IRQF_TIMER | IRQF_NOBALANCING, > + evt->name, mevt)) { > + pr_err("exynos-mct: cannot register IRQ %d\n", > + evt->irq); > + return -EIO; > } > + irq_set_affinity(evt->irq, cpumask_of(cpu)); > } else { > enable_percpu_irq(mct_irqs[MCT_L0_IRQ], 0); > } > @@ -454,13 +441,9 @@ static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt) > > static void exynos4_local_timer_stop(struct clock_event_device *evt) > { > - unsigned int cpu = smp_processor_id(); > evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); > if (mct_int_type == MCT_INT_SPI) > - if (cpu == 0) > - remove_irq(evt->irq, &mct_tick0_event_irq); > - else > - remove_irq(evt->irq, &mct_tick1_event_irq); > + free_irq(evt->irq, this_cpu_ptr(&percpu_mct_tick)); > else > disable_percpu_irq(mct_irqs[MCT_L0_IRQ]); > } > -- > 1.7.9.5 > >