From: Cornelia Huck <cornelia.huck@de.ibm.com>
To: qemu-devel@nongnu.org
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>,
borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de
Subject: [Qemu-devel] [PATCH] s390x/css: only suspend when enabled by orb
Date: Mon, 29 Feb 2016 16:32:42 +0100 [thread overview]
Message-ID: <1456759962-20548-1-git-send-email-cornelia.huck@de.ibm.com> (raw)
In-Reply-To: <20160229163112.73085e75.cornelia.huck@de.ibm.com>
We must not allow a channel program to suspend if the suspend
control bit in the orb had not been specified.
Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
hw/s390x/css.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 55cb26a..3a1d919 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -342,7 +342,8 @@ static CCW1 copy_ccw_from_guest(hwaddr addr, bool fmt1)
return ret;
}
-static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr)
+static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr,
+ bool suspend_allowed)
{
int ret;
bool check_len;
@@ -370,7 +371,7 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr)
}
if (ccw.flags & CCW_FLAG_SUSPEND) {
- return -EINPROGRESS;
+ return suspend_allowed ? -EINPROGRESS : -EINVAL;
}
check_len = !((ccw.flags & CCW_FLAG_SLI) && !(ccw.flags & CCW_FLAG_DC));
@@ -468,6 +469,7 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb)
SCSW *s = &sch->curr_status.scsw;
int path;
int ret;
+ bool suspend_allowed;
/* Path management: In our simple css, we always choose the only path. */
path = 0x80;
@@ -487,12 +489,15 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb)
}
sch->ccw_fmt_1 = !!(orb->ctrl0 & ORB_CTRL0_MASK_FMT);
sch->ccw_no_data_cnt = 0;
+ suspend_allowed = !!(orb->ctrl0 & ORB_CTRL0_MASK_SPND);
} else {
s->ctrl &= ~(SCSW_ACTL_SUSP | SCSW_ACTL_RESUME_PEND);
+ /* The channel program had been suspended before. */
+ suspend_allowed = true;
}
sch->last_cmd_valid = false;
do {
- ret = css_interpret_ccw(sch, sch->channel_prog);
+ ret = css_interpret_ccw(sch, sch->channel_prog, suspend_allowed);
switch (ret) {
case -EAGAIN:
/* ccw chain, continue processing */
--
2.7.2
prev parent reply other threads:[~2016-02-29 15:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 11:19 [Qemu-devel] [PATCH 00/10] s390x: pending patches Cornelia Huck
2016-02-23 11:19 ` [Qemu-devel] [PATCH 01/10] linux-headers: update against kvm/next Cornelia Huck
2016-02-23 11:19 ` [Qemu-devel] [PATCH 02/10] s390x/kvm: sync fprs via kvm_run Cornelia Huck
2016-02-23 11:19 ` [Qemu-devel] [PATCH 03/10] s390x: fix debug statement in trigger_page_fault() Cornelia Huck
2016-02-23 11:19 ` [Qemu-devel] [PATCH 04/10] s390x: remove {kvm_}s390_virtio_irq() Cornelia Huck
2016-02-23 11:19 ` [Qemu-devel] [PATCH 05/10] watchdog/diag288: avoid race condition on expired watchdog Cornelia Huck
2016-02-23 11:19 ` [Qemu-devel] [PATCH 06/10] s390x/virtio: old machine leftovers Cornelia Huck
2016-02-23 11:19 ` [Qemu-devel] [PATCH 07/10] s390x/css: introduce indicator refcounting interfaces Cornelia Huck
2016-02-23 11:19 ` [Qemu-devel] [PATCH 08/10] s390x/pci: fix reg/dereg irq functions Cornelia Huck
2016-02-23 11:19 ` [Qemu-devel] [PATCH 09/10] s390x/css: Allocate channel_subsys statically Cornelia Huck
2016-02-23 11:19 ` [Qemu-devel] [PATCH 10/10] s390x/css: Use static initialization for channel_subsys fields Cornelia Huck
2016-02-29 15:31 ` [Qemu-devel] [PATCH 00/10] s390x: pending patches Cornelia Huck
2016-02-29 15:32 ` Cornelia Huck [this message]
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=1456759962-20548-1-git-send-email-cornelia.huck@de.ibm.com \
--to=cornelia.huck@de.ibm.com \
--cc=agraf@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=jfrei@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/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).