Changeset f7bb6d1 in mainline for kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

Timestamp:

2013-09-17T19:51:20Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

6ac3d27

Parents:

3efc35a (diff), ca62f86 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from launchpad branch.

File:

• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (3 diffs)

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

@@ -85 +85 @@
 static void bb_timer_irq_handler(irq_t *irq)
 {
+        amdm37x_gpt_irq_ack(&beagleboard.timer);
+
         /*
          * We are holding a lock which prevents preemption.
          * Release the lock, call clock() and reacquire the lock again.
          */
-        amdm37x_gpt_irq_ack(&beagleboard.timer);
         spinlock_unlock(&irq->lock);
         clock();
@@ -147 +148 @@
 {
         const unsigned inum = amdm37x_irc_inum_get(beagleboard.irc_addr);
-        amdm37x_irc_irq_ack(beagleboard.irc_addr);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -159 +159 @@
                     CPU->id, inum);
         }
+        /** amdm37x manual ch. 12.5.2 (p. 2428) places irc ack at the end
+         * of ISR. DO this to avoid strange behavior. */
+        amdm37x_irc_irq_ack(beagleboard.irc_addr);
 }