From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH v3 04/25] powerpc/64s/exception: fix sreset KVM test code
Date: Sat, 22 Jun 2019 23:15:14 +1000 [thread overview]
Message-ID: <20190622131535.20996-5-npiggin@gmail.com> (raw)
In-Reply-To: <20190622131535.20996-1-npiggin@gmail.com>
The sreset handler KVM test theoretically should not depend on P7.
In practice KVM now only supports P7 and up so no real bug fix, but
this change is made now so the quirk is not propagated through
cleanup patches.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/exceptions-64s.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 4ebe39c74aa0..1a2ad5a022e8 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -126,10 +126,10 @@ EXC_VIRT_NONE(0x4000, 0x100)
bltlr cr1 ; /* no state loss, return to idle caller */ \
BRANCH_TO_C000(r10, system_reset_idle_common) ; \
1: \
- KVMTEST_PR(n) ; \
- END_FTR_SECTION_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)
+ END_FTR_SECTION_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206) ; \
+ KVMTEST_PR(n)
#else
-#define IDLETEST NOTEST
+#define IDLETEST KVMTEST_PR
#endif
EXC_REAL_BEGIN(system_reset, 0x100, 0x100)
--
2.20.1
next prev parent reply other threads:[~2019-06-22 13:32 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-22 13:15 [PATCH v3 00/25] powerpc/64s interrupt handler cleanups, gasification Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 01/25] powerpc/64s/exception: remove H concatenation for EXC_HV variants Nicholas Piggin
2019-07-04 15:52 ` Michael Ellerman
2019-06-22 13:15 ` [PATCH v3 02/25] powerpc/64s/exception: consolidate EXCEPTION_PROLOG_2 with _NORI variant Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 03/25] powerpc/64s/exception: move and tidy EXCEPTION_PROLOG_2 variants Nicholas Piggin
2019-06-22 13:15 ` Nicholas Piggin [this message]
2019-06-22 13:15 ` [PATCH v3 05/25] powerpc/64s/exception: remove the "extra" macro parameter Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 06/25] powerpc/64s/exception: consolidate maskable and non-maskable prologs Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 07/25] powerpc/64s/exception: merge KVM handler and skip variants Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 08/25] powerpc/64s/exception: KVM handler can set the HSRR trap bit Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 09/25] powerpc/64s/exception: Make EXCEPTION_PROLOG_0 a gas macro for consistency with others Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 10/25] powerpc/64s/exception: Move EXCEPTION_COMMON handler and return branches into callers Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 11/25] powerpc/64s/exception: Move EXCEPTION_COMMON additions " Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 12/25] powerpc/64s/exception: unwind exception-64s.h macros Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 13/25] powerpc/64s/exception: improve 0x500 handler code Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 14/25] powerpc/64s/exception: move EXCEPTION_PROLOG_2* to a more logical place Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 15/25] powerpc/64s/exception: remove STD_EXCEPTION_COMMON variants Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 16/25] powerpc/64s/exception: move KVM related code together Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 17/25] powerpc/64s/exception: move exception-64s.h code to exception-64s.S where it is used Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 18/25] powerpc/64s/exception: move head-64.h " Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 19/25] powerpc/64s/exception: remove __BRANCH_TO_KVM Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 20/25] powerpc/64s/exception: remove unused BRANCH_TO_COMMON Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 21/25] powerpc/64s/exception: use a gas macro for system call handler code Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 22/25] powerpc/64s/exception: fix indenting irregularities Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 23/25] powerpc/64s/exception: generate regs clear instructions using .rept Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 24/25] powerpc/64s/exception: remove pointless EXCEPTION_PROLOG macro indirection Nicholas Piggin
2019-06-22 13:15 ` [PATCH v3 25/25] powerpc/64s/exception: move paca save area offsets into exception-64s.S 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=20190622131535.20996-5-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).