[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/14] s390x/css: only suspend when enabled by orb
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 14/14] s390x/css: only suspend when enabled by orb |
Date: |
Tue, 1 Mar 2016 12:53:03 +0100 |
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 <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
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
- [Qemu-devel] [PULL 00/14] s390x patches, Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 02/14] s390x/kvm: sync fprs via kvm_run, Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 03/14] s390x: fix debug statement in trigger_page_fault(), Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 05/14] watchdog/diag288: avoid race condition on expired watchdog, Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 08/14] s390x/pci: fix reg/dereg irq functions, Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 09/14] s390x/css: Allocate channel_subsys statically, Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 11/14] s390x/pci: use PCI_MSIX_FLAGS on retrieving the MSIX entries, Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 13/14] MAINTAINERS: Remove entry for hw/s390x/s390-virtio-bus.[ch], Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 04/14] s390x: remove {kvm_}s390_virtio_irq(), Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 14/14] s390x/css: only suspend when enabled by orb,
Cornelia Huck <=
- [Qemu-devel] [PULL 06/14] s390x/virtio: old machine leftovers, Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 01/14] linux-headers: update against kvm/next, Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 12/14] MAINTAINERS: Remove the old s390-virtio machine, Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 07/14] s390x/css: introduce indicator refcounting interfaces, Cornelia Huck, 2016/03/01
- [Qemu-devel] [PULL 10/14] s390x/css: Use static initialization for channel_subsys fields, Cornelia Huck, 2016/03/01
- Re: [Qemu-devel] [PULL 00/14] s390x patches, Peter Maydell, 2016/03/01