From: Michael Neuling <mikey@neuling.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Neuling <mikey@neuling.org>,
linuxppc-dev@lists.ozlabs.org, Ian Munsie <imunsie@au1.ibm.com>,
Matt Evans <matt@ozlabs.org>
Subject: [PATCH 08/14] powerpc: Move initial mfspr LPCR out of __init_LPCR
Date: Fri, 9 Nov 2012 17:19:06 +1100 [thread overview]
Message-ID: <1352441953-29096-9-git-send-email-mikey@neuling.org> (raw)
In-Reply-To: <1352441953-29096-1-git-send-email-mikey@neuling.org>
We want to change what's initially set in the LPCR, so start by taking the move
from LPCR out of the function and into the caller.
Signed-off-by: Matt Evans <matt@ozlabs.org>
Signed-off-by: Michael Neuling <mikey@neuling.org>
---
arch/powerpc/kernel/cpu_setup_power.S | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S
index a92101d..52dd033 100644
--- a/arch/powerpc/kernel/cpu_setup_power.S
+++ b/arch/powerpc/kernel/cpu_setup_power.S
@@ -27,6 +27,7 @@ _GLOBAL(__setup_cpu_power7)
beqlr
li r0,0
mtspr SPRN_LPID,r0
+ mfspr r3,SPRN_LPCR
bl __init_LPCR
bl __init_TLB
mtlr r11
@@ -39,6 +40,7 @@ _GLOBAL(__restore_cpu_power7)
beqlr
li r0,0
mtspr SPRN_LPID,r0
+ mfspr r3,SPRN_LPCR
bl __init_LPCR
bl __init_TLB
mtlr r11
@@ -51,6 +53,7 @@ _GLOBAL(__setup_cpu_power8)
beqlr
li r0,0
mtspr SPRN_LPID,r0
+ mfspr r3,SPRN_LPCR
bl __init_LPCR
bl __init_TLB
mtlr r11
@@ -63,6 +66,7 @@ _GLOBAL(__restore_cpu_power8)
beqlr
li r0,0
mtspr SPRN_LPID,r0
+ mfspr r3,SPRN_LPCR
bl __init_LPCR
bl __init_TLB
mtlr r11
@@ -81,6 +85,7 @@ __init_hvmode_206:
__init_LPCR:
/* Setup a sane LPCR:
+ * Called with initial LPCR in R3
*
* LPES = 0b01 (HSRR0/1 used for 0x500)
* PECE = 0b111
@@ -91,7 +96,6 @@ __init_LPCR:
*
* Other bits untouched for now
*/
- mfspr r3,SPRN_LPCR
li r5,1
rldimi r3,r5, LPCR_LPES_SH, 64-LPCR_LPES_SH-2
ori r3,r3,(LPCR_PECE0|LPCR_PECE1|LPCR_PECE2)
--
1.7.9.5
next prev parent reply other threads:[~2012-11-09 6:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-09 6:18 [PATCH 00/14] powerpc: Add support for POWER8 relocation on exceptions Michael Neuling
2012-11-09 6:18 ` [PATCH 01/14] powerpc: Fix name denorm hypervisor symbol Michael Neuling
2012-11-09 6:19 ` [PATCH 02/14] powerpc: Whitespace changes in exception64s.S Michael Neuling
2012-11-09 6:19 ` [PATCH 03/14] powerpc: Remove unessessary 0x3000 location enforcement Michael Neuling
2012-11-09 6:19 ` [PATCH 04/14] powerpc: Make load_hander handle upto 64k offset Michael Neuling
2012-11-09 6:19 ` [PATCH 05/14] powerpc: Turn syscall handler into macros Michael Neuling
2012-11-09 6:19 ` [PATCH 06/14] powerpc: Add new macros needed for relocation on exceptions Michael Neuling
2012-11-09 6:19 ` [PATCH 07/14] powerpc: Add relocation on exception vector handlers Michael Neuling
2012-11-09 6:19 ` Michael Neuling [this message]
2012-11-09 6:19 ` [PATCH 09/14] powerpc: Setup relocation on exceptions for bare metal systems Michael Neuling
2012-11-12 1:32 ` Segher Boessenkool
2012-11-12 2:08 ` Michael Neuling
2012-11-09 6:19 ` [PATCH 10/14] powerpc: Add set_mode hcall Michael Neuling
2012-11-09 6:19 ` [PATCH 10/12] powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate function Michael Neuling
2012-11-09 6:19 ` [PATCH 11/14] powerpc: Add wrappers to enable/disable relocation on exceptions Michael Neuling
2012-11-09 6:19 ` [PATCH 12/14] powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate function Michael Neuling
2012-11-09 9:26 ` Stephen Rothwell
2012-11-09 9:49 ` Michael Neuling
2012-11-09 6:19 ` [PATCH 13/14] powerpc: Enable relocation on during exceptions at boot Michael Neuling
2012-11-09 6:19 ` [PATCH 14/14] powerpc: Disable relocation on exceptions when kexecing Michael Neuling
2012-11-09 8:58 ` [PATCH 00/14] powerpc: Add support for POWER8 relocation on exceptions Gabriel Paubert
2012-11-09 9:51 ` Michael Neuling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352441953-29096-9-git-send-email-mikey@neuling.org \
--to=mikey@neuling.org \
--cc=benh@kernel.crashing.org \
--cc=imunsie@au1.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=matt@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).