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

Commit 59affcd3 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc: Context switch more PMU related SPRs 



In commit 9353374b "Context switch the new EBB SPRs" we added support for
context switching some new EBB SPRs. However despite four of us signing
off on that patch we missed some. To be fair these are not actually new
SPRs, but they are now potentially user accessible so need to be context
switched.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 605e44d6

arch/powerpc/include/asm/processor.h

+6 −0
Original line number Diff line number Diff line
@@ -284,6 +284,12 @@ struct thread_struct { 
	unsigned long	ebbrr;

	unsigned long	ebbhr;

	unsigned long	bescr;

	unsigned long	siar;

	unsigned long	sdar;

	unsigned long	sier;

	unsigned long	mmcr0;

	unsigned long	mmcr2;

	unsigned long	mmcra;

#endif

};

arch/powerpc/kernel/asm-offsets.c

+6 −0
Original line number Diff line number Diff line
@@ -127,6 +127,12 @@ int main(void) 
	DEFINE(THREAD_BESCR, offsetof(struct thread_struct, bescr));

	DEFINE(THREAD_EBBHR, offsetof(struct thread_struct, ebbhr));

	DEFINE(THREAD_EBBRR, offsetof(struct thread_struct, ebbrr));

	DEFINE(THREAD_SIAR, offsetof(struct thread_struct, siar));

	DEFINE(THREAD_SDAR, offsetof(struct thread_struct, sdar));

	DEFINE(THREAD_SIER, offsetof(struct thread_struct, sier));

	DEFINE(THREAD_MMCR0, offsetof(struct thread_struct, mmcr0));

	DEFINE(THREAD_MMCR2, offsetof(struct thread_struct, mmcr2));

	DEFINE(THREAD_MMCRA, offsetof(struct thread_struct, mmcra));

#endif

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	DEFINE(PACATMSCRATCH, offsetof(struct paca_struct, tm_scratch));

arch/powerpc/kernel/entry_64.S

+28 −0
Original line number Diff line number Diff line
@@ -465,6 +465,20 @@ BEGIN_FTR_SECTION 
	std	r0, THREAD_EBBHR(r3)

	mfspr	r0, SPRN_EBBRR

	std	r0, THREAD_EBBRR(r3)



	/* PMU registers made user read/(write) by EBB */

	mfspr	r0, SPRN_SIAR

	std	r0, THREAD_SIAR(r3)

	mfspr	r0, SPRN_SDAR

	std	r0, THREAD_SDAR(r3)

	mfspr	r0, SPRN_SIER

	std	r0, THREAD_SIER(r3)

	mfspr	r0, SPRN_MMCR0

	std	r0, THREAD_MMCR0(r3)

	mfspr	r0, SPRN_MMCR2

	std	r0, THREAD_MMCR2(r3)

	mfspr	r0, SPRN_MMCRA

	std	r0, THREAD_MMCRA(r3)

END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)

#endif
@@ -560,6 +574,20 @@ BEGIN_FTR_SECTION 
	ld	r0, THREAD_EBBRR(r4)

	mtspr	SPRN_EBBRR, r0



	/* PMU registers made user read/(write) by EBB */

	ld	r0, THREAD_SIAR(r4)

	mtspr	SPRN_SIAR, r0

	ld	r0, THREAD_SDAR(r4)

	mtspr	SPRN_SDAR, r0

	ld	r0, THREAD_SIER(r4)

	mtspr	SPRN_SIER, r0

	ld	r0, THREAD_MMCR0(r4)

	mtspr	SPRN_MMCR0, r0

	ld	r0, THREAD_MMCR2(r4)

	mtspr	SPRN_MMCR2, r0

	ld	r0, THREAD_MMCRA(r4)

	mtspr	SPRN_MMCRA, r0



	ld	r0,THREAD_TAR(r4)

	mtspr	SPRN_TAR,r0

END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)