Skip to contentSkip to conversation

powerpc: Add isync to copy_and_flush

PATCH In review Michael Neuling 3 participants 3 messages Apr 24, 2013 – Apr 25, 2013 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: Add isync to copy_and_flush

In __after_prom_start we copy the kernel down to zero in two calls to copy_and_flush. After the first call (copy from 0 to copy_to_here:) we jump to the newly copied code soon after.

Unfortunately there's no isync between the copy of this code and the jump to it. Hence it's possible that stale instructions could still be in the icache or pipeline before we branch to it.

We've seen this on real machines and it's results in no console output after:
calling quiesce...
returning from prom_init

The below adds an isync to ensure that the copy and flushing has completed before any branching to the new instructions occurs.

---
benh: we should get this in 3.9 ASAP.

arch/powerpc/kernel/head_64.S +1 -0
index 0886ae6..b61363d 100644
@@ -509,6 +509,7 @@ _GLOBAL(copy_and_flush)
 	sync
 	addi	r5,r5,8
 	addi	r6,r6,8
+	isync
 	blr
 
 .align 8
#1 lore raw
Quoted 1 line · Michael Neuling

benh: we should get this in 3.9 ASAP.

Considering that the bug has been there *forever* I don't think I have a real standing to try to shove it down Linus throat as a "regression fix" :-)

I'll put the fix in 3.10 and let it trickle down to stable.

Cheers,
Ben.

#2 lore raw
Quoted 3 lines

Considering that the bug has been there *forever* I don't think I have a real standing to try to shove it down Linus throat as a "regression fix" :-)

True, sorry.

Quoted 1 line

I'll put the fix in 3.10 and let it trickle down to stable.

Thanks

Mikey