From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH 08/17] powerpc/64s/exception: KVM handler can set the HSRR trap bit
Date: Tue, 5 Feb 2019 00:18:19 +1000 [thread overview]
Message-ID: <20190204141828.13043-9-npiggin@gmail.com> (raw)
In-Reply-To: <20190204141828.13043-1-npiggin@gmail.com>
Move the KVM trap HSRR bit, into the KVM handler, which can be
conditionally applied when hsrr parameter is set.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/include/asm/exception-64s.h | 5 +++++
arch/powerpc/include/asm/head-64.h | 7 ++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index cecef7166a0c..c78d9b1bf22d 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -453,7 +453,12 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
ld r10,\area+EX_R10(r13)
std r12,HSTATE_SCRATCH0(r13)
sldi r12,r9,32
+ /* HSRR variants have the 0x2 bit added to their trap number */
+ .if \hsrr
+ ori r12,r12,(\n + 0x2)
+ .else
ori r12,r12,(\n)
+ .endif
/* This reloads r9 before branching to kvmppc_interrupt */
__BRANCH_TO_KVM_EXIT(\area, kvmppc_interrupt)
diff --git a/arch/powerpc/include/asm/head-64.h b/arch/powerpc/include/asm/head-64.h
index 518d9758b41e..bdd67a26e959 100644
--- a/arch/powerpc/include/asm/head-64.h
+++ b/arch/powerpc/include/asm/head-64.h
@@ -393,16 +393,13 @@ end_##sname:
TRAMP_KVM_BEGIN(do_kvm_##n); \
KVM_HANDLER area, EXC_STD, n, 1
-/*
- * HV variant exceptions get the 0x2 bit added to their trap number.
- */
#define TRAMP_KVM_HV(area, n) \
TRAMP_KVM_BEGIN(do_kvm_H##n); \
- KVM_HANDLER area, EXC_HV, n + 0x2, 0
+ KVM_HANDLER area, EXC_HV, n, 0
#define TRAMP_KVM_HV_SKIP(area, n) \
TRAMP_KVM_BEGIN(do_kvm_H##n); \
- KVM_HANDLER area, EXC_HV, n + 0x2, 1
+ KVM_HANDLER area, EXC_HV, n, 1
#define EXC_COMMON(name, realvec, hdlr) \
EXC_COMMON_BEGIN(name); \
--
2.18.0
next prev parent reply other threads:[~2019-02-04 14:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 14:18 [PATCH 00/17] powerpc/64s: tidy and gasify exception handler code, round 1 Nicholas Piggin
2019-02-04 14:18 ` [PATCH 01/17] powerpc/64s/exception: fix some line wrap and semicolon inconsistencies in macros Nicholas Piggin
2019-02-04 14:18 ` [PATCH 02/17] powerpc/64s/exception: remove H concatenation for EXC_HV variants Nicholas Piggin
2019-02-04 21:55 ` kbuild test robot
2019-02-04 14:18 ` [PATCH 03/17] powerpc/64s/exception: consolidate EXCEPTION_PROLOG_2 with _NORI variant Nicholas Piggin
2019-02-04 14:18 ` [PATCH 04/17] powerpc/64s/exception: move and tidy EXCEPTION_PROLOG_2 variants Nicholas Piggin
2019-02-04 14:18 ` [PATCH 05/17] powerpc/64s/exception: remove the "extra" macro parameter Nicholas Piggin
2019-02-04 14:18 ` [PATCH 06/17] powerpc/64s/exception: consolidate maskable and non-maskable prologs Nicholas Piggin
2019-02-04 14:18 ` [PATCH 07/17] powerpc/64s/exception: merge KVM handler and skip variants Nicholas Piggin
2019-02-04 14:18 ` Nicholas Piggin [this message]
2019-02-04 14:18 ` [PATCH 09/17] powerpc/64s/exception: Make EXCEPTION_PROLOG_0 a gas macro for consistency with others Nicholas Piggin
2019-02-04 14:18 ` [PATCH 10/17] powerpc/64s/exception: Move EXCEPTION_COMMON handler and return branches into callers Nicholas Piggin
2019-02-04 14:18 ` [PATCH 11/17] powerpc/64s/exception: Move EXCEPTION_COMMON additions " Nicholas Piggin
2019-02-04 14:18 ` [PATCH 12/17] powerpc/64s/exception: unwind exception-64s.h macros Nicholas Piggin
2019-02-04 23:32 ` kbuild test robot
2019-02-04 14:18 ` [PATCH 13/17] powerpc/64s/exception: move EXCEPTION_PROLOG_2* to a more logical place Nicholas Piggin
2019-02-04 14:18 ` [PATCH 14/17] powerpc/64s/exception: remove STD_EXCEPTION_COMMON variants Nicholas Piggin
2019-02-04 14:18 ` [PATCH 15/17] powerpc/64s/exception: move KVM related code together Nicholas Piggin
2019-02-04 14:18 ` [PATCH 16/17] powerpc/64s/exception: move exception-64s.h code to exception-64s.S where it is used Nicholas Piggin
2019-02-04 14:18 ` [PATCH 17/17] powerpc/64s/exception: move head-64.h " Nicholas Piggin
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=20190204141828.13043-9-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.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).