From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Nicholas Piggin <npiggin@gmail.com>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v3 02/16] powerpc/32: move LOAD_MSR_KERNEL() into head_32.h and use it
Date: Tue, 30 Apr 2019 12:38:51 +0000 (UTC) [thread overview]
Message-ID: <d1626649502f7cbbbb3a2b04397c6c7a0ca1d592.1556627571.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1556627571.git.christophe.leroy@c-s.fr>
As preparation for using head_32.h for head_40x.S, move
LOAD_MSR_KERNEL() there and use it to load r10 with MSR_KERNEL value.
In the mean time, this patch modifies it so that it takes into account
the size of the passed value to determine if 'li' can be used or if
'lis/ori' is needed instead of using the size of MSR_KERNEL. This is
done by using gas macro.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/kernel/entry_32.S | 9 +--------
arch/powerpc/kernel/head_32.h | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 2f3d159c11d7..d0cea3deb86c 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -38,14 +38,7 @@
#include <asm/barrier.h>
#include <asm/kup.h>
-/*
- * MSR_KERNEL is > 0x10000 on 4xx/Book-E since it include MSR_CE.
- */
-#if MSR_KERNEL >= 0x10000
-#define LOAD_MSR_KERNEL(r, x) lis r,(x)@h; ori r,r,(x)@l
-#else
-#define LOAD_MSR_KERNEL(r, x) li r,(x)
-#endif
+#include "head_32.h"
/*
* Align to 4k in order to ensure that all functions modyfing srr0/srr1
diff --git a/arch/powerpc/kernel/head_32.h b/arch/powerpc/kernel/head_32.h
index 7456e2a45acc..cf3d00844597 100644
--- a/arch/powerpc/kernel/head_32.h
+++ b/arch/powerpc/kernel/head_32.h
@@ -5,6 +5,19 @@
#include <asm/ptrace.h> /* for STACK_FRAME_REGS_MARKER */
/*
+ * MSR_KERNEL is > 0x8000 on 4xx/Book-E since it include MSR_CE.
+ */
+.macro __LOAD_MSR_KERNEL r, x
+.if \x >= 0x8000
+ lis \r, (\x)@h
+ ori \r, \r, (\x)@l
+.else
+ li \r, (\x)
+.endif
+.endm
+#define LOAD_MSR_KERNEL(r, x) __LOAD_MSR_KERNEL r, x
+
+/*
* Exception entry code. This code runs with address translation
* turned off, i.e. using physical addresses.
* We assume sprg3 has the physical address of the current
@@ -89,7 +102,7 @@
#define EXC_XFER_TEMPLATE(n, hdlr, trap, copyee, tfer, ret) \
li r10,trap; \
stw r10,_TRAP(r11); \
- li r10,MSR_KERNEL; \
+ LOAD_MSR_KERNEL(r10, MSR_KERNEL); \
copyee(r10, r9); \
bl tfer; \
i##n: \
--
2.13.3
next prev parent reply other threads:[~2019-04-30 12:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 12:38 [PATCH v3 00/16] powerpc/32: Implement fast syscall entry Christophe Leroy
2019-04-30 12:38 ` [PATCH v3 01/16] powerpc/32: Refactor EXCEPTION entry macros for head_8xx.S and head_32.S Christophe Leroy
2019-05-03 6:59 ` Michael Ellerman
2019-04-30 12:38 ` Christophe Leroy [this message]
2019-04-30 12:38 ` [PATCH v3 03/16] powerpc/32: make the 6xx/8xx EXC_XFER_TEMPLATE() similar to the 40x/booke one Christophe Leroy
2019-04-30 12:38 ` [PATCH v3 04/16] powerpc/40x: Don't use SPRN_SPRG_SCRATCH2 in EXCEPTION_PROLOG Christophe Leroy
2019-04-30 12:38 ` [PATCH v3 05/16] powerpc/40x: add exception frame marker Christophe Leroy
2019-04-30 12:38 ` [PATCH v3 06/16] powerpc/40x: Split and rename NORMAL_EXCEPTION_PROLOG Christophe Leroy
2019-04-30 12:38 ` [PATCH v3 07/16] powerpc/40x: Refactor exception entry macros by using head_32.h Christophe Leroy
2019-04-30 12:38 ` [PATCH v3 08/16] powerpc/fsl_booke: ensure SPEFloatingPointException() reenables interrupts Christophe Leroy
2019-04-30 12:38 ` [PATCH v3 09/16] powerpc/32: enter syscall with MSR_EE inconditionaly set Christophe Leroy
2019-04-30 12:38 ` [PATCH v3 10/16] powerpc/32: Enter exceptions with MSR_EE unset Christophe Leroy
2019-04-30 12:39 ` [PATCH v3 11/16] powerpc/32: get rid of COPY_EE in exception entry Christophe Leroy
2019-04-30 12:39 ` [PATCH v3 12/16] powerpc: Fix 32-bit handling of MSR_EE on exceptions Christophe Leroy
2019-04-30 12:39 ` [PATCH v3 13/16] powerpc/32: implement fast entry for syscalls on non BOOKE Christophe Leroy
2019-04-30 12:39 ` [PATCH v3 14/16] powerpc/32: implement fast entry for syscalls on BOOKE Christophe Leroy
2019-05-23 6:14 ` Paul Mackerras
2019-05-23 7:00 ` Christophe Leroy
2019-05-23 8:10 ` Christophe Leroy
2019-05-28 5:37 ` Michael Ellerman
2019-05-28 17:03 ` Christophe Leroy
2019-06-03 9:16 ` Christophe Leroy
2019-06-04 16:59 ` Christophe Leroy
2019-04-30 12:39 ` [PATCH v3 15/16] powerpc/32: don't do syscall stuff in transfer_to_handler Christophe Leroy
2019-04-30 12:39 ` [PATCH v3 16/16] powerpc/32: Don't add dummy frames when calling trace_hardirqs_on/off Christophe Leroy
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=d1626649502f7cbbbb3a2b04397c6c7a0ca1d592.1556627571.git.christophe.leroy@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=paulus@samba.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).