We want the tests to automatically work with or without protected
virtualisation.
To do this we need to share the I/O memory with the host.
Let's replace all static allocations with dynamic allocations
to clearly separate shared and private memory.
Signed-off-by: Pierre Morel <pmorel@xxxxxxxxxxxxx>
Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx>
Reviewed-by: Cornelia Huck <cohuck@xxxxxxxxxx>
Acked-by: Janosch Frank <frankja@xxxxxxxxxx>
---
lib/s390x/css.h | 3 +--
lib/s390x/css_lib.c | 28 ++++++++--------------------
s390x/css.c | 43 +++++++++++++++++++++++++++++++------------
3 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/lib/s390x/css.h b/lib/s390x/css.h
index d10d265..3e57445 100644
--- a/lib/s390x/css.h
+++ b/lib/s390x/css.h
@@ -281,8 +281,7 @@ int css_enable(int schid, int isc);
/* Library functions */
int start_ccw1_chain(unsigned int sid, struct ccw1 *ccw);
-int start_single_ccw(unsigned int sid, int code, void *data, int count,
- unsigned char flags);
+struct ccw1 *ccw_alloc(int code, void *data, int count, unsigned char flags);
void css_irq_io(void);
int css_residual_count(unsigned int schid);
diff --git a/lib/s390x/css_lib.c b/lib/s390x/css_lib.c
index 5af6f77..3c24480 100644
--- a/lib/s390x/css_lib.c
+++ b/lib/s390x/css_lib.c
@@ -16,6 +16,7 @@
#include <asm/time.h>
#include <asm/arch_def.h>
+#include <malloc_io.h>
#include <css.h>
static struct schib schib;
@@ -200,33 +201,20 @@ int start_ccw1_chain(unsigned int sid, struct ccw1 *ccw)
return ssch(sid, &orb);
}
-/*
- * In the future, we want to implement support for CCW chains;
- * for that, we will need to work with ccw1 pointers.
- */
-static struct ccw1 unique_ccw;
-
-int start_single_ccw(unsigned int sid, int code, void *data, int count,
- unsigned char flags)
+struct ccw1 *ccw_alloc(int code, void *data, int count, unsigned char flags)
{
- int cc;
- struct ccw1 *ccw = &unique_ccw;
+ struct ccw1 *ccw;
+
+ ccw = alloc_io_mem(sizeof(*ccw), 0);
+ if (!ccw)
+ return NULL;
- report_prefix_push("start_subchannel");
- /* Build the CCW chain with a single CCW */
ccw->code = code;
ccw->flags = flags;
ccw->count = count;
ccw->data_address = (int)(unsigned long)data;
- cc = start_ccw1_chain(sid, ccw);
- if (cc) {
- report(0, "cc = %d", cc);
- report_prefix_pop();
- return cc;
- }
- report_prefix_pop();
- return 0;
+ return ccw;
}
/* wait_and_check_io_completion:
diff --git a/s390x/css.c b/s390x/css.c
index 23a7b7c..1a61a5c 100644
--- a/s390x/css.c
+++ b/s390x/css.c
@@ -15,13 +15,15 @@
#include <interrupt.h>
#include <asm/arch_def.h>
+#include <malloc_io.h>
#include <css.h>
+#include <asm/barrier.h>
#define DEFAULT_CU_TYPE 0x3832 /* virtio-ccw */
static unsigned long cu_type = DEFAULT_CU_TYPE;
static int test_device_sid;
-static struct senseid senseid;
+static struct senseid *senseid;
static void test_enumerate(void)
{
@@ -55,6 +57,7 @@ static void test_enable(void)
*/
static void test_sense(void)
{
+ struct ccw1 *ccw;
int ret;
int len;
@@ -78,11 +81,23 @@ static void test_sense(void)
lowcore_ptr->io_int_param = 0;
- memset(&senseid, 0, sizeof(senseid));
- ret = start_single_ccw(test_device_sid, CCW_CMD_SENSE_ID,
- &senseid, sizeof(senseid), CCW_F_SLI);
- if (ret)
+ senseid = alloc_io_mem(sizeof(*senseid), 0);
+ if (!senseid) {
+ report(0, "Allocation of senseid");
+ goto error_senseid;
+ }
+
+ ccw = ccw_alloc(CCW_CMD_SENSE_ID, senseid, sizeof(*senseid), CCW_F_SLI);
+ if (!ccw) {
+ report(0, "Allocation of CCW");
+ goto error_ccw;
+ }
+
+ ret = start_ccw1_chain(test_device_sid, ccw);
+ if (ret) {
+ report(0, "Starting CCW chain");
goto error;
+ }
if (wait_and_check_io_completion(test_device_sid) < 0)
goto error;
@@ -95,7 +110,7 @@ static void test_sense(void)
if (ret < 0) {
report_info("no valid residual count");
} else if (ret != 0) {
- len = sizeof(senseid) - ret;
+ len = sizeof(*senseid) - ret;
if (ret && len < CSS_SENSEID_COMMON_LEN) {
report(0, "transferred a too short length: %d", ret);
goto error;
@@ -103,21 +118,25 @@ static void test_sense(void)
report_info("transferred a shorter length: %d", len);
}
- if (senseid.reserved != 0xff) {
- report(0, "transferred garbage: 0x%02x", senseid.reserved);
+ if (senseid->reserved != 0xff) {
+ report(0, "transferred garbage: 0x%02x", senseid->reserved);
goto error;
}
report_prefix_pop();
report_info("reserved 0x%02x cu_type 0x%04x cu_model 0x%02x dev_type 0x%04x dev_model 0x%02x",
- senseid.reserved, senseid.cu_type, senseid.cu_model,
- senseid.dev_type, senseid.dev_model);
+ senseid->reserved, senseid->cu_type, senseid->cu_model,
+ senseid->dev_type, senseid->dev_model);
- report(senseid.cu_type == cu_type, "cu_type expected 0x%04x got 0x%04x",
- (uint16_t) cu_type, senseid.cu_type);
+ report(senseid->cu_type == cu_type, "cu_type expected 0x%04x got 0x%04x",
+ (uint16_t)cu_type, senseid->cu_type);
error:
+ free_io_mem(ccw, sizeof(*ccw));
+error_ccw:
+ free_io_mem(senseid, sizeof(*senseid));
+error_senseid:
unregister_io_int_func(css_irq_io);
}
--
2.17.1
