From: Pierre Morel <pmorel@linux.ibm.com>
To: qemu-s390x@nongnu.org
Cc: thuth@redhat.com, frankja@linux.ibm.com, david@redhat.com,
cohuck@redhat.com, qemu-devel@nongnu.org, pasic@linux.ibm.com
Subject: [PATCH v3 1/1] s390x: css: pong, channel subsystem test device
Date: Thu, 20 Feb 2020 12:59:25 +0100 [thread overview]
Message-ID: <1582199965-21584-2-git-send-email-pmorel@linux.ibm.com> (raw)
In-Reply-To: <1582199965-21584-1-git-send-email-pmorel@linux.ibm.com>
This is a test device for channel subsystem.
Most of the CSS instructions are handled by the common code.
The PONG_READ and PONG_WRITE CCW commands allow to test the
SSCH instruction with both read and write commands.
It is also possible to define the Control Unit type
with the cu_type property.
Currently only the kvm-unit-test css test uses the PONG device.
Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
---
default-configs/s390x-softmmu.mak | 1 +
hw/s390x/Kconfig | 3 +
hw/s390x/Makefile.objs | 1 +
hw/s390x/ccw-pong.c | 140 ++++++++++++++++++++++++++++++
include/hw/s390x/pong.h | 54 ++++++++++++
5 files changed, 199 insertions(+)
create mode 100644 hw/s390x/ccw-pong.c
create mode 100644 include/hw/s390x/pong.h
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index f2287a133f..72711912cd 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -7,6 +7,7 @@
#CONFIG_VFIO_CCW=n
#CONFIG_VIRTIO_PCI=n
#CONFIG_WDT_DIAG288=n
+#CONFIG_CCW_TESTDEV=n
# Boards:
#
diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig
index 5e7d8a2bae..041ede333e 100644
--- a/hw/s390x/Kconfig
+++ b/hw/s390x/Kconfig
@@ -10,3 +10,6 @@ config S390_CCW_VIRTIO
select SCLPCONSOLE
select VIRTIO_CCW
select MSI_NONBROKEN
+
+config CCW_TESTDEV
+ default y if TEST_DEVICES
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
index e02ed80b68..e74d0efd9d 100644
--- a/hw/s390x/Makefile.objs
+++ b/hw/s390x/Makefile.objs
@@ -34,3 +34,4 @@ obj-$(CONFIG_KVM) += s390-stattrib-kvm.o
obj-y += s390-ccw.o
obj-y += ap-device.o
obj-y += ap-bridge.o
+obj-y += ccw-pong.o
diff --git a/hw/s390x/ccw-pong.c b/hw/s390x/ccw-pong.c
new file mode 100644
index 0000000000..28177eddae
--- /dev/null
+++ b/hw/s390x/ccw-pong.c
@@ -0,0 +1,140 @@
+/*
+ * CCW PING-PONG
+ *
+ * Copyright 2019 IBM Corp.
+ * Author(s): Pierre Morel <pmorel@linux.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qemu/module.h"
+#include "cpu.h"
+#include "exec/address-spaces.h"
+#include "hw/s390x/css.h"
+#include "hw/s390x/css-bridge.h"
+#include "hw/qdev-properties.h"
+#include "hw/s390x/pong.h"
+
+#define PONG_BUF_SIZE 0x1000
+static char buf[PONG_BUF_SIZE];
+
+static int pong_ccw_cb(SubchDev *sch, CCW1 ccw)
+{
+ int rc = 0;
+ static int value;
+ int len;
+
+ len = (ccw.count > PONG_BUF_SIZE) ? PONG_BUF_SIZE : ccw.count;
+ switch (ccw.cmd_code) {
+ case PONG_WRITE:
+ rc = ccw_dstream_read_buf(&sch->cds, buf, len);
+ value = atol(buf);
+ break;
+ case PONG_READ:
+ sprintf(buf, "%08x", value + 1);
+ rc = ccw_dstream_write_buf(&sch->cds, buf, len);
+ break;
+ default:
+ rc = -ENOSYS;
+ break;
+ }
+
+ sch->curr_status.scsw.count = ccw_dstream_residual_count(&sch->cds);
+
+ if (rc == -EIO) {
+ /* I/O error, specific devices generate specific conditions */
+ SCHIB *schib = &sch->curr_status;
+
+ sch->curr_status.scsw.dstat = SCSW_DSTAT_UNIT_CHECK;
+ sch->sense_data[0] = 0x40; /* intervention-req */
+ schib->scsw.ctrl &= ~SCSW_ACTL_START_PEND;
+ schib->scsw.ctrl &= ~SCSW_CTRL_MASK_STCTL;
+ schib->scsw.ctrl |= SCSW_STCTL_PRIMARY | SCSW_STCTL_SECONDARY |
+ SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND;
+ }
+ return rc;
+}
+
+static void pong_ccw_realize(DeviceState *ds, Error **errp)
+{
+ uint16_t chpid;
+ CcwPONGDevice *dev = CCW_PONG(ds);
+ CcwDevice *cdev = CCW_DEVICE(ds);
+ CCWDeviceClass *cdk = CCW_DEVICE_GET_CLASS(cdev);
+ SubchDev *sch;
+ Error *err = NULL;
+
+ sch = css_create_sch(cdev->devno, errp);
+ if (!sch) {
+ return;
+ }
+
+ sch->driver_data = dev;
+ cdev->sch = sch;
+ chpid = css_find_free_chpid(sch->cssid);
+
+ if (chpid > MAX_CHPID) {
+ error_setg(&err, "No available chpid to use.");
+ goto out_err;
+ }
+
+ sch->id.reserved = 0xff;
+ sch->id.cu_type = dev->cu_type;
+ sch->id.cu_model = dev->cu_model;
+ sch->id.dev_type = dev->dev_type;
+ sch->id.dev_model = dev->dev_model;
+ css_sch_build_virtual_schib(sch, (uint8_t)chpid, CCW_PONG_CHPID_TYPE);
+ sch->do_subchannel_work = do_subchannel_work_virtual;
+ sch->ccw_cb = pong_ccw_cb;
+
+ cdk->realize(cdev, &err);
+ if (err) {
+ goto out_err;
+ }
+
+ css_reset_sch(sch);
+ return;
+
+out_err:
+ error_propagate(errp, err);
+ css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, NULL);
+ cdev->sch = NULL;
+ g_free(sch);
+}
+
+static Property pong_ccw_properties[] = {
+ DEFINE_PROP_UINT16("cu_type", CcwPONGDevice, cu_type, CCW_PONG_CU_TYPE),
+ DEFINE_PROP_UINT8("cu_model", CcwPONGDevice, cu_model, CCW_PONG_CU_MODEL),
+ DEFINE_PROP_UINT16("dev_type", CcwPONGDevice, dev_type, CCW_PONG_DEV_TYPE),
+ DEFINE_PROP_UINT8("dev_model", CcwPONGDevice, dev_model, CCW_PONG_DEV_MODEL),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void pong_ccw_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ device_class_set_props(dc, pong_ccw_properties);
+ dc->bus_type = TYPE_VIRTUAL_CSS_BUS;
+ dc->realize = pong_ccw_realize;
+ dc->hotpluggable = false;
+}
+
+static const TypeInfo pong_ccw_info = {
+ .name = TYPE_CCW_PONG,
+ .parent = TYPE_CCW_DEVICE,
+ .instance_size = sizeof(CcwPONGDevice),
+ .class_init = pong_ccw_class_init,
+ .class_size = sizeof(CcwPONGClass),
+};
+
+static void pong_ccw_register(void)
+{
+ type_register_static(&pong_ccw_info);
+}
+
+type_init(pong_ccw_register)
diff --git a/include/hw/s390x/pong.h b/include/hw/s390x/pong.h
new file mode 100644
index 0000000000..1e60aef24e
--- /dev/null
+++ b/include/hw/s390x/pong.h
@@ -0,0 +1,54 @@
+/*
+ * ccw-attached PONG definitions
+ *
+ * Copyright 2019 IBM Corp.
+ * Author(s): Pierre Morel <pmorel@linux.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+#ifndef HW_S390X_PONG_CCW_H
+#define HW_S390X_PONG_CCW_H
+
+#include "hw/sysbus.h"
+#include "hw/s390x/css.h"
+#include "hw/s390x/ccw-device.h"
+
+#define CCW_PONG_CU_TYPE 0xc0ca
+#define CCW_PONG_CU_MODEL 0xa7
+#define CCW_PONG_DEV_TYPE 0xcafe
+#define CCW_PONG_DEV_MODEL 0xe5
+#define CCW_PONG_CHPID_TYPE 0xd0
+
+#define TYPE_CCW_PONG "ccw-pong"
+
+/* Local Channel Commands */
+#define PONG_WRITE 0x21 /* Write */
+#define PONG_READ 0x22 /* Read buffer */
+
+#define CCW_PONG(obj) \
+ OBJECT_CHECK(CcwPONGDevice, (obj), TYPE_CCW_PONG)
+#define CCW_PONG_CLASS(klass) \
+ OBJECT_CLASS_CHECK(CcwPONGClass, (klass), TYPE_CCW_PONG)
+#define CCW_PONG_GET_CLASS(obj) \
+ OBJECT_GET_CLASS(CcwPONGClass, (obj), TYPE_CCW_PONG)
+
+typedef struct CcwPONGDevice {
+ CcwDevice parent_obj;
+ uint16_t cu_type;
+ uint8_t cu_model;
+ uint16_t dev_type;
+ uint8_t dev_model;
+} CcwPONGDevice;
+
+typedef struct CcwPONGClass {
+ CCWDeviceClass parent_class;
+
+ void (*init)(CcwPONGDevice *, Error **);
+ int (*read_payload)(CcwPONGDevice *);
+ int (*write_payload)(CcwPONGDevice *, uint8_t);
+} CcwPONGClass;
+
+#endif
--
2.17.0
next prev parent reply other threads:[~2020-02-20 12:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-20 11:59 [PATCH v3 0/1] s390x: css: pong, channel subsystem test device Pierre Morel
2020-02-20 11:59 ` Pierre Morel [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-18 16:43 Pierre Morel
2020-05-18 16:43 ` [PATCH v3 1/1] " 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=1582199965-21584-2-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=pasic@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.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 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.