diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2014-06-30 14:33:38 +0200 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2014-07-08 15:08:03 +0200 |
| commit | 2ed982b6a984cdf2940f426ee246f52492d4a415 (patch) | |
| tree | 638537a56195ef1bd2c5a780c15dfee6a949f1dd /hw/s390x | |
| parent | 32a02d070be46b5c5a863e1542883f4a39231a39 (diff) | |
| download | qemu-2ed982b6a984cdf2940f426ee246f52492d4a415.tar.gz qemu-2ed982b6a984cdf2940f426ee246f52492d4a415.tar.bz2 qemu-2ed982b6a984cdf2940f426ee246f52492d4a415.zip | |
s390x/css: reflect cpa in scsw
We neglected to update the the channel-program-address field of the scsw
after completion of the start or the halt function: Fortunately, Linux
didn't miss it so far. Let's update it for the cases where the cpa is
expected to be valid; in some cases, the cpa is 'unpredictable', so we
leave it untouched.
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/css.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/hw/s390x/css.c b/hw/s390x/css.c index e758890dcd..49c2aaff1f 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -200,6 +200,7 @@ static void sch_handle_halt_func(SubchDev *sch) PMCW *p = &sch->curr_status.pmcw; SCSW *s = &sch->curr_status.scsw; + hwaddr curr_ccw = sch->channel_prog; int path; /* Path management: In our simple css, we always choose the only path. */ @@ -216,6 +217,10 @@ static void sch_handle_halt_func(SubchDev *sch) (s->ctrl & SCSW_ACTL_SUSP))) { s->dstat = SCSW_DSTAT_DEVICE_END; } + if ((s->ctrl & (SCSW_ACTL_SUBCH_ACTIVE | SCSW_ACTL_DEVICE_ACTIVE)) || + (s->ctrl & SCSW_ACTL_SUSP)) { + s->cpa = curr_ccw + 8; + } s->cstat = 0; p->lpum = path; @@ -398,6 +403,7 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb) s->ctrl |= SCSW_STCTL_PRIMARY | SCSW_STCTL_SECONDARY | SCSW_STCTL_STATUS_PEND; s->dstat = SCSW_DSTAT_CHANNEL_END | SCSW_DSTAT_DEVICE_END; + s->cpa = sch->channel_prog + 8; break; case -ENOSYS: /* unsupported command, generate unit check (command reject) */ @@ -408,6 +414,7 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb) s->ctrl &= ~SCSW_CTRL_MASK_STCTL; s->ctrl |= SCSW_STCTL_PRIMARY | SCSW_STCTL_SECONDARY | SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND; + s->cpa = sch->channel_prog + 8; break; case -EFAULT: /* memory problem, generate channel data check */ @@ -416,6 +423,7 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb) s->ctrl &= ~SCSW_CTRL_MASK_STCTL; s->ctrl |= SCSW_STCTL_PRIMARY | SCSW_STCTL_SECONDARY | SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND; + s->cpa = sch->channel_prog + 8; break; case -EBUSY: /* subchannel busy, generate deferred cc 1 */ @@ -436,6 +444,7 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb) s->ctrl &= ~SCSW_CTRL_MASK_STCTL; s->ctrl |= SCSW_STCTL_PRIMARY | SCSW_STCTL_SECONDARY | SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND; + s->cpa = sch->channel_prog + 8; break; } } while (ret == -EAGAIN); |