kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pierre Morel <pmorel@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: linux-s390@vger.kernel.org, frankja@linux.ibm.com,
	david@redhat.com, thuth@redhat.com, cohuck@redhat.com
Subject: [kvm-unit-tests PATCH v7 02/12] s390x: Use PSW bits definitions in cstart
Date: Mon, 18 May 2020 18:07:21 +0200	[thread overview]
Message-ID: <1589818051-20549-3-git-send-email-pmorel@linux.ibm.com> (raw)
In-Reply-To: <1589818051-20549-1-git-send-email-pmorel@linux.ibm.com>

This patch defines the PSW bits EA/BA used to initialize the PSW masks
for exceptions.

Since some PSW mask definitions exist already in arch_def.h we add these
definitions there.
We move all PSW definitions together and protect assembler code against
C syntax.

Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
---
 lib/s390x/asm/arch_def.h | 15 +++++++++++----
 s390x/cstart64.S         | 15 ++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
index 15a4d49..820af93 100644
--- a/lib/s390x/asm/arch_def.h
+++ b/lib/s390x/asm/arch_def.h
@@ -10,15 +10,21 @@
 #ifndef _ASM_S390X_ARCH_DEF_H_
 #define _ASM_S390X_ARCH_DEF_H_
 
+#define PSW_MASK_EXT			0x0100000000000000UL
+#define PSW_MASK_DAT			0x0400000000000000UL
+#define PSW_MASK_SHORT_PSW		0x0008000000000000UL
+#define PSW_MASK_PSTATE			0x0001000000000000UL
+#define PSW_MASK_BA			0x0000000080000000UL
+#define PSW_MASK_EA			0x0000000100000000UL
+
+#define PSW_EXCEPTION_MASK	(PSW_MASK_EA | PSW_MASK_BA)
+
+#ifndef __ASSEMBLER__
 struct psw {
 	uint64_t	mask;
 	uint64_t	addr;
 };
 
-#define PSW_MASK_EXT			0x0100000000000000UL
-#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
@@ -297,4 +303,5 @@ static inline uint32_t get_prefix(void)
 	return current_prefix;
 }
 
+#endif /* __ASSEMBLER */
 #endif
diff --git a/s390x/cstart64.S b/s390x/cstart64.S
index 3c7d8a9..e890568 100644
--- a/s390x/cstart64.S
+++ b/s390x/cstart64.S
@@ -12,6 +12,7 @@
  */
 #include <asm/asm-offsets.h>
 #include <asm/sigp.h>
+#include <asm/arch_def.h>
 
 .section .init
 
@@ -232,19 +233,19 @@ svc_int:
 
 	.align	8
 reset_psw:
-	.quad	0x0008000180000000
+	.quad	PSW_EXCEPTION_MASK | PSW_MASK_SHORT_PSW
 initial_psw:
-	.quad	0x0000000180000000, clear_bss_start
+	.quad	PSW_EXCEPTION_MASK, clear_bss_start
 pgm_int_psw:
-	.quad	0x0000000180000000, pgm_int
+	.quad	PSW_EXCEPTION_MASK, pgm_int
 ext_int_psw:
-	.quad	0x0000000180000000, ext_int
+	.quad	PSW_EXCEPTION_MASK, ext_int
 mcck_int_psw:
-	.quad	0x0000000180000000, mcck_int
+	.quad	PSW_EXCEPTION_MASK, mcck_int
 io_int_psw:
-	.quad	0x0000000180000000, io_int
+	.quad	PSW_EXCEPTION_MASK, io_int
 svc_int_psw:
-	.quad	0x0000000180000000, svc_int
+	.quad	PSW_EXCEPTION_MASK, svc_int
 initial_cr0:
 	/* enable AFP-register control, so FP regs (+BFP instr) can be used */
 	.quad	0x0000000000040000
-- 
2.25.1


  parent reply	other threads:[~2020-05-18 16:07 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-18 16:07 [kvm-unit-tests PATCH v7 00/12] s390x: Testing the Channel Subsystem I/O Pierre Morel
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 01/12] s390x: saving regs for interrupts Pierre Morel
2020-05-26 10:30   ` Janosch Frank
2020-05-26 11:39     ` Pierre Morel
2020-05-18 16:07 ` Pierre Morel [this message]
2020-05-26 10:17   ` [kvm-unit-tests PATCH v7 02/12] s390x: Use PSW bits definitions in cstart Janosch Frank
2020-05-26 11:40     ` Pierre Morel
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 03/12] s390x: Move control register bit definitions and add AFP to them Pierre Morel
2020-05-25 18:57   ` Thomas Huth
2020-05-26 11:51     ` Pierre Morel
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 04/12] s390x: interrupt registration Pierre Morel
2020-05-26 18:08   ` Thomas Huth
2020-05-27 15:54     ` Pierre Morel
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 05/12] s390x: export the clock get_clock_ms() utility Pierre Morel
2020-05-26 18:10   ` Thomas Huth
2020-06-04  6:49     ` Pierre Morel
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 06/12] s390x: use get_clock_ms() to calculate a delay in ms Pierre Morel
2020-05-26 18:16   ` Thomas Huth
2020-06-04  7:21     ` Pierre Morel
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 07/12] s390x: Library resources for CSS tests Pierre Morel
2020-05-26 16:30   ` Cornelia Huck
2020-06-04  7:42     ` Pierre Morel
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 08/12] s390x: css: stsch, enumeration test Pierre Morel
2020-05-25 19:12   ` Thomas Huth
2020-05-26 10:41     ` Janosch Frank
2020-05-26 10:49       ` Thomas Huth
2020-05-26 11:38         ` Pierre Morel
2020-05-27  8:55   ` Cornelia Huck
2020-06-04 11:35     ` Pierre Morel
2020-06-04 11:45       ` Thomas Huth
2020-06-04 12:27         ` Pierre Morel
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 09/12] s390x: css: msch, enable test Pierre Morel
2020-05-27  9:42   ` Cornelia Huck
2020-06-04 12:46     ` Pierre Morel
2020-06-04 13:29       ` Cornelia Huck
2020-06-05  7:37         ` Pierre Morel
2020-06-05  8:24           ` Pierre Morel
2020-06-05  9:00             ` Cornelia Huck
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 10/12] s390x: define function to wait for interrupt Pierre Morel
2020-05-26 10:42   ` Janosch Frank
2020-05-26 11:40     ` Pierre Morel
2020-05-27  9:45   ` Cornelia Huck
2020-06-04 12:47     ` Pierre Morel
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 11/12] s390x: css: ssch/tsch with sense and interrupt Pierre Morel
2020-05-27 10:09   ` Cornelia Huck
2020-06-05  7:37     ` Pierre Morel
2020-06-05  9:02       ` Cornelia Huck
2020-05-18 16:07 ` [kvm-unit-tests PATCH v7 12/12] s390x: css: ping pong Pierre Morel

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=1589818051-20549-3-git-send-email-pmorel@linux.ibm.com \
    --to=pmorel@linux.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=david@redhat.com \
    --cc=frankja@linux.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=thuth@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 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).