timer: Add MPC83xx timer driver

Add a timer driver for the MPC83xx architecture.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
lime2-spi
Mario Six 6 years ago committed by Simon Glass
parent d259f975d4
commit 2c21749d71
  1. 21
      Documentation/devicetree/bindings/timer/fsl,mpc83xx-timer.txt
  2. 1
      MAINTAINERS
  3. 4
      arch/powerpc/cpu/mpc83xx/cpu.c
  4. 4
      arch/powerpc/lib/Makefile
  5. 5
      arch/powerpc/lib/interrupts.c
  6. 7
      drivers/timer/Kconfig
  7. 1
      drivers/timer/Makefile
  8. 249
      drivers/timer/mpc83xx_timer.c

@ -0,0 +1,21 @@
MPC83xx timer devices
MPC83xx SoCs offer a decrementer interrupt that can be used to implement delay
functionality, and periodically triggered actions.
Required properties:
- compatible: must be "fsl,mpc83xx-timer"
- clocks: must be a reference to the system's CSB (coherent system bus) clock,
provided by one of the "fsl,mpc83xx-clk" devices
Example:
socclocks: clocks {
compatible = "fsl,mpc832x-clk";
#clock-cells = <1>;
};
timer {
compatible = "fsl,mpc83xx-timer";
clocks = <&socclocks MPC83XX_CLK_CSB>;
};

@ -526,6 +526,7 @@ F: drivers/sysreset/sysreset_mpc83xx.h
F: drivers/clk/mpc83xx_clk.c F: drivers/clk/mpc83xx_clk.c
F: drivers/clk/mpc83xx_clk.h F: drivers/clk/mpc83xx_clk.h
F: include/dt-bindings/clk/mpc83xx-clk.h F: include/dt-bindings/clk/mpc83xx-clk.h
F: drivers/timer/mpc83xx_timer.c
F: arch/powerpc/cpu/mpc83xx/ F: arch/powerpc/cpu/mpc83xx/
F: arch/powerpc/include/asm/arch-mpc83xx/ F: arch/powerpc/include/asm/arch-mpc83xx/

@ -175,12 +175,12 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
/* /*
* Get timebase clock frequency (like cpu_clk in Hz) * Get timebase clock frequency (like cpu_clk in Hz)
*/ */
#ifndef CONFIG_TIMER
unsigned long get_tbclk(void) unsigned long get_tbclk(void)
{ {
return (gd->bus_clk + 3L) / 4L; return (gd->bus_clk + 3L) / 4L;
} }
#endif
#if defined(CONFIG_WATCHDOG) #if defined(CONFIG_WATCHDOG)
void watchdog_reset (void) void watchdog_reset (void)

@ -17,13 +17,17 @@ endif
ifdef MINIMAL ifdef MINIMAL
obj-y += cache.o time.o obj-y += cache.o time.o
ifndef CONFIG_TIMER
obj-y += ticks.o obj-y += ticks.o
endif
else else
obj-y += ppcstring.o obj-y += ppcstring.o
obj-y += ppccache.o obj-y += ppccache.o
ifndef CONFIG_TIMER
obj-y += ticks.o obj-y += ticks.o
endif
obj-y += reloc.o obj-y += reloc.o
obj-$(CONFIG_BAT_RW) += bat_rw.o obj-$(CONFIG_BAT_RW) += bat_rw.o

@ -14,6 +14,7 @@
#include <status_led.h> #include <status_led.h>
#endif #endif
#ifndef CONFIG_MPC83XX_TIMER
#ifdef CONFIG_SHOW_ACTIVITY #ifdef CONFIG_SHOW_ACTIVITY
void board_show_activity (ulong) __attribute__((weak, alias("__board_show_activity"))); void board_show_activity (ulong) __attribute__((weak, alias("__board_show_activity")));
@ -44,7 +45,7 @@ static __inline__ void set_dec (unsigned long val)
if (val) if (val)
asm volatile ("mtdec %0"::"r" (val)); asm volatile ("mtdec %0"::"r" (val));
} }
#endif /* !CONFIG_MPC83XX_TIMER */
void enable_interrupts (void) void enable_interrupts (void)
{ {
@ -60,6 +61,7 @@ int disable_interrupts (void)
return ((msr & MSR_EE) != 0); return ((msr & MSR_EE) != 0);
} }
#ifndef CONFIG_MPC83XX_TIMER
int interrupt_init (void) int interrupt_init (void)
{ {
/* call cpu specific function from $(CPU)/interrupts.c */ /* call cpu specific function from $(CPU)/interrupts.c */
@ -102,3 +104,4 @@ ulong get_timer (ulong base)
{ {
return (timestamp - base); return (timestamp - base);
} }
#endif /* !CONFIG_MPC83XX_TIMER */

@ -140,4 +140,11 @@ config STM32_TIMER
Select this to enable support for the timer found on Select this to enable support for the timer found on
STM32 devices. STM32 devices.
config MPC83XX_TIMER
bool "MPC83xx timer support"
depends on TIMER
help
Select this to enable support for the timer found on
devices based on the MPC83xx family of SoCs.
endmenu endmenu

@ -11,6 +11,7 @@ obj-$(CONFIG_ATCPIT100_TIMER) += atcpit100_timer.o
obj-$(CONFIG_ATMEL_PIT_TIMER) += atmel_pit_timer.o obj-$(CONFIG_ATMEL_PIT_TIMER) += atmel_pit_timer.o
obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence-ttc.o obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence-ttc.o
obj-$(CONFIG_DESIGNWARE_APB_TIMER) += dw-apb-timer.o obj-$(CONFIG_DESIGNWARE_APB_TIMER) += dw-apb-timer.o
obj-$(CONFIG_MPC83XX_TIMER) += mpc83xx_timer.o
obj-$(CONFIG_OMAP_TIMER) += omap-timer.o obj-$(CONFIG_OMAP_TIMER) += omap-timer.o
obj-$(CONFIG_ROCKCHIP_TIMER) += rockchip_timer.o obj-$(CONFIG_ROCKCHIP_TIMER) += rockchip_timer.o
obj-$(CONFIG_SANDBOX_TIMER) += sandbox_timer.o obj-$(CONFIG_SANDBOX_TIMER) += sandbox_timer.o

@ -0,0 +1,249 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2018
* Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
*/
#include <common.h>
#include <board.h>
#include <clk.h>
#include <dm.h>
#include <timer.h>
#include <watchdog.h>
DECLARE_GLOBAL_DATA_PTR;
/**
* struct mpc83xx_timer_priv - Private data structure for MPC83xx timer driver
* @decrementer_count: Value to which the decrementer register should be re-set
* to when a timer interrupt occurs, thus determines the
* interrupt frequency (value for 1e6/HZ microseconds)
* @timestamp: Counter for the number of timer interrupts that have
* occurred (i.e. can be used to trigger events
* periodically in the timer interrupt)
*/
struct mpc83xx_timer_priv {
uint decrementer_count;
ulong timestamp;
};
/*
* Bitmask for enabling the time base in the SPCR (System Priority
* Configuration Register)
*/
static const u32 SPCR_TBEN_MASK = BIT(31 - 9);
/**
* get_dec() - Get the value of the decrementer register
*
* Return: The value of the decrementer register
*/
static inline unsigned long get_dec(void)
{
unsigned long val;
asm volatile ("mfdec %0" : "=r" (val) : );
return val;
}
/**
* set_dec() - Set the value of the decrementer register
* @val: The value of the decrementer register to be set
*/
static inline void set_dec(unsigned long val)
{
if (val)
asm volatile ("mtdec %0"::"r" (val));
}
/**
* mftbu() - Get value of TBU (upper time base) register
*
* Return: Value of the TBU register
*/
static inline u32 mftbu(void)
{
u32 rval;
asm volatile("mftbu %0" : "=r" (rval));
return rval;
}
/**
* mftb() - Get value of TBL (lower time base) register
*
* Return: Value of the TBL register
*/
static inline u32 mftb(void)
{
u32 rval;
asm volatile("mftb %0" : "=r" (rval));
return rval;
}
/*
* TODO(mario.six@gdsys.cc): This should really be done by timer_init, and the
* interrupt init should go into a interrupt driver.
*/
int interrupt_init(void)
{
immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
struct udevice *csb;
struct udevice *board;
struct udevice *timer;
struct mpc83xx_timer_priv *timer_priv;
struct clk clock;
int ret;
ret = uclass_first_device_err(UCLASS_TIMER, &timer);
if (ret) {
debug("%s: Could not find timer device (error: %d)",
__func__, ret);
return ret;
}
timer_priv = dev_get_priv(timer);
if (board_get(&board)) {
debug("%s: board device could not be fetched.\n", __func__);
return -ENOENT;
}
ret = uclass_get_device_by_phandle(UCLASS_SIMPLE_BUS, board,
"csb", &csb);
if (ret) {
debug("%s: Could not retrieve CSB device (error: %d)",
__func__, ret);
return ret;
}
ret = clk_get_by_index(csb, 0, &clock);
if (ret) {
debug("%s: Could not retrieve clock (error: %d)",
__func__, ret);
return ret;
}
timer_priv->decrementer_count = (clk_get_rate(&clock) / 4)
/ CONFIG_SYS_HZ;
/* Enable e300 time base */
setbits_be32(&immr->sysconf.spcr, SPCR_TBEN_MASK);
set_dec(timer_priv->decrementer_count);
/* Switch on interrupts */
set_msr(get_msr() | MSR_EE);
return 0;
}
/**
* timer_interrupt() - Handler for the timer interrupt
* @regs: Array of register values
*/
void timer_interrupt(struct pt_regs *regs)
{
struct udevice *timer = gd->timer;
struct mpc83xx_timer_priv *priv;
/*
* During initialization, gd->timer might not be set yet, but the timer
* interrupt may already be enabled. In this case, wait for the
* initialization to complete
*/
if (!timer)
return;
priv = dev_get_priv(timer);
/* Restore Decrementer Count */
set_dec(priv->decrementer_count);
priv->timestamp++;
#if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
if ((timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0)
WATCHDOG_RESET();
#endif /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
#ifdef CONFIG_LED_STATUS
status_led_tick(priv->timestamp);
#endif /* CONFIG_LED_STATUS */
#ifdef CONFIG_SHOW_ACTIVITY
board_show_activity(priv->timestamp);
#endif /* CONFIG_SHOW_ACTIVITY */
}
void wait_ticks(ulong ticks)
{
ulong end = get_ticks() + ticks;
while (end > get_ticks())
WATCHDOG_RESET();
}
static int mpc83xx_timer_get_count(struct udevice *dev, u64 *count)
{
u32 tbu, tbl;
/*
* To make sure that no tbl overflow occurred between reading tbl and
* tbu, read tbu again, and compare it with the previously read tbu
* value: If they're different, a tbl overflow has occurred.
*/
do {
tbu = mftbu();
tbl = mftb();
} while (tbu != mftbu());
*count = (tbu * 0x10000ULL) + tbl;
return 0;
}
static int mpc83xx_timer_probe(struct udevice *dev)
{
struct timer_dev_priv *uc_priv = dev->uclass_priv;
struct clk clock;
int ret;
ret = interrupt_init();
if (ret) {
debug("%s: interrupt_init failed (err = %d)\n",
dev->name, ret);
return ret;
}
ret = clk_get_by_index(dev, 0, &clock);
if (ret) {
debug("%s: Could not retrieve clock (err = %d)\n",
dev->name, ret);
return ret;
}
uc_priv->clock_rate = (clk_get_rate(&clock) + 3L) / 4L;
return 0;
}
static const struct timer_ops mpc83xx_timer_ops = {
.get_count = mpc83xx_timer_get_count,
};
static const struct udevice_id mpc83xx_timer_ids[] = {
{ .compatible = "fsl,mpc83xx-timer" },
{ /* sentinel */ }
};
U_BOOT_DRIVER(mpc83xx_timer) = {
.name = "mpc83xx_timer",
.id = UCLASS_TIMER,
.of_match = mpc83xx_timer_ids,
.probe = mpc83xx_timer_probe,
.ops = &mpc83xx_timer_ops,
.flags = DM_FLAG_PRE_RELOC,
.priv_auto_alloc_size = sizeof(struct mpc83xx_timer_priv),
};
Loading…
Cancel
Save