[kvm-unit-tests PATCH v2 3/9] s390x: gs: move to new header file

Nico Boehr
2022-03-23T17:03:38Z

Move the guarded-storage related structs and instructions to a new
header file because we will also need them for the SIGP store additional
status tests in smp.c.

Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
lib/s390x/gs.h | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++
s390x/gs.c | 65 +---------------------------------------
2 files changed, 81 insertions(+), 64 deletions(-)
create mode 100644 lib/s390x/gs.h

diff --git a/lib/s390x/gs.h b/lib/s390x/gs.h
new file mode 100644
index 000000000000..e28fa4e1b893
--- /dev/null
+++ b/lib/s390x/gs.h
@@ -0,0 +1,80 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Guarded storage related definitions
+ *
+ * Copyright 2018 IBM Corp.
+ *
+ * Authors:
+ * Martin Schwidefsky <schwidefsky@de.ibm.com>
+ * Janosch Frank <frankja@linux.ibm.com>
+ */
+#include <stdint.h>
+
+#ifndef _S390X_GS_H_
+#define _S390X_GS_H_
+
+struct gs_cb {
+ uint64_t reserved;
+ uint64_t gsd;
+ uint64_t gssm;
+ uint64_t gs_epl_a;
+};
+
+struct gs_epl {
+ uint8_t pad1;
+ union {
+ uint8_t gs_eam;
+ struct {
+ uint8_t : 6;
+ uint8_t e : 1;
+ uint8_t b : 1;
+ };
+ };
+ union {
+ uint8_t gs_eci;
+ struct {
+ uint8_t tx : 1;
+ uint8_t cx : 1;
+ uint8_t : 5;
+ uint8_t in : 1;
+ };
+ };
+ union {
+ uint8_t gs_eai;
+ struct {
+ uint8_t : 1;
+ uint8_t t : 1;
+ uint8_t as : 2;
+ uint8_t ar : 4;
+ };
+ };
+ uint32_t pad2;
+ uint64_t gs_eha;
+ uint64_t gs_eia;
+ uint64_t gs_eoa;
+ uint64_t gs_eir;
+ uint64_t gs_era;
+};
+
+static inline void load_gs_cb(struct gs_cb *gs_cb)
+{
+ asm volatile(".insn rxy,0xe3000000004d,0,%0" : : "Q" (*gs_cb));
+}
+
+static inline void store_gs_cb(struct gs_cb *gs_cb)
+{
+ asm volatile(".insn rxy,0xe30000000049,0,%0" : : "Q" (*gs_cb));
+}
+
+static inline unsigned long load_guarded(unsigned long *p)
+{
+ unsigned long v;
+
+ asm(".insn rxy,0xe3000000004c, %0,%1"
+ : "=d" (v)
+ : "m" (*p)
+ : "r14", "memory");
+ return v;
+}
+
+#endif
diff --git a/s390x/gs.c b/s390x/gs.c
index 7567bb78fecb..248f387abf1b 100644
--- a/s390x/gs.c
+++ b/s390x/gs.c
@@ -13,49 +13,7 @@
#include <asm/facility.h>
#include <asm/interrupt.h>
#include <asm-generic/barrier.h>
-
-struct gs_cb {
- uint64_t reserved;
- uint64_t gsd;
- uint64_t gssm;
- uint64_t gs_epl_a;
-};
-
-struct gs_epl {
- uint8_t pad1;
- union {
- uint8_t gs_eam;
- struct {
- uint8_t : 6;
- uint8_t e : 1;
- uint8_t b : 1;
- };
- };
- union {
- uint8_t gs_eci;
- struct {
- uint8_t tx : 1;
- uint8_t cx : 1;
- uint8_t : 5;
- uint8_t in : 1;
- };
- };
- union {
- uint8_t gs_eai;
- struct {
- uint8_t : 1;
- uint8_t t : 1;
- uint8_t as : 2;
- uint8_t ar : 4;
- };
- };
- uint32_t pad2;
- uint64_t gs_eha;
- uint64_t gs_eia;
- uint64_t gs_eoa;
- uint64_t gs_eir;
- uint64_t gs_era;
-};
+#include <gs.h>

static volatile int guarded = 0;
static struct gs_cb gs_cb;
@@ -64,27 +22,6 @@ static unsigned long gs_area = 0x2000000;

void gs_handler(struct gs_cb *this_cb);

-static inline void load_gs_cb(struct gs_cb *gs_cb)
-{
- asm volatile(".insn rxy,0xe3000000004d,0,%0" : : "Q" (*gs_cb));
-}
-
-static inline void store_gs_cb(struct gs_cb *gs_cb)
-{
- asm volatile(".insn rxy,0xe30000000049,0,%0" : : "Q" (*gs_cb));
-}
-
-static inline unsigned long load_guarded(unsigned long *p)
-{
- unsigned long v;
-
- asm(".insn rxy,0xe3000000004c, %0,%1"
- : "=d" (v)
- : "m" (*p)
- : "r14", "memory");
- return v;
-}
-
/* guarded-storage event handler and finally it calls gs_handler */
extern void gs_handler_asm(void);
asm(".globl gs_handler_asm\n"
--
2.31.1