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 02/35] powerpc/64s/exception: Add GEN_COMMON macro that uses INT_DEFINE parameters Date: Tue, 26 Nov 2019 21:13:16 +0100 [thread overview] Message-ID: <feab2b2c94c63f4b7f1378edfda0cdae63108539.1574798487.git.msuchanek@suse.de> (raw) In-Reply-To: <cover.1574798487.git.msuchanek@suse.de> From: Nicholas Piggin <npiggin@gmail.com> No generated code change. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/kernel/exceptions-64s.S | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index e6ad6e6cf65e..591ae2a73e18 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -206,6 +206,9 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) #define IMASK .L_IMASK_\name\() #define IKVM_REAL .L_IKVM_REAL_\name\() #define IKVM_VIRT .L_IKVM_VIRT_\name\() +#define ISTACK .L_ISTACK_\name\() +#define IRECONCILE .L_IRECONCILE_\name\() +#define IKUAP .L_IKUAP_\name\() #define INT_DEFINE_BEGIN(n) \ .macro int_define_ ## n name @@ -246,6 +249,15 @@ do_define_int n .ifndef IKVM_VIRT IKVM_VIRT=0 .endif + .ifndef ISTACK + ISTACK=1 + .endif + .ifndef IRECONCILE + IRECONCILE=1 + .endif + .ifndef IKUAP + IKUAP=1 + .endif .endm .macro INT_KVM_HANDLER name, vec, hsrr, area, skip @@ -670,6 +682,10 @@ END_FTR_SECTION_NESTED(CPU_FTR_CFAR, CPU_FTR_CFAR, 66) .endif .endm +.macro GEN_COMMON name + INT_COMMON IVEC, IAREA, ISTACK, IKUAP, IRECONCILE, IDAR, IDSISR +.endm + /* * Restore all registers including H/SRR0/1 saved in a stack frame of a * standard exception. @@ -1221,13 +1237,7 @@ EXC_VIRT_BEGIN(data_access, 0x4300, 0x80) EXC_VIRT_END(data_access, 0x4300, 0x80) INT_KVM_HANDLER data_access, 0x300, EXC_STD, PACA_EXGEN, 1 EXC_COMMON_BEGIN(data_access_common) - /* - * Here r13 points to the paca, r9 contains the saved CR, - * SRR0 and SRR1 are saved in r11 and r12, - * r9 - r13 are saved in paca->exgen. - * EX_DAR and EX_DSISR have saved DAR/DSISR - */ - INT_COMMON 0x300, PACA_EXGEN, 1, 1, 1, 1, 1 + GEN_COMMON data_access ld r4,_DAR(r1) ld r5,_DSISR(r1) BEGIN_MMU_FTR_SECTION -- 2.23.0
WARNING: multiple messages have this Message-ID (diff)
From: Michal Suchanek <msuchanek@suse.de> To: linuxppc-dev@lists.ozlabs.org Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>, David Hildenbrand <david@redhat.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Claudio Carvalho <cclaudio@linux.ibm.com>, David Howells <dhowells@redhat.com>, Masahiro Yamada <yamada.masahiro@socionext.com>, Paul Mackerras <paulus@samba.org>, Christian Brauner <christian@brauner.io>, Breno Leitao <leitao@debian.org>, Michael Neuling <mikey@neuling.org>, Nicolai Stange <nstange@suse.de>, Diana Craciun <diana.craciun@nxp.com>, Firoz Khan <firoz.khan@linaro.org>, Allison Randal <allison@lohutok.net>, Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>, Geert Uytterhoeven <geert@linux-m68k.org>, "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>, Michal Suchanek <msuchanek@suse.de>, Valentin Schneider <valentin.schneider@arm.com>, Jagadeesh Pagadala <jagdsh.linux@gmail.com>, Arnd Bergmann <arnd@arndb.de>, Nicholas Piggin <npiggin@gmail.com>, Alexander Viro <viro@zeniv.linux.org.uk>, Steven Rostedt <rostedt@goodmis.org>, Thomas Gleixner <tglx@linutronix.de>, Dmitry Vyukov <dvyukov@google.com>, Daniel Axtens <dja@axtens.net>, Gustavo Romero <gromero@linux.ibm.com>, Mathieu Malaterre <malat@debian.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Oleg Nesterov <oleg@redhat.com>, linux-kernel@vger.kernel.org, "Eric W. Biederman" <ebiederm@xmission.com>, Andrew Donnellan <andrew.donnellan@au1.ibm.com>, Brajeswar Ghosh <brajeswar.linux@gmail.com>, Hari Bathini <hbathini@linux.ibm.com>, Andrew Morton <akpm@linux-foundation.org> Subject: [PATCH v2 02/35] powerpc/64s/exception: Add GEN_COMMON macro that uses INT_DEFINE parameters Date: Tue, 26 Nov 2019 21:13:16 +0100 [thread overview] Message-ID: <feab2b2c94c63f4b7f1378edfda0cdae63108539.1574798487.git.msuchanek@suse.de> (raw) In-Reply-To: <cover.1574798487.git.msuchanek@suse.de> From: Nicholas Piggin <npiggin@gmail.com> No generated code change. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/kernel/exceptions-64s.S | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index e6ad6e6cf65e..591ae2a73e18 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -206,6 +206,9 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) #define IMASK .L_IMASK_\name\() #define IKVM_REAL .L_IKVM_REAL_\name\() #define IKVM_VIRT .L_IKVM_VIRT_\name\() +#define ISTACK .L_ISTACK_\name\() +#define IRECONCILE .L_IRECONCILE_\name\() +#define IKUAP .L_IKUAP_\name\() #define INT_DEFINE_BEGIN(n) \ .macro int_define_ ## n name @@ -246,6 +249,15 @@ do_define_int n .ifndef IKVM_VIRT IKVM_VIRT=0 .endif + .ifndef ISTACK + ISTACK=1 + .endif + .ifndef IRECONCILE + IRECONCILE=1 + .endif + .ifndef IKUAP + IKUAP=1 + .endif .endm .macro INT_KVM_HANDLER name, vec, hsrr, area, skip @@ -670,6 +682,10 @@ END_FTR_SECTION_NESTED(CPU_FTR_CFAR, CPU_FTR_CFAR, 66) .endif .endm +.macro GEN_COMMON name + INT_COMMON IVEC, IAREA, ISTACK, IKUAP, IRECONCILE, IDAR, IDSISR +.endm + /* * Restore all registers including H/SRR0/1 saved in a stack frame of a * standard exception. @@ -1221,13 +1237,7 @@ EXC_VIRT_BEGIN(data_access, 0x4300, 0x80) EXC_VIRT_END(data_access, 0x4300, 0x80) INT_KVM_HANDLER data_access, 0x300, EXC_STD, PACA_EXGEN, 1 EXC_COMMON_BEGIN(data_access_common) - /* - * Here r13 points to the paca, r9 contains the saved CR, - * SRR0 and SRR1 are saved in r11 and r12, - * r9 - r13 are saved in paca->exgen. - * EX_DAR and EX_DSISR have saved DAR/DSISR - */ - INT_COMMON 0x300, PACA_EXGEN, 1, 1, 1, 1, 1 + GEN_COMMON data_access ld r4,_DAR(r1) ld r5,_DSISR(r1) BEGIN_MMU_FTR_SECTION -- 2.23.0
next prev parent reply other threads:[~2019-11-26 20:14 UTC|newest] Thread overview: 80+ 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 ` 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 ` Michal Suchanek 2019-11-26 20:13 ` Michal Suchanek [this message] 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` Michal Suchanek 2019-11-26 20:13 ` [PATCH v2 09/35] powerpc/64s/exception: Add ISIDE option Michal Suchanek 2019-11-26 20:13 ` 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 ` 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 ` Michal Suchanek 2019-11-26 20:13 ` [PATCH v2 12/35] powerpc/64s/exception: move KVM " Michal Suchanek 2019-11-26 20:13 ` 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 2019-11-26 20:13 ` [PATCH v2 14/35] powerpc/64s/exception: remove the SPR saving patch code macros Michal Suchanek 2019-11-26 20:13 ` Michal Suchanek 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` Michal Suchanek 2019-11-26 20:13 ` [PATCH v2 24/35] powerpc/64s: interrupt return " Michal Suchanek 2019-11-26 20:13 ` 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 ` 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 20:13 ` Michal Suchanek 2019-11-26 21:44 ` Luc Van Oostenryck 2019-11-26 21:44 ` Luc Van Oostenryck 2019-11-27 7:30 ` Christophe Leroy 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 ` 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 ` Michal Suchanek 2019-11-26 20:13 ` [PATCH v2 29/35] powerpc/perf: remove current_is_64bit() Michal Suchanek 2019-11-26 20:13 ` Michal Suchanek 2019-11-27 5:41 ` Christophe Leroy 2019-11-27 5:41 ` Christophe Leroy 2019-11-27 9:49 ` Michal Suchánek 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 ` Michal Suchanek 2019-11-26 20:13 ` [PATCH v2 31/35] powerpc/perf: consolidate valid_user_sp Michal Suchanek 2019-11-26 20:13 ` 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 ` 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 ` 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 ` 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 2019-11-26 20:13 ` 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=feab2b2c94c63f4b7f1378edfda0cdae63108539.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.