From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754003AbaIERao (ORCPT ); Fri, 5 Sep 2014 13:30:44 -0400 Received: from mail-pa0-f74.google.com ([209.85.220.74]:59512 "EHLO mail-pa0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753764AbaIERal (ORCPT ); Fri, 5 Sep 2014 13:30:41 -0400 From: Andrew Bresticker To: Ralf Baechle , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Thomas Gleixner , Jason Cooper Cc: Andrew Bresticker , Jeffrey Deans , Markos Chandras , Paul Burton , Arnd Bergmann , John Crispin , David Daney , linux-mips@linux-mips.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 15/16] MIPS: GIC: Use local interrupts for timer Date: Fri, 5 Sep 2014 10:30:17 -0700 Message-Id: <1409938218-9026-16-git-send-email-abrestic@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1409938218-9026-1-git-send-email-abrestic@chromium.org> References: <1409938218-9026-1-git-send-email-abrestic@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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); - gic_timer_irq_installed = 1; - - setup_irq(irq, &gic_compare_irqaction); - irq_set_handler(irq, handle_percpu_irq); return 0; } -- 2.1.0.rc2.206.gedb03e5