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 v9 11/12] s390x: css: msch, enable test
Date: Mon, 15 Jun 2020 11:32:00 +0200 [thread overview]
Message-ID: <1592213521-19390-12-git-send-email-pmorel@linux.ibm.com> (raw)
In-Reply-To: <1592213521-19390-1-git-send-email-pmorel@linux.ibm.com>
A second step when testing the channel subsystem is to prepare a channel
for use.
This includes:
- Get the current subchannel Information Block (SCHIB) using STSCH
- Update it in memory to set the ENABLE bit
- Tell the CSS that the SCHIB has been modified using MSCH
- Get the SCHIB from the CSS again to verify that the subchannel is
enabled.
- If the command succeeds but subchannel is not enabled retry a
predefined retries count.
- If the command fails, report the failure and do not retry, even
if cc indicates a busy/status pending as we do not expect this.
This tests the MSCH instruction to enable a channel succesfuly.
This some retries are done and in case of error, and if the retries
count is exceeded, a report is made.
Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
---
lib/s390x/css_lib.c | 60 +++++++++++++++++++++++++++++++++++++++++++++
s390x/css.c | 15 ++++++++++++
2 files changed, 75 insertions(+)
diff --git a/lib/s390x/css_lib.c b/lib/s390x/css_lib.c
index b0a0294..06a76db 100644
--- a/lib/s390x/css_lib.c
+++ b/lib/s390x/css_lib.c
@@ -15,6 +15,7 @@
#include <string.h>
#include <interrupt.h>
#include <asm/arch_def.h>
+#include <asm/time.h>
#include <css.h>
@@ -68,3 +69,62 @@ out:
scn, scn_found, dev_found);
return schid;
}
+
+int css_enable(int schid)
+{
+ struct pmcw *pmcw = &schib.pmcw;
+ int retry_count = 0;
+ int cc;
+
+ /* Read the SCHIB for this subchannel */
+ cc = stsch(schid, &schib);
+ if (cc) {
+ report_info("stsch failed with cc=%d", cc);
+ return cc;
+ }
+
+ if (pmcw->flags & PMCW_ENABLE) {
+ report_info("stsch: sch %08x already enabled", schid);
+ return 0;
+ }
+
+retry:
+ /* Update the SCHIB to enable the channel */
+ pmcw->flags |= PMCW_ENABLE;
+
+ /* Tell the CSS we want to modify the subchannel */
+ cc = msch(schid, &schib);
+ if (cc) {
+ /*
+ * If the subchannel is status pending or
+ * if a function is in progress,
+ * we consider both cases as errors.
+ */
+ report_info("msch failed with cc=%d", cc);
+ return cc;
+ }
+
+ /*
+ * Read the SCHIB again to verify the enablement
+ */
+ cc = stsch(schid, &schib);
+ if (cc) {
+ report_info("stsch failed with cc=%d", cc);
+ return cc;
+ }
+
+ if (pmcw->flags & PMCW_ENABLE) {
+ report_info("Subchannel %08x enabled after %d retries",
+ schid, retry_count);
+ return 0;
+ }
+
+ if (retry_count++ < MAX_ENABLE_RETRIES) {
+ mdelay(10); /* the hardware was not ready, give it some time */
+ goto retry;
+ }
+
+ report_info("msch: enabling sch %08x failed after %d retries. pmcw flags: %x",
+ schid, retry_count, pmcw->flags);
+ return -1;
+}
diff --git a/s390x/css.c b/s390x/css.c
index 230adf5..6948d73 100644
--- a/s390x/css.c
+++ b/s390x/css.c
@@ -31,11 +31,26 @@ static void test_enumerate(void)
report(0, "No I/O device found");
}
+static void test_enable(void)
+{
+ int cc;
+
+ if (!test_device_sid) {
+ report_skip("No device");
+ return;
+ }
+
+ cc = css_enable(test_device_sid);
+
+ report(cc == 0, "Enable subchannel %08x", test_device_sid);
+}
+
static struct {
const char *name;
void (*func)(void);
} tests[] = {
{ "enumerate (stsch)", test_enumerate },
+ { "enable (msch)", test_enable },
{ NULL, NULL }
};
--
2.25.1
next prev parent reply other threads:[~2020-06-15 9:32 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 9:31 [kvm-unit-tests PATCH v9 00/12] s390x: Testing the Channel Subsystem I/O Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 01/12] s390x: Use PSW bits definitions in cstart Pierre Morel
2020-06-16 9:31 ` Thomas Huth
2020-06-16 9:39 ` Pierre Morel
2020-06-16 13:13 ` Thomas Huth
2020-06-16 13:58 ` Pierre Morel
2020-06-16 14:01 ` Pierre Morel
2020-06-16 15:14 ` Thomas Huth
2020-06-16 16:08 ` Pierre Morel
2020-06-16 16:11 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 02/12] s390x: Move control register bit definitions and add AFP to them Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 03/12] s390x: saving regs for interrupts Pierre Morel
2020-06-17 8:13 ` Cornelia Huck
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 04/12] s390x: interrupt registration Pierre Morel
2020-06-17 8:20 ` Cornelia Huck
2020-06-17 11:01 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 05/12] s390x: export the clock get_clock_ms() utility Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 06/12] s390x: clock and delays caluculations Pierre Morel
2020-06-16 9:35 ` Thomas Huth
2020-06-16 9:40 ` Pierre Morel
2020-06-17 8:27 ` Cornelia Huck
2020-06-17 11:04 ` Pierre Morel
2020-06-22 9:09 ` Janosch Frank
2020-06-30 16:13 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 07/12] s390x: define function to wait for interrupt Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 08/12] s390x: retrieve decimal and hexadecimal kernel parameters Pierre Morel
2020-06-16 9:47 ` Thomas Huth
2020-06-16 13:43 ` Pierre Morel
2020-06-17 8:37 ` Cornelia Huck
2020-06-17 11:05 ` Pierre Morel
2020-06-22 9:33 ` Janosch Frank
2020-06-22 10:57 ` Andrew Jones
2020-07-02 12:53 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 09/12] s390x: Library resources for CSS tests Pierre Morel
2020-06-16 10:31 ` Thomas Huth
2020-06-16 13:42 ` Pierre Morel
2020-06-17 8:42 ` Cornelia Huck
2020-06-17 11:08 ` Pierre Morel
2020-06-22 9:35 ` Janosch Frank
2020-06-24 12:26 ` Thomas Huth
2020-06-30 16:30 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 10/12] s390x: css: stsch, enumeration test Pierre Morel
2020-06-16 11:37 ` Thomas Huth
2020-06-16 13:42 ` Pierre Morel
2020-06-17 8:48 ` Cornelia Huck
2020-06-17 11:14 ` Pierre Morel
2020-06-15 9:32 ` Pierre Morel [this message]
2020-06-16 11:43 ` [kvm-unit-tests PATCH v9 11/12] s390x: css: msch, enable test Thomas Huth
2020-06-16 13:43 ` Pierre Morel
2020-06-17 8:54 ` Cornelia Huck
2020-06-17 11:25 ` Pierre Morel
2020-06-15 9:32 ` [kvm-unit-tests PATCH v9 12/12] s390x: css: ssch/tsch with sense and interrupt Pierre Morel
2020-06-17 9:54 ` Cornelia Huck
2020-06-17 11:55 ` Pierre Morel
2020-06-19 6:57 ` Cornelia Huck
2020-07-02 12:56 ` 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=1592213521-19390-12-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).