linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 rebase 01/34] powerpc/64s/exception: Introduce INT_DEFINE parameter block for code generation
Date: Wed, 27 Nov 2019 11:38:37 +0100	[thread overview]
Message-ID: <1183b3557ef23d7b8d00243f0b828e47ba40a013.1574803684.git.msuchanek@suse.de> (raw)
In-Reply-To: <cover.1574803684.git.msuchanek@suse.de>

From: Nicholas Piggin <npiggin@gmail.com>

The code generation macro arguments are difficult to read, and
defaults can't easily be used.

This introduces a block where parameters can be set for interrupt
handler code generation by the subsequent macros, and adds the first
generation macro for interrupt entry.

One interrupt handler is converted to the new macros to demonstrate
the change, the rest will be coverted all at once.

No generated code change.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/kernel/exceptions-64s.S | 77 ++++++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 46508b148e16..0be6d8c34536 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -193,6 +193,61 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 	mtctr	reg;							\
 	bctr
 
+/*
+ * Interrupt code generation macros
+ */
+#define IVEC		.L_IVEC_\name\()
+#define IHSRR		.L_IHSRR_\name\()
+#define IAREA		.L_IAREA_\name\()
+#define IDAR		.L_IDAR_\name\()
+#define IDSISR		.L_IDSISR_\name\()
+#define ISET_RI		.L_ISET_RI_\name\()
+#define IEARLY		.L_IEARLY_\name\()
+#define IMASK		.L_IMASK_\name\()
+#define IKVM_REAL	.L_IKVM_REAL_\name\()
+#define IKVM_VIRT	.L_IKVM_VIRT_\name\()
+
+#define INT_DEFINE_BEGIN(n)						\
+.macro int_define_ ## n name
+
+#define INT_DEFINE_END(n)						\
+.endm ;									\
+int_define_ ## n n ;							\
+do_define_int n
+
+.macro do_define_int name
+	.ifndef IVEC
+		.error "IVEC not defined"
+	.endif
+	.ifndef IHSRR
+		IHSRR=EXC_STD
+	.endif
+	.ifndef IAREA
+		IAREA=PACA_EXGEN
+	.endif
+	.ifndef IDAR
+		IDAR=0
+	.endif
+	.ifndef IDSISR
+		IDSISR=0
+	.endif
+	.ifndef ISET_RI
+		ISET_RI=1
+	.endif
+	.ifndef IEARLY
+		IEARLY=0
+	.endif
+	.ifndef IMASK
+		IMASK=0
+	.endif
+	.ifndef IKVM_REAL
+		IKVM_REAL=0
+	.endif
+	.ifndef IKVM_VIRT
+		IKVM_VIRT=0
+	.endif
+.endm
+
 .macro INT_KVM_HANDLER name, vec, hsrr, area, skip
 	TRAMP_KVM_BEGIN(\name\()_kvm)
 	KVM_HANDLER \vec, \hsrr, \area, \skip
@@ -474,7 +529,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948)
 	 */
 	GET_SCRATCH0(r10)
 	std	r10,\area\()+EX_R13(r13)
-	.if \dar
+	.if \dar == 1
 	.if \hsrr
 	mfspr	r10,SPRN_HDAR
 	.else
@@ -482,7 +537,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948)
 	.endif
 	std	r10,\area\()+EX_DAR(r13)
 	.endif
-	.if \dsisr
+	.if \dsisr == 1
 	.if \hsrr
 	mfspr	r10,SPRN_HDSISR
 	.else
@@ -506,6 +561,14 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948)
 	.endif
 .endm
 
+.macro GEN_INT_ENTRY name, virt, ool=0
+	.if ! \virt
+		INT_HANDLER \name, IVEC, \ool, IEARLY, \virt, IHSRR, IAREA, ISET_RI, IDAR, IDSISR, IMASK, IKVM_REAL
+	.else
+		INT_HANDLER \name, IVEC, \ool, IEARLY, \virt, IHSRR, IAREA, ISET_RI, IDAR, IDSISR, IMASK, IKVM_VIRT
+	.endif
+.endm
+
 /*
  * On entry r13 points to the paca, r9-r13 are saved in the paca,
  * r9 contains the saved CR, r11 and r12 contain the saved SRR0 and
@@ -1143,12 +1206,18 @@ END_FTR_SECTION_IFSET(CPU_FTR_HVMODE)
 	bl	unrecoverable_exception
 	b	.
 
+INT_DEFINE_BEGIN(data_access)
+	IVEC=0x300
+	IDAR=1
+	IDSISR=1
+	IKVM_REAL=1
+INT_DEFINE_END(data_access)
 
 EXC_REAL_BEGIN(data_access, 0x300, 0x80)
-	INT_HANDLER data_access, 0x300, ool=1, dar=1, dsisr=1, kvm=1
+	GEN_INT_ENTRY data_access, virt=0, ool=1
 EXC_REAL_END(data_access, 0x300, 0x80)
 EXC_VIRT_BEGIN(data_access, 0x4300, 0x80)
-	INT_HANDLER data_access, 0x300, virt=1, dar=1, dsisr=1
+	GEN_INT_ENTRY data_access, virt=1
 EXC_VIRT_END(data_access, 0x4300, 0x80)
 INT_KVM_HANDLER data_access, 0x300, EXC_STD, PACA_EXGEN, 1
 EXC_COMMON_BEGIN(data_access_common)
-- 
2.23.0


  reply	other threads:[~2019-11-27 10:39 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-27 10:38 [PATCH v2 rebase 00/34] exception cleanup, syscall in C and !COMPAT Michal Suchanek
2019-11-27 10:38 ` Michal Suchanek [this message]
2019-11-27 10:38 ` [PATCH v2 rebase 02/34] powerpc/64s/exception: Add GEN_COMMON macro that uses INT_DEFINE parameters Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 03/34] powerpc/64s/exception: Add GEN_KVM " Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 04/34] powerpc/64s/exception: Expand EXC_COMMON and EXC_COMMON_ASYNC macros Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 05/34] powerpc/64s/exception: Move all interrupt handlers to new style code gen macros Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 06/34] powerpc/64s/exception: Remove old INT_ENTRY macro Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 07/34] powerpc/64s/exception: Remove old INT_COMMON macro Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 08/34] powerpc/64s/exception: Remove old INT_KVM_HANDLER Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 09/34] powerpc/64s/exception: Add ISIDE option Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 10/34] powerpc/64s/exception: move real->virt switch into the common handler Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 11/34] powerpc/64s/exception: move soft-mask test to common code Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 12/34] powerpc/64s/exception: move KVM " Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 13/34] powerpc/64s/exception: remove confusing IEARLY option Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 14/34] powerpc/64s/exception: remove the SPR saving patch code macros Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 15/34] powerpc/64s/exception: trim unused arguments from KVMTEST macro Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 16/34] powerpc/64s/exception: hdecrementer avoid touching the stack Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 17/34] powerpc/64s/exception: re-inline some handlers Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 18/34] powerpc/64s/exception: Clean up SRR specifiers Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 19/34] powerpc/64s/exception: add more comments for interrupt handlers Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 20/34] powerpc/64s/exception: only test KVM in SRR interrupts when PR KVM is supported Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 21/34] powerpc/64s/exception: soft nmi interrupt should not use ret_from_except Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 22/34] powerpc/64: system call remove non-volatile GPR save optimisation Michal Suchanek
2019-11-27 10:38 ` [PATCH v2 rebase 23/34] powerpc/64: system call implement the bulk of the logic in C Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 24/34] powerpc/64s: interrupt return " Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 25/34] powerpc/64s/exception: remove lite interrupt return Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 26/34] powerpc/64: system call: Fix sparse warning about missing declaration Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 27/34] powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 28/34] powerpc: move common register copy functions from signal_32.c to signal.c Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 29/34] powerpc/perf: consolidate read_user_stack_32 Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 30/34] powerpc/perf: consolidate valid_user_sp Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 31/34] powerpc/64: make buildable without CONFIG_COMPAT Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 32/34] powerpc/64: Make COMPAT user-selectable disabled on littleendian by default Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 33/34] powerpc/perf: split callchain.c by bitness Michal Suchanek
2019-11-27 10:39 ` [PATCH v2 rebase 34/34] 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=1183b3557ef23d7b8d00243f0b828e47ba40a013.1574803684.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).