MIPS: Add new GIC clockevent driver.
PATCH v2 1/1 MIPS: Add new GIC clockevent driver.
From: Raghu Gandham <[email protected]>
Add new clockevent driver that uses the counter present on the MIPS Global Interrupt Controller.
Signed-off-by Raghu Gandham <[email protected]>
Signed-off-by Steven J. Hill <[email protected]>
--- arch/mips/Kconfig | 4 ++ arch/mips/include/asm/gic.h | 14 +++-- arch/mips/include/asm/time.h | 5 ++ arch/mips/kernel/Makefile | 1 + arch/mips/kernel/cevt-gic.c | 120 ++++++++++++++++++++++++++++++++++++++ arch/mips/kernel/csrc-gic.c | 27 ++++++++- arch/mips/kernel/irq-gic.c | 11 ++++ arch/mips/mti-malta/malta-int.c | 11 ++-- arch/mips/mti-malta/malta-time.c | 2 +- 9 files changed, 183 insertions(+), 12 deletions(-) create mode 100644 arch/mips/kernel/cevt-gic.c
arch/mips/Kconfig +4 -0
@@ -296,6 +296,7 @@ config MIPS_MALTA select BOOT_ELF32 select BOOT_RAW select CEVT_R4K + select CEVT_GIC select CSRC_R4K select CSRC_GIC select DMA_NONCOHERENT
@@ -911,6 +912,9 @@ config CEVT_GT641XX config CEVT_R4K bool +config CEVT_GIC + bool + config CEVT_SB1250 bool
arch/mips/include/asm/gic.h +10 -4
@@ -202,7 +202,7 @@#define GIC_VPE_WD_COUNT0_OFS 0x0094#define GIC_VPE_WD_INITIAL0_OFS 0x0098#define GIC_VPE_COMPARE_LO_OFS 0x00a0 -#define GIC_VPE_COMPARE_HI 0x00a4 +#define GIC_VPE_COMPARE_HI_OFS 0x00a4#define GIC_VPE_EIC_SHADOW_SET_BASE 0x0100#define GIC_VPE_EIC_SS (intr) \
@@ -359,27 +359,33 @@ struct gic_shared_intr_map {/* Mapped interrupt to pin X, then GIC will generate the vector (X+1). */ #define GIC_PIN_TO_VEC_OFFSET (1) +#include <linux/clocksource.h> +#include <linux/irq.h> +extern int gic_present;extern unsigned long _gic_base;extern unsigned int gic_irq_base;extern unsigned int gic_irq_flags[];extern struct gic_shared_intr_map gic_shared_intr_map[]; +extern unsigned int gic_frequency;extern void gic_init (unsigned long gic_base_addr,unsigned long gic_addrspace_size,struct gic_intr_map *intrmap,unsigned int intrmap_size,unsigned int irqbase); -extern void gic_clocksource_init (unsigned int ); -extern unsigned int gic_get_int (void ); +extern unsigned int gic_compare_int (void ); +extern cycle_t gic_read_count (void ); +extern cycle_t gic_read_compare (void ); +extern void gic_write_compare (cycle_t cnt);extern void gic_send_ipi (unsigned int intr);extern unsigned int plat_ipi_call_int_xlate (unsigned int );extern unsigned int plat_ipi_resched_int_xlate (unsigned int );extern void gic_bind_eic_interrupt (int irq,int set);extern unsigned int gic_get_timer_pending (void ); +extern unsigned int gic_get_int (void );extern void gic_enable_interrupt (int irq_vec);extern void gic_disable_interrupt (int irq_vec);extern void gic_irq_ack (struct irq_data *d);extern void gic_finish_irq (struct irq_data *d);extern void gic_platform_init (int irqs,struct irq_chip *irq_controller); -#endif /* _ASM_GICREGS_H */
arch/mips/include/asm/time.h +5 -0
@@ -52,6 +52,9 @@ extern int (*perf_irq)(void);*/ extern unsigned int __weak get_c0_compare_int (void );extern int r4k_clockevent_init (void ); +#ifdef CONFIG_CEVT_GIC +extern int gic_clockevent_init (void ); +#endif static inline int mips_clockevent_init (void ) {
@@ -59,6 +62,8 @@ static inline int mips_clockevent_init(void)extern int smtc_clockevent_init (void );return smtc_clockevent_init (); +#elif defined(CONFIG_CEVT_GIC ) +return (gic_clockevent_init () |r4k_clockevent_init ());#elif defined(CONFIG_CEVT_R4K )return r4k_clockevent_init ();#else
arch/mips/kernel/Makefile +1 -0
@@ -17,6 +17,7 @@ endif obj-$(CONFIG_CEVT_BCM1480) += cevt-bcm1480.o obj-$(CONFIG_CEVT_R4K) += cevt-r4k.o +obj-$(CONFIG_CEVT_GIC) += cevt-gic.o obj-$(CONFIG_MIPS_MT_SMTC) += cevt-smtc.o obj-$(CONFIG_CEVT_DS1287) += cevt-ds1287.o obj-$(CONFIG_CEVT_GT641XX) += cevt-gt641xx.o
arch/mips/kernel/cevt-gic.c new file +120 -0
120 lines not on this page · raw message
arch/mips/kernel/csrc-gic.c +24 -3
@@ -5,13 +5,12 @@* * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. */ -#include <linux/clocksource.h> #include <linux/init.h> +#include <linux/time.h> -#include <asm/time.h> #include <asm/gic.h> -static cycle_t gic_hpt_read (struct clocksource *cs) +cycle_t gic_read_count (void ) {unsigned int hi, hi2, lo;
@@ -24,6 +23,28 @@ static cycle_t gic_hpt_read(struct clocksource *cs)return (((cycle_t ) hi) <<32 ) + lo; } +void gic_write_compare (cycle_t cnt) +{ +GICWRITE (GIC_REG (VPE_LOCAL ,GIC_VPE_COMPARE_HI ), (int )(cnt >>32 )); +GICWRITE (GIC_REG (VPE_LOCAL ,GIC_VPE_COMPARE_LO ), + (int )(cnt &0xffffffff )); +} + +cycle_t gic_read_compare (void ) +{ +unsigned int hi, lo; + +GICREAD (GIC_REG (VPE_LOCAL ,GIC_VPE_COMPARE_HI ), hi); +GICREAD (GIC_REG (VPE_LOCAL ,GIC_VPE_COMPARE_LO ), lo); + +return (((cycle_t ) hi) <<32 ) + lo; +} + +static cycle_t gic_hpt_read (struct clocksource *cs) +{ +return (cycle_t )gic_read_count (); +} +static struct clocksource gic_clocksource = { .name ="GIC" , .read = gic_hpt_read,
arch/mips/kernel/irq-gic.c +11 -0
@@ -116,6 +116,17 @@ static void __init vpe_local_setup(unsigned int numvpes) } } +unsigned int gic_compare_int (void ) +{ +unsigned int pending; + +GICREAD (GIC_REG (VPE_LOCAL ,GIC_VPE_PEND ), pending); +if (pending &GIC_VPE_PEND_CMP_MSK ) +return 1 ; +else +return 0 ; +} +unsigned int gic_get_int (void ) {unsigned int i;
arch/mips/mti-malta/malta-int.c +7 -4
@@ -134,6 +134,9 @@ static void malta_ipi_irqdispatch(void) {int irq; +if (gic_compare_int ()) +do_IRQ (MIPS_GIC_IRQ_BASE ); + irq =gic_get_int ();if (irq <0 )return ;/* interrupt has already been cleared */
@@ -395,9 +398,9 @@ static int __initdata msc_nr_eicirqs = ARRAY_SIZE(msc_eicirqmap);#define X GIC_UNUSEDstatic struct gic_intr_map gic_intr_map[GIC_NUM_INTRS ] = { - {X ,X ,X ,X ,0 }, - {X ,X ,X ,X ,0 }, - {X ,X ,X ,X ,0 }, + {0 ,GIC_CPU_INT2 ,GIC_POL_POS ,GIC_TRIG_LEVEL ,GIC_FLAG_TRANSPARENT }, + {1 ,GIC_CPU_INT2 ,GIC_POL_POS ,GIC_TRIG_LEVEL ,GIC_FLAG_TRANSPARENT }, + {2 ,GIC_CPU_INT2 ,GIC_POL_POS ,GIC_TRIG_LEVEL ,GIC_FLAG_TRANSPARENT }, {0 ,GIC_CPU_INT0 ,GIC_POL_POS ,GIC_TRIG_LEVEL ,GIC_FLAG_TRANSPARENT }, {0 ,GIC_CPU_INT1 ,GIC_POL_POS ,GIC_TRIG_LEVEL ,GIC_FLAG_TRANSPARENT }, {0 ,GIC_CPU_INT2 ,GIC_POL_POS ,GIC_TRIG_LEVEL ,GIC_FLAG_TRANSPARENT },
@@ -405,7 +408,7 @@ static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = { { 0, GIC_CPU_INT4, GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT }, { 0, GIC_CPU_INT3, GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT }, { 0, GIC_CPU_INT3, GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT }, - { X, X, X, X, 0 }, + { 3, GIC_CPU_INT2, GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT }, { X, X, X, X, 0 }, { 0, GIC_CPU_INT3, GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT }, { 0, GIC_CPU_NMI, GIC_POL_POS, GIC_TRIG_LEVEL, GIC_FLAG_TRANSPARENT },
arch/mips/mti-malta/malta-time.c +1 -1
@@ -44,7 +44,7 @@#include <asm/mips-boards/maltaint.h> unsigned long cpu_khz; -int gic_frequency; +unsigned int gic_frequency;static int mips_cpu_timer_irq;static int mips_cpu_perf_irq;
Signature · 1 line
1.7.9.5