Changeset 46974aa in rtems

Timestamp:

Mar 7, 2011, 5:35:52 PM (9 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10

Children:

97b6dc0

Parents:

7869594

Message:

2011-03-07 Joel Sherrill <joel.sherrilL@…>

PR 1756/bsps

• timer/timer.c: Retry on timer calibration loop failure.

Location:

c/src/lib/libbsp/i386/pc386

Files:

• ChangeLog (modified) (1 diff)
• timer/timer.c (modified) (3 diffs)

c/src/lib/libbsp/i386/pc386/ChangeLog

@@ +1 @@
+2011-03-07      Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+        PR 1756/bsps
+        * timer/timer.c: Retry on timer calibration loop failure.
+
 2011-02-02      Ralf Corsépius <ralf.corsepius@rtems.org>
 

c/src/lib/libbsp/i386/pc386/timer/timer.c

@@ -334 +334 @@
   unsigned int slowLoopGranularity, fastLoopGranularity;
   rtems_interrupt_level  level;
-
+  int retries = 0;
+
+  rtems_interrupt_disable(level);
+
+retry:
+  if ( ++retries >= 5 ) {
+    printk( "Calibrate_loop_1ms: too many attempts. giving up!!\n" );
+    while (1);
+  }
 #ifdef DEBUG_CALIBRATE
   printk("Calibrate_loop_1ms is starting,  please wait (but not too long.)\n");
 #endif
   targetClockBits = US_TO_TICK(1000);
-
-  rtems_interrupt_disable(level);
   /*
    * Fill up the cache to get a correct offset
@@ -384 +390 @@
   res = readTimer0() - offset;
   if (res < emptyCall) {
-     printk("Problem #1 in offset computation in Calibrate_loop_1ms in file libbsp/i386/pc386/timer/timer.c\n");
-    while (1);
+    printk(
+      "Problem #1 in offset computation in Calibrate_loop_1ms "
+        " in file libbsp/i386/pc386/timer/timer.c\n"
+    );
+    goto retry;
   }
   fastLoopGranularity = (res - emptyCall) / 10000;
@@ -395 +404 @@
   res = readTimer0();
   if (res < offset + emptyCall) {
-     printk("Problem #2 in offset computation in Calibrate_loop_1ms in file libbsp/i386/pc386/timer/timer.c\n");
-    while (1);
+    printk(
+      "Problem #2 in offset computation in Calibrate_loop_1ms "
+        " in file libbsp/i386/pc386/timer/timer.c\n"
+    );
+    goto retry;
   }
   slowLoopGranularity = (res - offset - emptyCall)/ 10;
 
   if (slowLoopGranularity == 0) {
-    printk("Problem #3 in Calibrate_loop_1ms in file libbsp/i386/pc386/timer/timer.c\n");
-    while (1);
+    printk(
+      "Problem #3 in offset computation in Calibrate_loop_1ms "
+        " in file libbsp/i386/pc386/timer/timer.c\n"
+    );
+    goto retry;
   }