From: Suzuki Poulose Date: Sun, 15 Apr 2012 21:48:21 +0000 (+0000) Subject: powerpc/44x: Fix/Initialize PID to kernel PID before the TLB search X-Git-Tag: next-20120503~93^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f13bfcc6961a5c9f511c401292db522edcd0b061;p=karo-tx-linux.git powerpc/44x: Fix/Initialize PID to kernel PID before the TLB search Initialize the PID register with kernel pid (0) before we start setting the TLB mapping for KEXEC. Also set the MMUCR[TID] to kernel PID. This was spotted while testing the kexec on ISS for 47x. ISS doesn't return a successful tlbsx for a kernel address with PID set to a user PID. Though the hardware/qemu/simics work fine. This patch is harmless and initializes the PID to 0 (kernel PID) which is usually the case during a normal kernel boot. This would fix the kexec on ISS for 440. I have tested this patch on sequoia board. Signed-off-by: Suzuki K Poulose Cc: Josh Boyer Signed-off-by: Josh Boyer --- diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 7cd07b42ca1a..d7e05d20b55c 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -761,8 +761,12 @@ relocate_new_kernel: mr r30, r4 mr r31, r5 - /* Load our MSR_IS and TID to MMUCR for TLB search */ - mfspr r3,SPRN_PID + /* + * Load the PID with kernel PID (0). + * Also load our MSR_IS and TID to MMUCR for TLB search. + */ + li r3, 0 + mtspr SPRN_PID, r3 mfmsr r4 andi. r4,r4,MSR_IS@l beq wmmucr