nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

clocksource: mips-gic-timer: Use new GIC accessor functions

Browse source 
Switch from calling functions exported by the GIC interrupt controller
to using new accessors provided by asm/mips-gic.h. This will allow the
counter-handling functionality to be removed from the interrupt
controller driver, where it doesn't really belong, and also allow for
inlining of the accesses to the GIC.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17021/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Paul Burton 2017-08-12 21:36:11 -07:00 committed by Ralf Baechle
parent 582e2b4aec
commit e07127a077
1 changed files with 31 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/clocksource/mips-gic-timer.c
View file

@ -10,25 +10,45 @@
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/time.h> #include <linux/time.h>
#include <asm/mips-cps.h>
static DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device); static DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device);
static int gic_timer_irq; static int gic_timer_irq;
static unsigned int gic_frequency; static unsigned int gic_frequency;
static u64 notrace gic_read_count(void)
{
unsigned int hi, hi2, lo;
if (mips_cm_is64)
return read_gic_counter();
do {
hi = read_gic_counter_32h();
lo = read_gic_counter_32l();
hi2 = read_gic_counter_32h();
} while (hi2 != hi);
return (((u64) hi) << 32) + lo;
}
static int gic_next_event(unsigned long delta, struct clock_event_device *evt) static int gic_next_event(unsigned long delta, struct clock_event_device *evt)
{ {
unsigned long flags;
u64 cnt; u64 cnt;
int res; int res;
cnt = gic_read_count(); cnt = gic_read_count();
cnt += (u64)delta; cnt += (u64)delta;
gic_write_cpu_compare(cnt, cpumask_first(evt->cpumask)); local_irq_save(flags);
write_gic_vl_other(mips_cm_vp_id(cpumask_first(evt->cpumask)));
write_gic_vo_compare(cnt);
local_irq_restore(flags);
res = ((int)(gic_read_count() - cnt) >= 0) ? -ETIME : 0; res = ((int)(gic_read_count() - cnt) >= 0) ? -ETIME : 0;
return res; return res;
} }
@ -37,7 +57,7 @@ static irqreturn_t gic_compare_interrupt(int irq, void *dev_id)
{ {
struct clock_event_device *cd = dev_id; struct clock_event_device *cd = dev_id;
gic_write_compare(gic_read_compare()); write_gic_vl_compare(read_gic_vl_compare());
cd->event_handler(cd); cd->event_handler(cd);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -139,10 +159,15 @@ static struct clocksource gic_clocksource = {
static int __init __gic_clocksource_init(void) static int __init __gic_clocksource_init(void)
{ {
unsigned int count_width;
int ret; int ret;
/* Set clocksource mask. */ /* Set clocksource mask. */
gic_clocksource.mask = CLOCKSOURCE_MASK(gic_get_count_width()); count_width = read_gic_config() & GIC_CONFIG_COUNTBITS;
count_width >>= __fls(GIC_CONFIG_COUNTBITS);
count_width *= 4;
count_width += 32;
gic_clocksource.mask = CLOCKSOURCE_MASK(count_width);
/* Calculate a somewhat reasonable rating value. */ /* Calculate a somewhat reasonable rating value. */
gic_clocksource.rating = 200 + gic_frequency / 10000000; gic_clocksource.rating = 200 + gic_frequency / 10000000;
@ -159,7 +184,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
struct clk *clk; struct clk *clk;
int ret; int ret;
if (!gic_present || !node->parent || if (!mips_gic_present() || !node->parent ||
!of_device_is_compatible(node->parent, "mti,gic")) { !of_device_is_compatible(node->parent, "mti,gic")) {
pr_warn("No DT definition for the mips gic driver\n"); pr_warn("No DT definition for the mips gic driver\n");
return -ENXIO; return -ENXIO;
@ -197,7 +222,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
} }
/* And finally start the counter */ /* And finally start the counter */
gic_start_count(); clear_gic_config(GIC_CONFIG_COUNTSTOP);
return 0; return 0;
} }