From: Halil Pasic <pasic@linux.vnet.ibm.com>
Date: Wed, 20 Jan 2016 18:51:30 +0000 (+0100)
Subject: s390x/css: fix control flags during csch
X-Git-Tag: v2.5.1~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=091af181047623695b7239cd8ddf928e1327b6a5;p=thirdparty%2Fqemu.git

s390x/css: fix control flags during csch

From the beginning, css support contained an error in csch handling:
instead of setting the clear bit in the function control bits twice, we
need to set the clear pending bit in the activity control bits. Let's
fix this.

Cc: qemu-stable@nongnu.org
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
(cherry picked from commit 4c6bf79a222934ac9ff0e45fc98ea1c986ed5c67)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 19851ce6a9a..c6ca8bec435 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -701,7 +701,7 @@ int css_do_csch(SubchDev *sch)
 
     /* Trigger the clear function. */
     s->ctrl &= ~(SCSW_CTRL_MASK_FCTL | SCSW_CTRL_MASK_ACTL);
-    s->ctrl |= SCSW_FCTL_CLEAR_FUNC | SCSW_FCTL_CLEAR_FUNC;
+    s->ctrl |= SCSW_FCTL_CLEAR_FUNC | SCSW_ACTL_CLEAR_PEND;
 
     do_subchannel_work(sch, NULL);
     ret = 0;