[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.10.1409052108090.5472@nanos>
Date: Fri, 5 Sep 2014 21:08:57 +0200 (CEST)
From: Thomas Gleixner <tglx@...utronix.de>
To: Andrew Bresticker <abrestic@...omium.org>
cc: Ralf Baechle <ralf@...ux-mips.org>,
Rob Herring <robh+dt@...nel.org>,
Pawel Moll <pawel.moll@....com>,
Mark Rutland <mark.rutland@....com>,
Ian Campbell <ijc+devicetree@...lion.org.uk>,
Kumar Gala <galak@...eaurora.org>,
Jason Cooper <jason@...edaemon.net>,
Jeffrey Deans <jeffrey.deans@...tec.com>,
Markos Chandras <markos.chandras@...tec.com>,
Paul Burton <paul.burton@...tec.com>,
Arnd Bergmann <arnd@...db.de>,
John Crispin <blogic@...nwrt.org>,
David Daney <ddaney.cavm@...il.com>, linux-mips@...ux-mips.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 15/16] MIPS: GIC: Use local interrupts for timer
On Fri, 5 Sep 2014, Andrew Bresticker wrote:
> Instead of using GIC interrupt 0 for the timer (which was not even
> handled correctly by the GIC irqchip code and could conflict with an
> actual external interrupt), use the designated local interrupt for
> the GIC timer.
>
> Also, since the timer is a per-CPU interrupt, initialize it with
> setup_percpu_irq() and enable it with enable_percpu_irq() instead
> of using direct register writes.
>
> Signed-off-by: Andrew Bresticker <abrestic@...omium.org>
> ---
> No changes from v1.
> ---
> arch/mips/kernel/cevt-gic.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/arch/mips/kernel/cevt-gic.c b/arch/mips/kernel/cevt-gic.c
> index 6093716..cae72a4 100644
> --- a/arch/mips/kernel/cevt-gic.c
> +++ b/arch/mips/kernel/cevt-gic.c
> @@ -68,7 +68,7 @@ int gic_clockevent_init(void)
> if (!cpu_has_counter || !gic_frequency)
> return -ENXIO;
>
> - irq = MIPS_GIC_IRQ_BASE;
> + irq = MIPS_GIC_LOCAL_IRQ_BASE + GIC_LOCAL_INTR_COMPARE;
>
> cd = &per_cpu(gic_clockevent_device, cpu);
>
> @@ -91,15 +91,13 @@ int gic_clockevent_init(void)
>
> clockevents_register_device(cd);
>
> - GICWRITE(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE_MAP), 0x80000002);
> - GICWRITE(GIC_REG(VPE_LOCAL, GIC_VPE_SMASK), GIC_VPE_SMASK_CMP_MSK);
> + if (!gic_timer_irq_installed) {
> + setup_percpu_irq(irq, &gic_compare_irqaction);
> + irq_set_handler(irq, handle_percpu_irq);
> + gic_timer_irq_installed = 1;
> + }
>
> - if (gic_timer_irq_installed)
> - return 0;
> + enable_percpu_irq(irq, 0);
Please use a proper IRQ_TYPE constant instead of 0
Thanks,
tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists