From 0a7edce0ef26d9a8c11e9c097e0ed12cf334e27d Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 6 Jan 2016 10:33:03 -0700 Subject: dm: timer: refuse timers with zero clock_rate If a timer has a zero clock_rate, get_tbclk() will return zero for it, which will cause tick_to_time() to perform a division-by-zero, which will crash U-Boot. Signed-off-by: Stephen Warren Acked-by: Simon Glass --- drivers/timer/timer-uclass.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'drivers/timer') diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index b1f4868416f..83d1a35e062 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -49,6 +49,16 @@ static int timer_pre_probe(struct udevice *dev) return 0; } +static int timer_post_probe(struct udevice *dev) +{ + struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); + + if (!uc_priv->clock_rate) + return -EINVAL; + + return 0; +} + u64 timer_conv_64(u32 count) { /* increment tbh if tbl has rolled over */ @@ -105,5 +115,6 @@ UCLASS_DRIVER(timer) = { .name = "timer", .pre_probe = timer_pre_probe, .flags = DM_UC_FLAG_SEQ_ALIAS, + .post_probe = timer_post_probe, .per_device_auto_alloc_size = sizeof(struct timer_dev_priv), }; -- cgit v1.2.3