diff options
| author | wdenk <wdenk> | 2005-04-04 12:08:28 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2005-04-04 12:08:28 +0000 |
| commit | 101e8dfa2a8b045c6655bf2b3d6fba8d378453cd (patch) | |
| tree | 1c39acefbaf435ddc2e9f42540eb64ea267cb530 /cpu/arm920t | |
| parent | 50712ba16e7e469e90952a7f197efa46e2f8e311 (diff) | |
| download | u-boot-imx-101e8dfa2a8b045c6655bf2b3d6fba8d378453cd.zip u-boot-imx-101e8dfa2a8b045c6655bf2b3d6fba8d378453cd.tar.gz u-boot-imx-101e8dfa2a8b045c6655bf2b3d6fba8d378453cd.tar.bz2 | |
Fix timer code for ARM systems: make sure that udelay() does not
reset timers so it's save to use udelay() in timeout code.
Diffstat (limited to 'cpu/arm920t')
| -rw-r--r-- | cpu/arm920t/imx/interrupts.c | 9 | ||||
| -rw-r--r-- | cpu/arm920t/s3c24x0/interrupts.c | 21 |
2 files changed, 21 insertions, 9 deletions
diff --git a/cpu/arm920t/imx/interrupts.c b/cpu/arm920t/imx/interrupts.c index 12ae2fa..2f2e754 100644 --- a/cpu/arm920t/imx/interrupts.c +++ b/cpu/arm920t/imx/interrupts.c @@ -81,10 +81,13 @@ ulong get_timer_masked (void) void udelay_masked (unsigned long usec) { - ulong start = get_timer_masked(); + ulong endtime = get_timer_masked() + usec; + signed long diff; - while (get_timer_masked () - start < usec ) - /*NOP*/; + do { + ulong now = get_timer_masked (); + diff = endtime - now; + } while (diff >= 0); } void udelay (unsigned long usec) diff --git a/cpu/arm920t/s3c24x0/interrupts.c b/cpu/arm920t/s3c24x0/interrupts.c index f581d6d..868621f 100644 --- a/cpu/arm920t/s3c24x0/interrupts.c +++ b/cpu/arm920t/s3c24x0/interrupts.c @@ -137,15 +137,24 @@ ulong get_timer_masked (void) void udelay_masked (unsigned long usec) { ulong tmo; + ulong endtime; + signed long diff; - tmo = usec / 1000; - tmo *= (timer_load_val * 100); - tmo /= 1000; + if (usec >= 1000) { + tmo = usec / 1000; + tmo *= (timer_load_val * 100); + tmo /= 1000; + } else { + tmo = usec * (timer_load_val * 100); + tmo /= (1000*1000); + } - reset_timer_masked (); + endtime = get_timer_masked () + tmo; - while (get_timer_masked () < tmo) - /*NOP*/; + do { + ulong now = get_timer_masked (); + diff = endtime - now; + } while (diff >= 0); } /* |