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

Commit b133ef6e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.17-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fix from Michael Ellerman:
 "Just one fix, to make sure the PCR (Processor Compatibility Register)
  is reset on boot.

  Otherwise if we're running in compat mode in a guest (eg. pretending a
  Power9 is a Power8) and the host kernel oopses and kdumps then the
  kdump kernel's userspace will be running in Power8 mode, and will
  SIGILL if it uses Power9-only instructions.

  Thanks to Michael Neuling"

* tag 'powerpc-4.17-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s: Clear PCR on boot
parents f287fe35 faf37c44

arch/powerpc/kernel/cpu_setup_power.S

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ _GLOBAL(__setup_cpu_power7) 
	beqlr

	li	r0,0

	mtspr	SPRN_LPID,r0

	mtspr	SPRN_PCR,r0

	mfspr	r3,SPRN_LPCR

	li	r4,(LPCR_LPES1 >> LPCR_LPES_SH)

	bl	__init_LPCR_ISA206
@@ -41,6 +42,7 @@ _GLOBAL(__restore_cpu_power7) 
	beqlr

	li	r0,0

	mtspr	SPRN_LPID,r0

	mtspr	SPRN_PCR,r0

	mfspr	r3,SPRN_LPCR

	li	r4,(LPCR_LPES1 >> LPCR_LPES_SH)

	bl	__init_LPCR_ISA206
@@ -57,6 +59,7 @@ _GLOBAL(__setup_cpu_power8) 
	beqlr

	li	r0,0

	mtspr	SPRN_LPID,r0

	mtspr	SPRN_PCR,r0

	mfspr	r3,SPRN_LPCR

	ori	r3, r3, LPCR_PECEDH

	li	r4,0 /* LPES = 0 */
@@ -78,6 +81,7 @@ _GLOBAL(__restore_cpu_power8) 
	beqlr

	li	r0,0

	mtspr	SPRN_LPID,r0

	mtspr	SPRN_PCR,r0

	mfspr   r3,SPRN_LPCR

	ori	r3, r3, LPCR_PECEDH

	li	r4,0 /* LPES = 0 */
@@ -99,6 +103,7 @@ _GLOBAL(__setup_cpu_power9) 
	mtspr	SPRN_PSSCR,r0

	mtspr	SPRN_LPID,r0

	mtspr	SPRN_PID,r0

	mtspr	SPRN_PCR,r0

	mfspr	r3,SPRN_LPCR

	LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE  | LPCR_HEIC)

	or	r3, r3, r4
@@ -123,6 +128,7 @@ _GLOBAL(__restore_cpu_power9) 
	mtspr	SPRN_PSSCR,r0

	mtspr	SPRN_LPID,r0

	mtspr	SPRN_PID,r0

	mtspr	SPRN_PCR,r0

	mfspr   r3,SPRN_LPCR

	LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE | LPCR_HEIC)

	or	r3, r3, r4

arch/powerpc/kernel/dt_cpu_ftrs.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static void __restore_cpu_cpufeatures(void) 
	if (hv_mode) {

		mtspr(SPRN_LPID, 0);

		mtspr(SPRN_HFSCR, system_registers.hfscr);

		mtspr(SPRN_PCR, 0);

	}

	mtspr(SPRN_FSCR, system_registers.fscr);