UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc: Fix bug in timebase synchronization on 32-bit SMP powermac 

We were using udelay in the loop on the primary cpu waiting for the
secondary cpu to take the timebase value.  Unfortunately now that
udelay uses the timebase, and the timebase is stopped at this point,
the udelay never terminated.  This fixes it by not using udelay, and
increases the number of loops before we time out to compensate.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras 2005-11-19 21:24:55 +11:00
parent 0212ddd839
commit 54c4e6b5fe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/platforms/powermac/smp.c
View File

@ -34,6 +34,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/compiler.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/atomic.h> #include <asm/atomic.h>
@ -631,8 +632,9 @@ void smp_core99_give_timebase(void)
mb(); mb();
/* wait for the secondary to have taken it */ /* wait for the secondary to have taken it */
for (t = 100000; t > 0 && sec_tb_reset; --t) /* note: can't use udelay here, since it needs the timebase running */
udelay(10); for (t = 10000000; t > 0 && sec_tb_reset; --t)
barrier();
if (sec_tb_reset) if (sec_tb_reset)
/* XXX BUG_ON here? */ /* XXX BUG_ON here? */
printk(KERN_WARNING "Timeout waiting sync(2) on second CPU\n"); printk(KERN_WARNING "Timeout waiting sync(2) on second CPU\n");