Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9b4045d authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Don't use toc in decrementer_iSeries_masked 



Since 404849bb we've been using
LOAD_REG_ADDRBASE, which uses the toc pointer, in decrementer_iSeries_masked.

This can explode if we take the decrementer interrupt while we're in a module,
because the toc pointer in r2 will be the module's toc pointer.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 09f5dc44

arch/powerpc/kernel/head_64.S

+3 −2
Original line number Diff line number Diff line
@@ -749,11 +749,12 @@ iSeries_secondary_smp_loop: 


	.globl decrementer_iSeries_masked

decrementer_iSeries_masked:

	/* We may not have a valid TOC pointer in here. */

	li	r11,1

	ld	r12,PACALPPACAPTR(r13)

	stb	r11,LPPACADECRINT(r12)

	LOAD_REG_ADDRBASE(r12,tb_ticks_per_jiffy)

	lwz	r12,ADDROFF(tb_ticks_per_jiffy)(r12)

	LOAD_REG_IMMEDIATE(r12, tb_ticks_per_jiffy)

	lwz	r12,0(r12)

	mtspr	SPRN_DEC,r12

	/* fall through */