From: Thomas Huth <thuth@redhat.com>
To: kvm@vger.kernel.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>
Cc: David Hildenbrand <david@redhat.com>,
Janosch Frank <frankja@linux.ibm.com>
Subject: [kvm-unit-tests PULL 15/17] s390x: Prepare for external calls
Date: Wed, 25 Sep 2019 18:37:12 +0200 [thread overview]
Message-ID: <20190925163714.27519-16-thuth@redhat.com> (raw)
In-Reply-To: <20190925163714.27519-1-thuth@redhat.com>
From: Janosch Frank <frankja@linux.ibm.com>
With SMP we also get new external interrupts like external call and
emergency call. Let's make them known.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190920080356.1948-6-frankja@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
lib/s390x/asm/arch_def.h | 5 +++++
lib/s390x/asm/interrupt.h | 3 +++
lib/s390x/interrupt.c | 23 +++++++++++++++++++----
3 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
index d5a7f51..96cca2e 100644
--- a/lib/s390x/asm/arch_def.h
+++ b/lib/s390x/asm/arch_def.h
@@ -19,6 +19,11 @@ struct psw {
#define PSW_MASK_DAT 0x0400000000000000UL
#define PSW_MASK_PSTATE 0x0001000000000000UL
+#define CR0_EXTM_SCLP 0X0000000000000200UL
+#define CR0_EXTM_EXTC 0X0000000000002000UL
+#define CR0_EXTM_EMGC 0X0000000000004000UL
+#define CR0_EXTM_MASK 0X0000000000006200UL
+
struct lowcore {
uint8_t pad_0x0000[0x0080 - 0x0000]; /* 0x0000 */
uint32_t ext_int_param; /* 0x0080 */
diff --git a/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h
index f485e96..4cfade9 100644
--- a/lib/s390x/asm/interrupt.h
+++ b/lib/s390x/asm/interrupt.h
@@ -11,6 +11,8 @@
#define _ASMS390X_IRQ_H_
#include <asm/arch_def.h>
+#define EXT_IRQ_EMERGENCY_SIG 0x1201
+#define EXT_IRQ_EXTERNAL_CALL 0x1202
#define EXT_IRQ_SERVICE_SIG 0x2401
void handle_pgm_int(void);
@@ -19,6 +21,7 @@ void handle_mcck_int(void);
void handle_io_int(void);
void handle_svc_int(void);
void expect_pgm_int(void);
+void expect_ext_int(void);
uint16_t clear_pgm_int(void);
void check_pgm_int_code(uint16_t code);
diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c
index 7832711..5cade23 100644
--- a/lib/s390x/interrupt.c
+++ b/lib/s390x/interrupt.c
@@ -15,6 +15,7 @@
#include <sclp.h>
static bool pgm_int_expected;
+static bool ext_int_expected;
static struct lowcore *lc;
void expect_pgm_int(void)
@@ -24,6 +25,13 @@ void expect_pgm_int(void)
mb();
}
+void expect_ext_int(void)
+{
+ ext_int_expected = true;
+ lc->ext_int_code = 0;
+ mb();
+}
+
uint16_t clear_pgm_int(void)
{
uint16_t code;
@@ -108,15 +116,22 @@ void handle_pgm_int(void)
void handle_ext_int(void)
{
- if (lc->ext_int_code != EXT_IRQ_SERVICE_SIG) {
+ if (!ext_int_expected &&
+ lc->ext_int_code != EXT_IRQ_SERVICE_SIG) {
report_abort("Unexpected external call interrupt: at %#lx",
lc->ext_old_psw.addr);
- } else {
- lc->ext_old_psw.mask &= ~PSW_MASK_EXT;
+ return;
+ }
+
+ if (lc->ext_int_code == EXT_IRQ_SERVICE_SIG) {
lc->sw_int_cr0 &= ~(1UL << 9);
sclp_handle_ext();
- lc->ext_int_code = 0;
+ } else {
+ ext_int_expected = false;
}
+
+ if (!(lc->sw_int_cr0 & CR0_EXTM_MASK))
+ lc->ext_old_psw.mask &= ~PSW_MASK_EXT;
}
void handle_mcck_int(void)
--
2.18.1
next prev parent reply other threads:[~2019-09-25 16:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 16:36 [kvm-unit-tests PULL 00/17] New s390x kvm-unit-tests and some fixes Thomas Huth
2019-09-25 16:36 ` [kvm-unit-tests PULL 01/17] s390x: Support PSW restart boot Thomas Huth
2019-09-25 16:36 ` [kvm-unit-tests PULL 02/17] s390x: Diag288 test Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 03/17] s390x: Move stsi to library Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 04/17] s390x: STSI tests Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 05/17] s390x: Add diag308 subcode 0 testing Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 06/17] s390x: Move pfmf to lib and make address void Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 07/17] s390x: Storage key library functions now take void ptr addresses Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 08/17] s390x: Bump march to zEC12 Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 09/17] s390x: Add storage key removal facility Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 10/17] s390x: Fix stsi unaligned test and add selector tests Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 11/17] s390x: Use interrupts in SCLP and add locking Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 12/17] s390x: Add linemode console Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 13/17] s390x: Add linemode buffer to fix newline on every print Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 14/17] s390x: Add initial smp code Thomas Huth
2019-09-25 16:37 ` Thomas Huth [this message]
2019-09-25 16:37 ` [kvm-unit-tests PULL 16/17] s390x: SMP test Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 17/17] s390x: Free allocated page in iep test Thomas Huth
2019-09-25 16:39 ` [kvm-unit-tests PULL 00/17] New s390x kvm-unit-tests and some fixes Paolo Bonzini
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=20190925163714.27519-16-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.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 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.