RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
PR 1756/bsps
	* timer/timer.c: Retry on timer calibration loop failure.
This commit is contained in:
Joel Sherrill
2011-03-07 17:35:52 +00:00
parent 7869594e97
commit 46974aa75c
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/i386/pc386/ChangeLog
View File

@@ -1,3 +1,8 @@
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>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

31
c/src/lib/libbsp/i386/pc386/timer/timer.c
View File

@@ -333,13 +333,19 @@ Calibrate_loop_1ms(void)
unsigned int targetClockBits, currentClockBits;
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
*/
@@ -383,8 +389,11 @@ Calibrate_loop_1ms(void)
fastLoop (10000);
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;
/*
@@ -394,14 +403,20 @@ Calibrate_loop_1ms(void)
slowLoop(10);
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;
}
targetClockBits += offset;