Skip to contentSkip to conversation

Patch "powerpc/mm/hash: Always clear UPRT and Host Radix bits when setting up CPU" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Mar 10, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

powerpc/mm/hash: Always clear UPRT and Host Radix bits when setting up CPU

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
powerpc-mm-hash-always-clear-uprt-and-host-radix-bits-when-setting-up-cpu.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From fda2d27db6eae5c2468f9e4657539b72bbc238bb Mon Sep 17 00:00:00 2001

From: "Aneesh Kumar K.V" <[email protected]>
Date: Wed, 22 Feb 2017 10:42:02 +0530
Subject: powerpc/mm/hash: Always clear UPRT and Host Radix bits when setting up CPU

From: Aneesh Kumar K.V <[email protected]>

commit fda2d27db6eae5c2468f9e4657539b72bbc238bb upstream.

We will set LPCR with correct value for radix during int. This make sure we start with a sanitized value of LPCR. In case of kexec, cpus can have LPCR value based on the previous translation mode we were running.

Fixes fe036a0605d60 ("powerpc/64/kexec: Fix MMU cleanup on radix")
---
 arch/powerpc/kernel/cpu_setup_power.S |    4 ++++
 1 file changed, 4 insertions(+)
arch/powerpc/kernel/cpu_setup_power.S +4 -0
@@ -101,6 +101,8 @@ _GLOBAL(__setup_cpu_power9)
 	mfspr	r3,SPRN_LPCR
 	LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE)
 	or	r3, r3, r4
+	LOAD_REG_IMMEDIATE(r4, LPCR_UPRT | LPCR_HR)
+	andc	r3, r3, r4
 	bl	__init_LPCR
 	bl	__init_HFSCR
 	bl	__init_tlb_power9
@@ -122,6 +124,8 @@ _GLOBAL(__restore_cpu_power9)
 	mfspr   r3,SPRN_LPCR
 	LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE)
 	or	r3, r3, r4
+	LOAD_REG_IMMEDIATE(r4, LPCR_UPRT | LPCR_HR)
+	andc	r3, r3, r4
 	bl	__init_LPCR
 	bl	__init_HFSCR
 	bl	__init_tlb_power9

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/powerpc-mm-add-mmu_ftr_kernel_ro-to-possible-feature-mask.patch queue-4.10/powerpc-mm-hash-always-clear-uprt-and-host-radix-bits-when-setting-up-cpu.patch