From: Michal Suchanek <msuchanek@suse.de>
To: linuxppc-dev@lists.ozlabs.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Oleg Nesterov <oleg@redhat.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <christian@brauner.io>,
Nicholas Piggin <npiggin@gmail.com>,
Allison Randal <allison@lohutok.net>,
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>,
Michal Suchanek <msuchanek@suse.de>,
Thomas Gleixner <tglx@linutronix.de>,
Breno Leitao <leitao@debian.org>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Claudio Carvalho <cclaudio@linux.ibm.com>,
Russell Currey <ruscur@russell.cc>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>,
Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Firoz Khan <firoz.khan@linaro.org>,
Dmitry Vyukov <dvyukov@google.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Hari Bathini <hbathini@linux.ibm.com>,
Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
Nicolai Stange <nstange@suse.de>,
Valentin Schneider <valentin.schneider@arm.com>,
Diana Craciun <diana.craciun@nxp.com>,
Daniel Axtens <dja@axtens.net>,
Michael Neuling <mikey@neuling.org>,
Gustavo Romero <gromero@linux.ibm.com>,
Mathieu Malaterre <malat@debian.org>,
"Steven Rostedt" <rostedt@goodmis.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
David Howells <dhowells@redhat.com>,
Brajeswar Ghosh <brajeswar.linux@gmail.com>,
Jagadeesh Pagadala <jagdsh.linux@gmail.com>,
David Hildenbrand <david@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Madhavan Srinivasan <maddy@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 14/35] powerpc/64s/exception: remove the SPR saving patch code macros
Date: Tue, 26 Nov 2019 21:13:28 +0100 [thread overview]
Message-ID: <a7832ba86d85295aade6558796afcf0afb531339.1574798487.git.msuchanek@suse.de> (raw)
In-Reply-To: <cover.1574798487.git.msuchanek@suse.de>
From: Nicholas Piggin <npiggin@gmail.com>
These are used infrequently enough they don't provide much help, so
inline them.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/exceptions-64s.S | 82 ++++++++++------------------
1 file changed, 28 insertions(+), 54 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 716a95ba814f..abf26db36427 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -110,46 +110,6 @@ name:
#define EXC_HV 1
#define EXC_STD 0
-/*
- * PPR save/restore macros used in exceptions-64s.S
- * Used for P7 or later processors
- */
-#define SAVE_PPR(area, ra) \
-BEGIN_FTR_SECTION_NESTED(940) \
- ld ra,area+EX_PPR(r13); /* Read PPR from paca */ \
- std ra,_PPR(r1); \
-END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,940)
-
-#define RESTORE_PPR_PACA(area, ra) \
-BEGIN_FTR_SECTION_NESTED(941) \
- ld ra,area+EX_PPR(r13); \
- mtspr SPRN_PPR,ra; \
-END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,941)
-
-/*
- * Get an SPR into a register if the CPU has the given feature
- */
-#define OPT_GET_SPR(ra, spr, ftr) \
-BEGIN_FTR_SECTION_NESTED(943) \
- mfspr ra,spr; \
-END_FTR_SECTION_NESTED(ftr,ftr,943)
-
-/*
- * Set an SPR from a register if the CPU has the given feature
- */
-#define OPT_SET_SPR(ra, spr, ftr) \
-BEGIN_FTR_SECTION_NESTED(943) \
- mtspr spr,ra; \
-END_FTR_SECTION_NESTED(ftr,ftr,943)
-
-/*
- * Save a register to the PACA if the CPU has the given feature
- */
-#define OPT_SAVE_REG_TO_PACA(offset, ra, ftr) \
-BEGIN_FTR_SECTION_NESTED(943) \
- std ra,offset(r13); \
-END_FTR_SECTION_NESTED(ftr,ftr,943)
-
/*
* Branch to label using its 0xC000 address. This results in instruction
* address suitable for MSR[IR]=0 or 1, which allows relocation to be turned
@@ -278,18 +238,18 @@ do_define_int n
cmpwi r10,KVM_GUEST_MODE_SKIP
beq 89f
.else
-BEGIN_FTR_SECTION_NESTED(947)
+BEGIN_FTR_SECTION
ld r10,IAREA+EX_CFAR(r13)
std r10,HSTATE_CFAR(r13)
-END_FTR_SECTION_NESTED(CPU_FTR_CFAR,CPU_FTR_CFAR,947)
+END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
.endif
ld r10,PACA_EXGEN+EX_CTR(r13)
mtctr r10
-BEGIN_FTR_SECTION_NESTED(948)
+BEGIN_FTR_SECTION
ld r10,IAREA+EX_PPR(r13)
std r10,HSTATE_PPR(r13)
-END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948)
+END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
ld r11,IAREA+EX_R11(r13)
ld r12,IAREA+EX_R12(r13)
std r12,HSTATE_SCRATCH0(r13)
@@ -386,10 +346,14 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948)
SET_SCRATCH0(r13) /* save r13 */
GET_PACA(r13)
std r9,IAREA+EX_R9(r13) /* save r9 */
- OPT_GET_SPR(r9, SPRN_PPR, CPU_FTR_HAS_PPR)
+BEGIN_FTR_SECTION
+ mfspr r9,SPRN_PPR
+END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
HMT_MEDIUM
std r10,IAREA+EX_R10(r13) /* save r10 - r12 */
- OPT_GET_SPR(r10, SPRN_CFAR, CPU_FTR_CFAR)
+BEGIN_FTR_SECTION
+ mfspr r10,SPRN_CFAR
+END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
.if \ool
.if !\virt
b tramp_real_\name
@@ -402,8 +366,12 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948)
.endif
.endif
- OPT_SAVE_REG_TO_PACA(IAREA+EX_PPR, r9, CPU_FTR_HAS_PPR)
- OPT_SAVE_REG_TO_PACA(IAREA+EX_CFAR, r10, CPU_FTR_CFAR)
+BEGIN_FTR_SECTION
+ std r9,IAREA+EX_PPR(r13)
+END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
+BEGIN_FTR_SECTION
+ std r10,IAREA+EX_CFAR(r13)
+END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
INTERRUPT_TO_KERNEL
mfctr r10
std r10,IAREA+EX_CTR(r13)
@@ -558,7 +526,10 @@ DEFINE_FIXED_SYMBOL(\name\()_common_virt)
.endif
beq 101f /* if from kernel mode */
ACCOUNT_CPU_USER_ENTRY(r13, r9, r10)
- SAVE_PPR(IAREA, r9)
+BEGIN_FTR_SECTION
+ ld r9,IAREA+EX_PPR(r13) /* Read PPR from paca */
+ std r9,_PPR(r1)
+END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
101:
.else
.if IKUAP
@@ -598,10 +569,10 @@ DEFINE_FIXED_SYMBOL(\name\()_common_virt)
std r10,_DSISR(r1)
.endif
-BEGIN_FTR_SECTION_NESTED(66)
+BEGIN_FTR_SECTION
ld r10,IAREA+EX_CFAR(r13)
std r10,ORIG_GPR3(r1)
-END_FTR_SECTION_NESTED(CPU_FTR_CFAR, CPU_FTR_CFAR, 66)
+END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
ld r10,IAREA+EX_CTR(r13)
std r10,_CTR(r1)
std r2,GPR2(r1) /* save r2 in stackframe */
@@ -1696,10 +1667,10 @@ TRAMP_REAL_BEGIN(system_call_kvm)
* HMT_MEDIUM. That allows the KVM code to save that value into the
* guest state (it is the guest's PPR value).
*/
-BEGIN_FTR_SECTION_NESTED(948)
+BEGIN_FTR_SECTION
mfspr r10,SPRN_PPR
std r10,HSTATE_PPR(r13)
-END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948)
+END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
HMT_MEDIUM
mfctr r10
SET_SCRATCH0(r10)
@@ -2254,7 +2225,10 @@ denorm_done:
mtspr SPRN_HSRR0,r11
mtcrf 0x80,r9
ld r9,PACA_EXGEN+EX_R9(r13)
- RESTORE_PPR_PACA(PACA_EXGEN, r10)
+BEGIN_FTR_SECTION
+ ld r10,PACA_EXGEN+EX_PPR(r13)
+ mtspr SPRN_PPR,r10
+END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
BEGIN_FTR_SECTION
ld r10,PACA_EXGEN+EX_CFAR(r13)
mtspr SPRN_CFAR,r10
--
2.23.0
next prev parent reply other threads:[~2019-11-26 20:14 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 20:13 [PATCH v2 00/35] exception cleanup, syscall in C and !COMPAT Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 01/35] powerpc/64s/exception: Introduce INT_DEFINE parameter block for code generation Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 02/35] powerpc/64s/exception: Add GEN_COMMON macro that uses INT_DEFINE parameters Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 03/35] powerpc/64s/exception: Add GEN_KVM " Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 04/35] powerpc/64s/exception: Expand EXC_COMMON and EXC_COMMON_ASYNC macros Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 05/35] powerpc/64s/exception: Move all interrupt handlers to new style code gen macros Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 06/35] powerpc/64s/exception: Remove old INT_ENTRY macro Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 07/35] powerpc/64s/exception: Remove old INT_COMMON macro Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 08/35] powerpc/64s/exception: Remove old INT_KVM_HANDLER Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 09/35] powerpc/64s/exception: Add ISIDE option Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 10/35] powerpc/64s/exception: move real->virt switch into the common handler Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 11/35] powerpc/64s/exception: move soft-mask test to common code Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 12/35] powerpc/64s/exception: move KVM " Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 13/35] powerpc/64s/exception: remove confusing IEARLY option Michal Suchanek
2019-11-26 20:13 ` Michal Suchanek [this message]
2019-11-26 20:13 ` [PATCH v2 15/35] powerpc/64s/exception: trim unused arguments from KVMTEST macro Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 16/35] powerpc/64s/exception: hdecrementer avoid touching the stack Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 17/35] powerpc/64s/exception: re-inline some handlers Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 18/35] powerpc/64s/exception: Clean up SRR specifiers Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 19/35] powerpc/64s/exception: add more comments for interrupt handlers Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 20/35] powerpc/64s/exception: only test KVM in SRR interrupts when PR KVM is supported Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 21/35] powerpc/64s/exception: soft nmi interrupt should not use ret_from_except Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 22/35] powerpc/64: system call remove non-volatile GPR save optimisation Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 23/35] powerpc/64: system call implement the bulk of the logic in C Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 24/35] powerpc/64s: interrupt return " Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 25/35] powerpc/64s/exception: remove lite interrupt return Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 26/35] powerpc/64: system call: Fix sparse warning about missing declaration Michal Suchanek
2019-11-26 21:44 ` Luc Van Oostenryck
2019-11-27 7:30 ` Christophe Leroy
2019-11-26 20:13 ` [PATCH v2 27/35] powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 28/35] powerpc: move common register copy functions from signal_32.c to signal.c Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 29/35] powerpc/perf: remove current_is_64bit() Michal Suchanek
2019-11-27 5:41 ` Christophe Leroy
2019-11-27 9:49 ` Michal Suchánek
2019-11-26 20:13 ` [PATCH v2 30/35] powerpc/perf: consolidate read_user_stack_32 Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 31/35] powerpc/perf: consolidate valid_user_sp Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 32/35] powerpc/64: make buildable without CONFIG_COMPAT Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 33/35] powerpc/64: Make COMPAT user-selectable disabled on littleendian by default Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 34/35] powerpc/perf: split callchain.c by bitness Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 35/35] MAINTAINERS: perf: Add pattern that matches ppc perf to the perf entry Michal Suchanek
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=a7832ba86d85295aade6558796afcf0afb531339.1574798487.git.msuchanek@suse.de \
--to=msuchanek@suse.de \
--cc=akpm@linux-foundation.org \
--cc=allison@lohutok.net \
--cc=andrew.donnellan@au1.ibm.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=brajeswar.linux@gmail.com \
--cc=cclaudio@linux.ibm.com \
--cc=christian@brauner.io \
--cc=christophe.leroy@c-s.fr \
--cc=david@redhat.com \
--cc=dhowells@redhat.com \
--cc=diana.craciun@nxp.com \
--cc=dja@axtens.net \
--cc=dvyukov@google.com \
--cc=ebiederm@xmission.com \
--cc=firoz.khan@linaro.org \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=gromero@linux.ibm.com \
--cc=hbathini@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jagdsh.linux@gmail.com \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mahesh@linux.vnet.ibm.com \
--cc=malat@debian.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=npiggin@gmail.com \
--cc=nstange@suse.de \
--cc=oleg@redhat.com \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
--cc=ruscur@russell.cc \
--cc=tglx@linutronix.de \
--cc=valentin.schneider@arm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=yamada.masahiro@socionext.com \
/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).