From: Michael Ellerman <mpe@ellerman.id.au>
To: linuxppc-dev@ozlabs.org
Cc: npiggin@gmail.com
Subject: [PATCH v3 26/42] powerpc/64s: Consolidate Hypervisor Virtualization 0xea0 interrupt
Date: Wed, 5 Oct 2016 11:22:48 +1100 [thread overview]
Message-ID: <1475626984-18770-27-git-send-email-mpe@ellerman.id.au> (raw)
In-Reply-To: <1475626984-18770-1-git-send-email-mpe@ellerman.id.au>
From: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/kernel/exceptions-64s.S | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 3e347c72a941..54e352d6b50c 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -1015,6 +1015,12 @@ EXC_COMMON_ASYNC(h_doorbell_common, 0xe80, unknown_exception)
__EXC_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0, 0xec0)
+__TRAMP_REAL_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0)
+__EXC_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0)
+__TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0xea0)
+TRAMP_KVM_HV(PACA_EXGEN, 0xea0)
+EXC_COMMON_ASYNC(h_virt_irq_common, 0xea0, do_IRQ)
+
EXC_REAL_NONE(0xec0, 0xf00)
@@ -1153,10 +1159,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
b .
#endif
- /* moved from 0xe00 */
-__TRAMP_REAL_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0)
-TRAMP_KVM_HV(PACA_EXGEN, 0xea0)
-
/* moved from 0xf00 */
__TRAMP_REAL_REAL_OOL(performance_monitor, 0xf00)
TRAMP_KVM(PACA_EXGEN, 0xf00)
@@ -1293,7 +1295,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt)
/*** Common interrupt handlers ***/
-EXC_COMMON_ASYNC(h_virt_irq_common, 0xea0, do_IRQ)
EXC_COMMON_ASYNC(performance_monitor_common, 0xf00, performance_monitor_exception)
EXC_COMMON(instruction_breakpoint_common, 0x1300, instruction_breakpoint_exception)
EXC_COMMON_HV(denorm_common, 0x1500, unknown_exception)
@@ -1319,8 +1320,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception)
* come here.
*/
-__EXC_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0)
-
EXC_VIRT_NONE(0x4ec0, 0x4f00)
__EXC_VIRT_OOL(performance_monitor, 0x4f00, 0x4f20)
@@ -1422,7 +1421,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX)
b ret_from_except
/* Equivalents to the above handlers for relocation-on interrupt vectors */
-__TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0xea0)
__TRAMP_REAL_VIRT_OOL(performance_monitor, 0xf00)
__TRAMP_REAL_VIRT_OOL(altivec_unavailable, 0xf20)
__TRAMP_REAL_VIRT_OOL(vsx_unavailable, 0xf40)
--
2.7.4
next prev parent reply other threads:[~2016-10-05 0:23 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-05 0:22 [PATCH v3 00/42] powerpc/64: use asm sections for head/exception layout Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 01/42] powerpc/64s: Add new exception vector macros Michael Ellerman
2016-10-05 2:36 ` [v3,01/42] " Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 02/42] powerpc/64s: Consolidate exception handler alignment Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 03/42] powerpc/64: Change the way relocation copy is calculated Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 04/42] powerpc: Use gas sections for arranging exception vectors Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 05/42] powerpc/64s: Consolidate System Reset 0x100 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 06/42] powerpc/64s: Consolidate Machine Check 0x200 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 07/42] powerpc/64s: Consolidate Data Storage 0x300 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 08/42] powerpc/64s: Consolidate Data Segment 0x380 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 09/42] powerpc/64s: Consolidate Instruction Storage 0x400 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 10/42] powerpc/64s: Consolidate Instruction Segment 0x480 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 11/42] powerpc/64s: Consolidate External 0x500 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 12/42] powerpc/64s: Consolidate Alignment 0x600 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 13/42] powerpc/64s: Consolidate Program 0x700 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 14/42] powerpc/64s: Consolidate FP Unavailable 0x800 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 15/42] powerpc/64s: Consolidate Decrementer 0x900 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 16/42] powerpc/64s: Consolidate Hypervisor Decrementer 0x980 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 17/42] powerpc/64s: Consolidate Directed Privileged Doorbell 0xa00 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 18/42] powerpc/64s: Consolidate Reserved 0xb00 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 19/42] powerpc/64s: Consolidate System Call 0xc00 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 20/42] powerpc/64s: Consolidate Trace 0xd00 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 21/42] powerpc/64s: Consolidate Hypervisor Data Storage 0xe00 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 22/42] powerpc/64s: Consolidate Hypervisor Instruction Storage 0xe20 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 23/42] powerpc/64s: Consolidate Hypervisor Emulation Assistance 0xe40 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 24/42] powerpc/64s: Consolidate Hypervisor Maintenance 0xe60 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 25/42] powerpc/64s: Consolidate Directed Hypervisor Doorbell 0xe80 interrupt Michael Ellerman
2016-10-05 0:22 ` Michael Ellerman [this message]
2016-10-05 0:22 ` [PATCH v3 27/42] powerpc/64s: Consolidate Reserved 0xec0, 0xee0 interrupts Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 28/42] powerpc/64s: Consolidate Performance Monitor 0xf00 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 29/42] powerpc/64s: Consolidate Vector Unavailable 0xf20 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 30/42] powerpc/64s: Consolidate VSX Unavailable 0xf40 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 31/42] powerpc/64s: Consolidate Facility Unavailable 0xf60 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 32/42] powerpc/64s: Consolidate Hypervisor Facility Unavailable 0xf80 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 33/42] powerpc/64s: Consolidate Reserved 0xfa0-0x1200 interrupts Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 34/42] powerpc/64s: Consolidate CBE System Error 0x1200 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 35/42] powerpc/64s: Consolidate Instruction Breakpoint 0x1300 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 36/42] powerpc/64s: Consolidate Softpatch 0x1500 interrupt Michael Ellerman
2016-10-05 0:22 ` [PATCH v3 37/42] powerpc/64s: Consolidate Debug 0x1600 interrupt Michael Ellerman
2016-10-05 0:23 ` [PATCH v3 38/42] powerpc/64s: Consolidate Altivec 0x1700 interrupt Michael Ellerman
2016-10-05 0:23 ` [PATCH v3 39/42] powerpc/64s: Consolidate CBE Thermal 0x1800 interrupt Michael Ellerman
2016-10-05 0:23 ` [PATCH v3 40/42] powerpc/64s: Move __replay_interrupt function below handlers Michael Ellerman
2016-10-05 0:23 ` [PATCH v3 41/42] powerpc/64s: Use a single macro for both parts of OOL exception Michael Ellerman
2016-10-05 0:23 ` [PATCH v3 42/42] powerpc/64s: Remove unused exception code, small cleanups Michael Ellerman
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=1475626984-18770-27-git-send-email-mpe@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=linuxppc-dev@ozlabs.org \
--cc=npiggin@gmail.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).