Commit 1e45e9a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer updates from Thomas Gleixner:
 "The timers departement more or less proudly presents:

   - More Y2038 timekeeping work mostly in the core code. The work is
     slowly, but steadily targeting the actuall syscalls.

   - Enhanced timekeeping suspend/resume support by utilizing
     clocksources which do not stop during suspend, but are otherwise
     not the main timekeeping clocksources.

   - Make NTP adjustmets more accurate and immediate when the frequency
     is set directly and not incrementally.

   - Sanitize the overrung handing of posix timers

   - A new timer driver for Mediatek SoCs

   - The usual pile of fixes and updates all over the place"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (32 commits)
  clockevents: Warn if cpu_all_mask is used as cpumask
  tick/broadcast-hrtimer: Use cpu_possible_mask for ce_broadcast_hrtimer
  clocksource/drivers/arm_arch_timer: Fix bogus cpu_all_mask usage
  clocksource: ti-32k: Remove CLOCK_SOURCE_SUSPEND_NONSTOP flag
  timers: Clear timer_base::must_forward_clk with timer_base::lock held
  clocksource/drivers/sprd: Register one always-on timer to compensate suspend time
  clocksource/drivers/timer-mediatek: Add support for system timer
  clocksource/drivers/timer-mediatek: Convert the driver to timer-of
  clocksource/drivers/timer-mediatek: Use specific prefix for GPT
  clocksource/drivers/timer-mediatek: Rename mtk_timer to timer-mediatek
  clocksource/drivers/timer-mediatek: Add system timer bindings
  clocksource/drivers: Set clockevent device cpumask to cpu_possible_mask
  time: Introduce one suspend clocksource to compensate the suspend time
  time: Fix extra sleeptime injection when suspend fails
  timekeeping/ntp: Constify some function arguments
  ntp: Use kstrtos64 for s64 variable
  ntp: Remove redundant arguments
  timer: Fix coding style
  ktime: Provide typesafe ktime_to_ns()
  hrtimer: Improve kernel message printing
  ...
parents 8603596a fbfa9260

Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt

+20 −14
Original line number Diff line number Diff line 
Mediatek MT6577, MT6572 and MT6589 Timers

---------------------------------------

Mediatek Timers

---------------



Mediatek SoCs have two different timers on different platforms,

- GPT (General Purpose Timer)

- SYST (System Timer)



The proper timer will be selected automatically by driver.



Required properties:

- compatible should contain:

	* "mediatek,mt2701-timer" for MT2701 compatible timers

	* "mediatek,mt6580-timer" for MT6580 compatible timers

	* "mediatek,mt6589-timer" for MT6589 compatible timers

	* "mediatek,mt7623-timer" for MT7623 compatible timers

	* "mediatek,mt8127-timer" for MT8127 compatible timers

	* "mediatek,mt8135-timer" for MT8135 compatible timers

	* "mediatek,mt8173-timer" for MT8173 compatible timers

	* "mediatek,mt6577-timer" for MT6577 and all above compatible timers

- reg: Should contain location and length for timers register.

- clocks: Clocks driving the timer hardware. This list should include two

	clocks. The order is system clock and as second clock the RTC clock.

	* "mediatek,mt2701-timer" for MT2701 compatible timers (GPT)

	* "mediatek,mt6580-timer" for MT6580 compatible timers (GPT)

	* "mediatek,mt6589-timer" for MT6589 compatible timers (GPT)

	* "mediatek,mt7623-timer" for MT7623 compatible timers (GPT)

	* "mediatek,mt8127-timer" for MT8127 compatible timers (GPT)

	* "mediatek,mt8135-timer" for MT8135 compatible timers (GPT)

	* "mediatek,mt8173-timer" for MT8173 compatible timers (GPT)

	* "mediatek,mt6577-timer" for MT6577 and all above compatible timers (GPT)

	* "mediatek,mt6765-timer" for MT6765 compatible timers (SYST)

- reg: Should contain location and length for timer register.

- clocks: Should contain system clock.



Examples:
@@ -21,5 +27,5 @@ Examples: 
		compatible = "mediatek,mt6577-timer";

		reg = <0x10008000 0x80>;

		interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_LOW>;

		clocks = <&system_clk>, <&rtc_clk>;

		clocks = <&system_clk>;

	};

drivers/clocksource/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ obj-$(CONFIG_CLKSRC_SAMSUNG_PWM) += samsung_pwm_timer.o 
obj-$(CONFIG_FSL_FTM_TIMER)	+= fsl_ftm_timer.o

obj-$(CONFIG_VF_PIT_TIMER)	+= vf_pit_timer.o

obj-$(CONFIG_CLKSRC_QCOM)	+= qcom-timer.o

obj-$(CONFIG_MTK_TIMER)		+= mtk_timer.o

obj-$(CONFIG_MTK_TIMER)		+= timer-mediatek.o

obj-$(CONFIG_CLKSRC_PISTACHIO)	+= time-pistachio.o

obj-$(CONFIG_CLKSRC_TI_32K)	+= timer-ti-32k.o

obj-$(CONFIG_CLKSRC_NPS)	+= timer-nps.o

drivers/clocksource/mtk_timer.c

deleted100644 → 0
+0 −268
Original line number Diff line number Diff line 
/*

 * Mediatek SoCs General-Purpose Timer handling.

 *

 * Copyright (C) 2014 Matthias Brugger

 *

 * Matthias Brugger <matthias.bgg@gmail.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt



#include <linux/clk.h>

#include <linux/clockchips.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/irqreturn.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/sched_clock.h>

#include <linux/slab.h>



#define GPT_IRQ_EN_REG		0x00

#define GPT_IRQ_ENABLE(val)	BIT((val) - 1)

#define GPT_IRQ_ACK_REG		0x08

#define GPT_IRQ_ACK(val)	BIT((val) - 1)



#define TIMER_CTRL_REG(val)	(0x10 * (val))

#define TIMER_CTRL_OP(val)	(((val) & 0x3) << 4)

#define TIMER_CTRL_OP_ONESHOT	(0)

#define TIMER_CTRL_OP_REPEAT	(1)

#define TIMER_CTRL_OP_FREERUN	(3)

#define TIMER_CTRL_CLEAR	(2)

#define TIMER_CTRL_ENABLE	(1)

#define TIMER_CTRL_DISABLE	(0)



#define TIMER_CLK_REG(val)	(0x04 + (0x10 * (val)))

#define TIMER_CLK_SRC(val)	(((val) & 0x1) << 4)

#define TIMER_CLK_SRC_SYS13M	(0)

#define TIMER_CLK_SRC_RTC32K	(1)

#define TIMER_CLK_DIV1		(0x0)

#define TIMER_CLK_DIV2		(0x1)



#define TIMER_CNT_REG(val)	(0x08 + (0x10 * (val)))

#define TIMER_CMP_REG(val)	(0x0C + (0x10 * (val)))



#define GPT_CLK_EVT	1

#define GPT_CLK_SRC	2



struct mtk_clock_event_device {

	void __iomem *gpt_base;

	u32 ticks_per_jiffy;

	struct clock_event_device dev;

};



static void __iomem *gpt_sched_reg __read_mostly;



static u64 notrace mtk_read_sched_clock(void)

{

	return readl_relaxed(gpt_sched_reg);

}



static inline struct mtk_clock_event_device *to_mtk_clk(

				struct clock_event_device *c)

{

	return container_of(c, struct mtk_clock_event_device, dev);

}



static void mtk_clkevt_time_stop(struct mtk_clock_event_device *evt, u8 timer)

{

	u32 val;



	val = readl(evt->gpt_base + TIMER_CTRL_REG(timer));

	writel(val & ~TIMER_CTRL_ENABLE, evt->gpt_base +

			TIMER_CTRL_REG(timer));

}



static void mtk_clkevt_time_setup(struct mtk_clock_event_device *evt,

				unsigned long delay, u8 timer)

{

	writel(delay, evt->gpt_base + TIMER_CMP_REG(timer));

}



static void mtk_clkevt_time_start(struct mtk_clock_event_device *evt,

		bool periodic, u8 timer)

{

	u32 val;



	/* Acknowledge interrupt */

	writel(GPT_IRQ_ACK(timer), evt->gpt_base + GPT_IRQ_ACK_REG);



	val = readl(evt->gpt_base + TIMER_CTRL_REG(timer));



	/* Clear 2 bit timer operation mode field */

	val &= ~TIMER_CTRL_OP(0x3);



	if (periodic)

		val |= TIMER_CTRL_OP(TIMER_CTRL_OP_REPEAT);

	else

		val |= TIMER_CTRL_OP(TIMER_CTRL_OP_ONESHOT);



	writel(val | TIMER_CTRL_ENABLE | TIMER_CTRL_CLEAR,

	       evt->gpt_base + TIMER_CTRL_REG(timer));

}



static int mtk_clkevt_shutdown(struct clock_event_device *clk)

{

	mtk_clkevt_time_stop(to_mtk_clk(clk), GPT_CLK_EVT);

	return 0;

}



static int mtk_clkevt_set_periodic(struct clock_event_device *clk)

{

	struct mtk_clock_event_device *evt = to_mtk_clk(clk);



	mtk_clkevt_time_stop(evt, GPT_CLK_EVT);

	mtk_clkevt_time_setup(evt, evt->ticks_per_jiffy, GPT_CLK_EVT);

	mtk_clkevt_time_start(evt, true, GPT_CLK_EVT);

	return 0;

}



static int mtk_clkevt_next_event(unsigned long event,

				   struct clock_event_device *clk)

{

	struct mtk_clock_event_device *evt = to_mtk_clk(clk);



	mtk_clkevt_time_stop(evt, GPT_CLK_EVT);

	mtk_clkevt_time_setup(evt, event, GPT_CLK_EVT);

	mtk_clkevt_time_start(evt, false, GPT_CLK_EVT);



	return 0;

}



static irqreturn_t mtk_timer_interrupt(int irq, void *dev_id)

{

	struct mtk_clock_event_device *evt = dev_id;



	/* Acknowledge timer0 irq */

	writel(GPT_IRQ_ACK(GPT_CLK_EVT), evt->gpt_base + GPT_IRQ_ACK_REG);

	evt->dev.event_handler(&evt->dev);



	return IRQ_HANDLED;

}



static void

__init mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)

{

	writel(TIMER_CTRL_CLEAR | TIMER_CTRL_DISABLE,

		evt->gpt_base + TIMER_CTRL_REG(timer));



	writel(TIMER_CLK_SRC(TIMER_CLK_SRC_SYS13M) | TIMER_CLK_DIV1,

			evt->gpt_base + TIMER_CLK_REG(timer));



	writel(0x0, evt->gpt_base + TIMER_CMP_REG(timer));



	writel(TIMER_CTRL_OP(option) | TIMER_CTRL_ENABLE,

			evt->gpt_base + TIMER_CTRL_REG(timer));

}



static void mtk_timer_enable_irq(struct mtk_clock_event_device *evt, u8 timer)

{

	u32 val;



	/* Disable all interrupts */

	writel(0x0, evt->gpt_base + GPT_IRQ_EN_REG);



	/* Acknowledge all spurious pending interrupts */

	writel(0x3f, evt->gpt_base + GPT_IRQ_ACK_REG);



	val = readl(evt->gpt_base + GPT_IRQ_EN_REG);

	writel(val | GPT_IRQ_ENABLE(timer),

			evt->gpt_base + GPT_IRQ_EN_REG);

}



static int __init mtk_timer_init(struct device_node *node)

{

	struct mtk_clock_event_device *evt;

	struct resource res;

	unsigned long rate = 0;

	struct clk *clk;



	evt = kzalloc(sizeof(*evt), GFP_KERNEL);

	if (!evt)

		return -ENOMEM;



	evt->dev.name = "mtk_tick";

	evt->dev.rating = 300;

	evt->dev.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;

	evt->dev.set_state_shutdown = mtk_clkevt_shutdown;

	evt->dev.set_state_periodic = mtk_clkevt_set_periodic;

	evt->dev.set_state_oneshot = mtk_clkevt_shutdown;

	evt->dev.tick_resume = mtk_clkevt_shutdown;

	evt->dev.set_next_event = mtk_clkevt_next_event;

	evt->dev.cpumask = cpu_possible_mask;



	evt->gpt_base = of_io_request_and_map(node, 0, "mtk-timer");

	if (IS_ERR(evt->gpt_base)) {

		pr_err("Can't get resource\n");

		goto err_kzalloc;

	}



	evt->dev.irq = irq_of_parse_and_map(node, 0);

	if (evt->dev.irq <= 0) {

		pr_err("Can't parse IRQ\n");

		goto err_mem;

	}



	clk = of_clk_get(node, 0);

	if (IS_ERR(clk)) {

		pr_err("Can't get timer clock\n");

		goto err_irq;

	}



	if (clk_prepare_enable(clk)) {

		pr_err("Can't prepare clock\n");

		goto err_clk_put;

	}

	rate = clk_get_rate(clk);



	if (request_irq(evt->dev.irq, mtk_timer_interrupt,

			IRQF_TIMER | IRQF_IRQPOLL, "mtk_timer", evt)) {

		pr_err("failed to setup irq %d\n", evt->dev.irq);

		goto err_clk_disable;

	}



	evt->ticks_per_jiffy = DIV_ROUND_UP(rate, HZ);



	/* Configure clock source */

	mtk_timer_setup(evt, GPT_CLK_SRC, TIMER_CTRL_OP_FREERUN);

	clocksource_mmio_init(evt->gpt_base + TIMER_CNT_REG(GPT_CLK_SRC),

			node->name, rate, 300, 32, clocksource_mmio_readl_up);

	gpt_sched_reg = evt->gpt_base + TIMER_CNT_REG(GPT_CLK_SRC);

	sched_clock_register(mtk_read_sched_clock, 32, rate);



	/* Configure clock event */

	mtk_timer_setup(evt, GPT_CLK_EVT, TIMER_CTRL_OP_REPEAT);

	clockevents_config_and_register(&evt->dev, rate, 0x3,

					0xffffffff);



	mtk_timer_enable_irq(evt, GPT_CLK_EVT);



	return 0;



err_clk_disable:

	clk_disable_unprepare(clk);

err_clk_put:

	clk_put(clk);

err_irq:

	irq_dispose_mapping(evt->dev.irq);

err_mem:

	iounmap(evt->gpt_base);

	of_address_to_resource(node, 0, &res);

	release_mem_region(res.start, resource_size(&res));

err_kzalloc:

	kfree(evt);



	return -EINVAL;

}

TIMER_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init);

drivers/clocksource/tegra20_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int __init tegra20_init_timer(struct device_node *np) 
		return ret;

	}



	tegra_clockevent.cpumask = cpu_all_mask;

	tegra_clockevent.cpumask = cpu_possible_mask;

	tegra_clockevent.irq = tegra_timer_irq.irq;

	clockevents_config_and_register(&tegra_clockevent, 1000000,

					0x1, 0x1fffffff);

drivers/clocksource/timer-atcpit100.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static struct timer_of to = { 
		.set_state_oneshot = atcpit100_clkevt_set_oneshot,

		.tick_resume = atcpit100_clkevt_shutdown,

		.set_next_event = atcpit100_clkevt_next_event,

		.cpumask = cpu_all_mask,

		.cpumask = cpu_possible_mask,

	},



	.of_irq = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE