mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 15:30:54 +07:00
be5769e206
In commit:d8152bf85d
("clocksource/drivers/mips-gic-timer: Convert init function to return error") several return values were added to a void function resulting in the following warnings: clocksource/mips-gic-timer.c: In function 'gic_clocksource_of_init': clocksource/mips-gic-timer.c:175:3: warning: 'return' with a value, in function returning void [enabled by default] clocksource/mips-gic-timer.c:183:4: warning: 'return' with a value, in function returning void [enabled by default] clocksource/mips-gic-timer.c:190:3: warning: 'return' with a value, in function returning void [enabled by default] clocksource/mips-gic-timer.c:195:3: warning: 'return' with a value, in function returning void [enabled by default] clocksource/mips-gic-timer.c:200:3: warning: 'return' with a value, in function returning void [enabled by default] clocksource/mips-gic-timer.c:211:2: warning: 'return' with a value, in function returning void [enabled by default] clocksource/mips-gic-timer.c: At top level: clocksource/mips-gic-timer.c:213:1: warning: comparison of distinct pointer types lacks a cast [enabled by default] clocksource/mips-gic-timer.c: In function 'gic_clocksource_of_init': clocksource/mips-gic-timer.c:183:18: warning: ignoring return value of 'PTR_ERR', declared with attribute warn_unused_result [-Wunused-result] Given that the addition of the return values was intentional, it seems that the conversion of the containing function from void to int was simply overlooked. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-mips@linux-mips.org Fixes:d8152bf85d
("clocksource/drivers/mips-gic-timer: Convert init function to return error") Link: http://lkml.kernel.org/r/1471429296-9053-3-git-send-email-daniel.lezcano@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
215 lines
5.0 KiB
C
215 lines
5.0 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved.
|
|
*/
|
|
#include <linux/clk.h>
|
|
#include <linux/clockchips.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/irqchip/mips-gic.h>
|
|
#include <linux/notifier.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/percpu.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/time.h>
|
|
|
|
static DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device);
|
|
static int gic_timer_irq;
|
|
static unsigned int gic_frequency;
|
|
|
|
static int gic_next_event(unsigned long delta, struct clock_event_device *evt)
|
|
{
|
|
u64 cnt;
|
|
int res;
|
|
|
|
cnt = gic_read_count();
|
|
cnt += (u64)delta;
|
|
gic_write_cpu_compare(cnt, cpumask_first(evt->cpumask));
|
|
res = ((int)(gic_read_count() - cnt) >= 0) ? -ETIME : 0;
|
|
return res;
|
|
}
|
|
|
|
static irqreturn_t gic_compare_interrupt(int irq, void *dev_id)
|
|
{
|
|
struct clock_event_device *cd = dev_id;
|
|
|
|
gic_write_compare(gic_read_compare());
|
|
cd->event_handler(cd);
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
struct irqaction gic_compare_irqaction = {
|
|
.handler = gic_compare_interrupt,
|
|
.percpu_dev_id = &gic_clockevent_device,
|
|
.flags = IRQF_PERCPU | IRQF_TIMER,
|
|
.name = "timer",
|
|
};
|
|
|
|
static void gic_clockevent_cpu_init(unsigned int cpu,
|
|
struct clock_event_device *cd)
|
|
{
|
|
cd->name = "MIPS GIC";
|
|
cd->features = CLOCK_EVT_FEAT_ONESHOT |
|
|
CLOCK_EVT_FEAT_C3STOP;
|
|
|
|
cd->rating = 350;
|
|
cd->irq = gic_timer_irq;
|
|
cd->cpumask = cpumask_of(cpu);
|
|
cd->set_next_event = gic_next_event;
|
|
|
|
clockevents_config_and_register(cd, gic_frequency, 0x300, 0x7fffffff);
|
|
|
|
enable_percpu_irq(gic_timer_irq, IRQ_TYPE_NONE);
|
|
}
|
|
|
|
static void gic_clockevent_cpu_exit(struct clock_event_device *cd)
|
|
{
|
|
disable_percpu_irq(gic_timer_irq);
|
|
}
|
|
|
|
static void gic_update_frequency(void *data)
|
|
{
|
|
unsigned long rate = (unsigned long)data;
|
|
|
|
clockevents_update_freq(this_cpu_ptr(&gic_clockevent_device), rate);
|
|
}
|
|
|
|
static int gic_starting_cpu(unsigned int cpu)
|
|
{
|
|
gic_clockevent_cpu_init(cpu, this_cpu_ptr(&gic_clockevent_device));
|
|
return 0;
|
|
}
|
|
|
|
static int gic_clk_notifier(struct notifier_block *nb, unsigned long action,
|
|
void *data)
|
|
{
|
|
struct clk_notifier_data *cnd = data;
|
|
|
|
if (action == POST_RATE_CHANGE)
|
|
on_each_cpu(gic_update_frequency, (void *)cnd->new_rate, 1);
|
|
|
|
return NOTIFY_OK;
|
|
}
|
|
|
|
static int gic_dying_cpu(unsigned int cpu)
|
|
{
|
|
gic_clockevent_cpu_exit(this_cpu_ptr(&gic_clockevent_device));
|
|
return 0;
|
|
}
|
|
|
|
static struct notifier_block gic_clk_nb = {
|
|
.notifier_call = gic_clk_notifier,
|
|
};
|
|
|
|
static int gic_clockevent_init(void)
|
|
{
|
|
int ret;
|
|
|
|
if (!cpu_has_counter || !gic_frequency)
|
|
return -ENXIO;
|
|
|
|
ret = setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
cpuhp_setup_state(CPUHP_AP_MIPS_GIC_TIMER_STARTING,
|
|
"AP_MIPS_GIC_TIMER_STARTING", gic_starting_cpu,
|
|
gic_dying_cpu);
|
|
return 0;
|
|
}
|
|
|
|
static cycle_t gic_hpt_read(struct clocksource *cs)
|
|
{
|
|
return gic_read_count();
|
|
}
|
|
|
|
static struct clocksource gic_clocksource = {
|
|
.name = "GIC",
|
|
.read = gic_hpt_read,
|
|
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
|
|
.archdata = { .vdso_clock_mode = VDSO_CLOCK_GIC },
|
|
};
|
|
|
|
static int __init __gic_clocksource_init(void)
|
|
{
|
|
int ret;
|
|
|
|
/* Set clocksource mask. */
|
|
gic_clocksource.mask = CLOCKSOURCE_MASK(gic_get_count_width());
|
|
|
|
/* Calculate a somewhat reasonable rating value. */
|
|
gic_clocksource.rating = 200 + gic_frequency / 10000000;
|
|
|
|
ret = clocksource_register_hz(&gic_clocksource, gic_frequency);
|
|
if (ret < 0)
|
|
pr_warn("GIC: Unable to register clocksource\n");
|
|
|
|
return ret;
|
|
}
|
|
|
|
void __init gic_clocksource_init(unsigned int frequency)
|
|
{
|
|
gic_frequency = frequency;
|
|
gic_timer_irq = MIPS_GIC_IRQ_BASE +
|
|
GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_COMPARE);
|
|
|
|
__gic_clocksource_init();
|
|
gic_clockevent_init();
|
|
|
|
/* And finally start the counter */
|
|
gic_start_count();
|
|
}
|
|
|
|
static int __init gic_clocksource_of_init(struct device_node *node)
|
|
{
|
|
struct clk *clk;
|
|
int ret;
|
|
|
|
if (!gic_present || !node->parent ||
|
|
!of_device_is_compatible(node->parent, "mti,gic")) {
|
|
pr_warn("No DT definition for the mips gic driver");
|
|
return -ENXIO;
|
|
}
|
|
|
|
clk = of_clk_get(node, 0);
|
|
if (!IS_ERR(clk)) {
|
|
if (clk_prepare_enable(clk) < 0) {
|
|
pr_err("GIC failed to enable clock\n");
|
|
clk_put(clk);
|
|
return PTR_ERR(clk);
|
|
}
|
|
|
|
gic_frequency = clk_get_rate(clk);
|
|
} else if (of_property_read_u32(node, "clock-frequency",
|
|
&gic_frequency)) {
|
|
pr_err("GIC frequency not specified.\n");
|
|
return -EINVAL;;
|
|
}
|
|
gic_timer_irq = irq_of_parse_and_map(node, 0);
|
|
if (!gic_timer_irq) {
|
|
pr_err("GIC timer IRQ not specified.\n");
|
|
return -EINVAL;;
|
|
}
|
|
|
|
ret = __gic_clocksource_init();
|
|
if (ret)
|
|
return ret;
|
|
|
|
ret = gic_clockevent_init();
|
|
if (!ret && !IS_ERR(clk)) {
|
|
if (clk_notifier_register(clk, &gic_clk_nb) < 0)
|
|
pr_warn("GIC: Unable to register clock notifier\n");
|
|
}
|
|
|
|
/* And finally start the counter */
|
|
gic_start_count();
|
|
|
|
return 0;
|
|
}
|
|
CLOCKSOURCE_OF_DECLARE(mips_gic_timer, "mti,gic-timer",
|
|
gic_clocksource_of_init);
|