Changeset 6f07226 in mainline

Timestamp:

2012-10-14T15:49:23Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

5de9ff9

Parents:

42f2a45

Message:

beaglebone: use the DMTIMER0 for the preemptive scheduler

Files:

• HelenOS.config (modified) (1 diff)
• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (3 diffs)

HelenOS.config

@@ -483 +483 @@
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_UART (y/n)
 
+% Support for TI AM335x timers support
+! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
+
 % Support for TI AMDM37x on-chip UART
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n)

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

@@ -37 +37 @@
 #include <genarch/drivers/am335x/irc.h>
 #include <genarch/drivers/am335x/uart.h>
+#include <genarch/drivers/am335x/timer.h>
 #include <genarch/srln/srln.h>
 #include <interrupt.h>
@@ -56 +57 @@
 static struct beaglebone {
         am335x_irc_regs_t *irc_addr;
+        am335x_timer_t timer;
         am335x_uart_t uart;
 } bbone;
@@ -81 +83 @@
 }
 
+static irq_ownership_t bbone_timer_irq_claim(irq_t *irq)
+{
+        return IRQ_ACCEPT;
+}
+
+static void bbone_timer_irq_handler(irq_t *irq)
+{
+        am335x_timer_intr_ack(&bbone.timer);
+        spinlock_unlock(&irq->lock);
+        clock();
+        spinlock_lock(&irq->lock);
+}
+
 static void bbone_timer_irq_start(void)
 {
+        /* Initialize the IRQ */
+        static irq_t timer_irq;
+        irq_initialize(&timer_irq);
+        timer_irq.devno = device_assign_devno();
+        timer_irq.inr = AM335x_DMTIMER0_IRQ;
+        timer_irq.claim = bbone_timer_irq_claim;
+        timer_irq.handler = bbone_timer_irq_handler;
+        irq_register(&timer_irq);
+
+        /* Initialize the DMTIMER0 */
+        am335x_timer_init(&bbone.timer, DMTIMER0, HZ);
+        /* Enable the interrupt */
+        am335x_irc_enable(bbone.irc_addr, AM335x_DMTIMER0_IRQ);
+        /* Start the timer */
+        am335x_timer_start(&bbone.timer);
 }
 
 static void bbone_cpu_halt(void)
 {
+        while (1);
 }