Changeset 9c56996 in mainline

Timestamp:

2013-02-14T21:22:17Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

63b2be8

Parents:

c0948aaa

Message:

Add some sanity checks

Location:

kernel

Files:

• arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (3 diffs)
• genarch/include/drivers/am335x/timer.h (modified) (1 diff)
• genarch/src/drivers/am335x/timer.c (modified) (5 diffs)

kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

@@ -98 +98 @@
             AM335x_CTRL_MODULE_SIZE, PAGE_NOT_CACHEABLE);
 
+        ASSERT(bbone.irc_addr != NULL);
+        ASSERT(bbone.cm_per_addr != NULL);
+        ASSERT(bbone.cm_dpll_addr != NULL);
+        ASSERT(bbone.ctrl_module != NULL);
+
         /* Initialize the interrupt controller */
         am335x_irc_init(bbone.irc_addr);
@@ -118 +123 @@
 {
         unsigned sysclk_freq;
+        int rc;
 
         /* Initialize the IRQ */
@@ -141 +147 @@
                 printf("system clock running at %u hz\n", sysclk_freq);
 
-        am335x_timer_init(&bbone.timer, DMTIMER2, HZ, sysclk_freq);
+        rc = am335x_timer_init(&bbone.timer, DMTIMER2, HZ, sysclk_freq);
+        if (rc != EOK) {
+                printf("Timer initialization failed\n");
+                return;
+        }
         /* Enable the interrupt */
         am335x_irc_enable(bbone.irc_addr, AM335x_DMTIMER2_IRQ);

kernel/genarch/include/drivers/am335x/timer.h

@@ -85 +85 @@
 } am335x_timer_t;
 
-extern void am335x_timer_init(am335x_timer_t *timer, am335x_timer_id_t id,
+extern int am335x_timer_init(am335x_timer_t *timer, am335x_timer_id_t id,
     unsigned hz, unsigned srcclk_hz);
 extern void am335x_timer_intr_ack(am335x_timer_t *timer);

kernel/genarch/src/drivers/am335x/timer.c

@@ -52 +52 @@
 static const timer_regs_mmap_t regs_map[TIMERS_MAX] = {
         { .base = AM335x_DMTIMER0_BASE_ADDRESS, .size = AM335x_DMTIMER0_SIZE },
-        {0, 0},
+        {0, 0}, /* DMTIMER1 is not supported by this driver */
         { .base = AM335x_DMTIMER2_BASE_ADDRESS, .size = AM335x_DMTIMER2_SIZE },
         { .base = AM335x_DMTIMER3_BASE_ADDRESS, .size = AM335x_DMTIMER3_SIZE },
@@ -83 +83 @@
 }
 
-void
+int
 am335x_timer_init(am335x_timer_t *timer, am335x_timer_id_t id, unsigned hz,
     unsigned srcclk_hz)
@@ -91 +91 @@
 
         ASSERT(id < TIMERS_MAX);
+        ASSERT(timer != NULL);
 
         if (id == DMTIMER1_1MS)
-                return; /* Not supported yet */
+                return ENOTSUP; /* Not supported yet */
 
         base_addr = regs_map[id].base;
@@ -99 +100 @@
 
         timer->regs = (void *) km_map(base_addr, size, PAGE_NOT_CACHEABLE);
+        ASSERT(timer->regs != NULL);
+
         timer->id = id;
 
@@ -130 +133 @@
         write_register_posted(timer, REG_TCRR, count);
         write_register_posted(timer, REG_TLDR, count);
+
+        return EOK;
 }