Commit ba25f057 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-urgent-2020-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer updates from Thomas Gleixner:
 "A set of clocksource/clockevents updates:

   - Reset the TI/DM timer before enabling it instead of doing it the
     other way round.

   - Initialize the reload value for the GX6605s timer correctly so the
     hardware counter starts at 0 again after overrun.

   - Make error return value negative in the h8300 timer init function"

* tag 'timers-urgent-2020-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/timer-gx6605s: Fixup counter reload
  clocksource/drivers/timer-ti-dm: Do reset before enable
  clocksource/drivers/h8300_timer8: Fix wrong return value in h8300_8timer_init()
parents d042035e a7b6c0fe

drivers/clocksource/h8300_timer8.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int __init h8300_8timer_init(struct device_node *node) 
		return PTR_ERR(clk);

	}



	ret = ENXIO;

	ret = -ENXIO;

	base = of_iomap(node, 0);

	if (!base) {

		pr_err("failed to map registers for clockevent\n");

drivers/clocksource/timer-gx6605s.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ static irqreturn_t gx6605s_timer_interrupt(int irq, void *dev) 
	void __iomem *base = timer_of_base(to_timer_of(ce));



	writel_relaxed(GX6605S_STATUS_CLR, base + TIMER_STATUS);

	writel_relaxed(0, base + TIMER_INI);



	ce->event_handler(ce);

drivers/clocksource/timer-ti-dm-systimer.c

+23 −21
Original line number Diff line number Diff line
@@ -69,12 +69,33 @@ static bool dmtimer_systimer_revision1(struct dmtimer_systimer *t) 
	return !(tidr >> 16);

}



static void dmtimer_systimer_enable(struct dmtimer_systimer *t)

{

	u32 val;



	if (dmtimer_systimer_revision1(t))

		val = DMTIMER_TYPE1_ENABLE;

	else

		val = DMTIMER_TYPE2_ENABLE;



	writel_relaxed(val, t->base + t->sysc);

}



static void dmtimer_systimer_disable(struct dmtimer_systimer *t)

{

	if (!dmtimer_systimer_revision1(t))

		return;



	writel_relaxed(DMTIMER_TYPE1_DISABLE, t->base + t->sysc);

}



static int __init dmtimer_systimer_type1_reset(struct dmtimer_systimer *t)

{

	void __iomem *syss = t->base + OMAP_TIMER_V1_SYS_STAT_OFFSET;

	int ret;

	u32 l;



	dmtimer_systimer_enable(t);

	writel_relaxed(BIT(1) | BIT(2), t->base + t->ifctrl);

	ret = readl_poll_timeout_atomic(syss, l, l & BIT(0), 100,

					DMTIMER_RESET_WAIT);
@@ -88,6 +109,7 @@ static int __init dmtimer_systimer_type2_reset(struct dmtimer_systimer *t) 
	void __iomem *sysc = t->base + t->sysc;

	u32 l;



	dmtimer_systimer_enable(t);

	l = readl_relaxed(sysc);

	l |= BIT(0);

	writel_relaxed(l, sysc);
@@ -336,26 +358,6 @@ static int __init dmtimer_systimer_init_clock(struct dmtimer_systimer *t, 
	return 0;

}



static void dmtimer_systimer_enable(struct dmtimer_systimer *t)

{

	u32 val;



	if (dmtimer_systimer_revision1(t))

		val = DMTIMER_TYPE1_ENABLE;

	else

		val = DMTIMER_TYPE2_ENABLE;



	writel_relaxed(val, t->base + t->sysc);

}



static void dmtimer_systimer_disable(struct dmtimer_systimer *t)

{

	if (!dmtimer_systimer_revision1(t))

		return;



	writel_relaxed(DMTIMER_TYPE1_DISABLE, t->base + t->sysc);

}



static int __init dmtimer_systimer_setup(struct device_node *np,

					 struct dmtimer_systimer *t)

{
@@ -409,8 +411,8 @@ static int __init dmtimer_systimer_setup(struct device_node *np, 
	t->wakeup = regbase + _OMAP_TIMER_WAKEUP_EN_OFFSET;

	t->ifctrl = regbase + _OMAP_TIMER_IF_CTRL_OFFSET;



	dmtimer_systimer_enable(t);

	dmtimer_systimer_reset(t);

	dmtimer_systimer_enable(t);

	pr_debug("dmtimer rev %08x sysc %08x\n", readl_relaxed(t->base),

		 readl_relaxed(t->base + t->sysc));

CRA Git | Maintained and supported by SUSTech CRA and CCSE