Skip to content

Commit

Permalink
openrisc: delay: fix handling of counter overflow
Browse files Browse the repository at this point in the history
If the counter overflows during a __delay operation, we will exit the
loop prematurely. For example, calling __delay(0x100) with the counter
at 0xffffff00 gives us a target of 0x0. The unsigned comparison in the
while loop will likely be false on the first iteration (if the counter
is now anything other than 0) and we will return early.

This patch fixes the problem by comparing deltas in the loop rather than
absolute values.

Cc: Jon Masters <jcm@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Jonas Bonn <jonas@southpole.se>
  • Loading branch information
Will Deacon authored and Jonas Bonn committed Sep 1, 2012
1 parent 4391646 commit 807607f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/openrisc/lib/delay.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ int __devinit read_current_timer(unsigned long *timer_value)

void __delay(unsigned long cycles)
{
cycles_t target = get_cycles() + cycles;
cycles_t start = get_cycles();

while (get_cycles() < target)
while ((get_cycles() - start) < cycles)
cpu_relax();
}
EXPORT_SYMBOL(__delay);
Expand Down

0 comments on commit 807607f

Please sign in to comment.