Skip to content
Snippets Groups Projects
Commit 7afc45ad authored by Kumar Gala's avatar Kumar Gala
Browse files

powerpc/85xx: Fix synchronization of timebase on MP boot


There is a small ordering issue in the master core in that we need to
make sure the disabling of the timebase in the SoC is visible before we
set the value to 0.  We can simply just read back the value to
synchronizatize the write, before we set TB to 0.

Reported-by: Dan Hettena
Tested-by: Dan Hettena
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent cc1dd33f
No related branches found
No related tags found
No related merge requests found
......@@ -276,8 +276,13 @@ static void plat_mp_up(unsigned long bootpg)
/* enable time base at the platform */
out_be32(&rcpm->ctbenrl, 0);
/* readback to sync write */
in_be32(&rcpm->ctbenrl);
mtspr(SPRN_TBWU, 0);
mtspr(SPRN_TBWL, 0);
out_be32(&rcpm->ctbenrl, (1 << nr_cpus) - 1);
#ifdef CONFIG_MPC8xxx_DISABLE_BPTR
......@@ -347,6 +352,10 @@ static void plat_mp_up(unsigned long bootpg)
else
devdisr |= MPC85xx_DEVDISR_TB0;
out_be32(&gur->devdisr, devdisr);
/* readback to sync write */
in_be32(&gur->devdisr);
mtspr(SPRN_TBWU, 0);
mtspr(SPRN_TBWL, 0);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment