diff options
| author | Peter Maydell | 2016-07-20 21:59:05 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-20 21:59:05 +0200 |
| commit | 3b55fbdcb048bf82e82c29b555d0918b83fc40a5 (patch) | |
| tree | 844b7da697d25d194e626ee3dddf6d911a28b949 /hw/s390x/css.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160720-1' into s... (diff) | |
| parent | s390x/css: provide a dev_path for css devices (diff) | |
| download | qemu-3b55fbdcb048bf82e82c29b555d0918b83fc40a5.tar.gz qemu-3b55fbdcb048bf82e82c29b555d0918b83fc40a5.tar.xz qemu-3b55fbdcb048bf82e82c29b555d0918b83fc40a5.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160720' into staging
Fixes for s390x in the css area.
# gpg: Signature made Wed 20 Jul 2016 15:12:43 BST
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20160720:
s390x/css: provide a dev_path for css devices
s390x/css: sch_handle_start_func() handles resume, too
s390x/css: copy CCW format bit from ORB to SCSW
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/s390x/css.c')
| -rw-r--r-- | hw/s390x/css.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/s390x/css.c b/hw/s390x/css.c index aa61773885..bb8e4be339 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -511,6 +511,7 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb) path = 0x80; if (!(s->ctrl & SCSW_ACTL_SUSP)) { + /* Start Function triggered via ssch, i.e. we have an ORB */ s->cstat = 0; s->dstat = 0; /* Look at the orb and try to execute the channel program. */ @@ -524,9 +525,12 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb) return; } sch->ccw_fmt_1 = !!(orb->ctrl0 & ORB_CTRL0_MASK_FMT); + s->flags |= (sch->ccw_fmt_1) ? SCSW_FLAGS_MASK_FMT : 0; sch->ccw_no_data_cnt = 0; suspend_allowed = !!(orb->ctrl0 & ORB_CTRL0_MASK_SPND); } else { + /* Start Function resumed via rsch, i.e. we don't have an + * ORB */ s->ctrl &= ~(SCSW_ACTL_SUSP | SCSW_ACTL_RESUME_PEND); /* The channel program had been suspended before. */ suspend_allowed = true; @@ -609,6 +613,7 @@ static void do_subchannel_work(SubchDev *sch, ORB *orb) } else if (s->ctrl & SCSW_FCTL_HALT_FUNC) { sch_handle_halt_func(sch); } else if (s->ctrl & SCSW_FCTL_START_FUNC) { + /* Triggered by both ssch and rsch. */ sch_handle_start_func(sch, orb); } else { /* Cannot happen. */ |