From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPnsM-0003Z1-5o for qemu-devel@nongnu.org; Fri, 05 Sep 2014 03:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPns9-0003zt-5w for qemu-devel@nongnu.org; Fri, 05 Sep 2014 03:24:06 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:32977) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPns8-0003zX-Sz for qemu-devel@nongnu.org; Fri, 05 Sep 2014 03:23:53 -0400 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 5 Sep 2014 08:23:50 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id C9DA81B0802D for ; Fri, 5 Sep 2014 08:24:49 +0100 (BST) Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id s857NmkS10485862 for ; Fri, 5 Sep 2014 07:23:48 GMT Received: from d06av11.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s857Nl5D011645 for ; Fri, 5 Sep 2014 01:23:48 -0600 Message-ID: <54096502.70607@de.ibm.com> Date: Fri, 05 Sep 2014 09:23:46 +0200 From: Christian Borntraeger MIME-Version: 1.0 References: <1409844743-31009-1-git-send-email-jfrei@linux.vnet.ibm.com> <1409844743-31009-3-git-send-email-jfrei@linux.vnet.ibm.com> <5408E7CD.4030506@suse.de> In-Reply-To: <5408E7CD.4030506@suse.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/3] s390x/css: support format-0 ccws List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf , Jens Freimann , Cornelia Huck Cc: qemu-devel@nongnu.org On 05/09/14 00:29, Alexander Graf wrote: > > > On 04.09.14 17:32, Jens Freimann wrote: >> From: Cornelia Huck >> >> Add support for format-0 ccws in channel programs. As a format-1 ccw >> contains the same information as format-0 ccws, only supporting larger >> addresses, simply convert every ccw to format-1 as we walk the chain. >> >> Reviewed-by: David Hildenbrand >> Signed-off-by: Cornelia Huck >> --- >> hw/s390x/css.c | 30 +++++++++++++++++++++--------- >> hw/s390x/css.h | 1 + >> target-s390x/ioinst.h | 10 ++++++++++ >> 3 files changed, 32 insertions(+), 9 deletions(-) >> >> diff --git a/hw/s390x/css.c b/hw/s390x/css.c >> index 49c2aaf..34637cb 100644 >> --- a/hw/s390x/css.c >> +++ b/hw/s390x/css.c >> @@ -243,17 +243,25 @@ static void copy_sense_id_to_guest(SenseId *dest, SenseId *src) >> } >> } >> >> -static CCW1 copy_ccw_from_guest(hwaddr addr) >> +static CCW1 copy_ccw_from_guest(hwaddr addr, bool fmt1) >> { >> - CCW1 tmp; >> + CCW0 tmp0; >> + CCW1 tmp1; >> CCW1 ret; >> >> - cpu_physical_memory_read(addr, &tmp, sizeof(tmp)); >> - ret.cmd_code = tmp.cmd_code; >> - ret.flags = tmp.flags; >> - ret.count = be16_to_cpu(tmp.count); >> - ret.cda = be32_to_cpu(tmp.cda); >> - >> + if (fmt1) { >> + cpu_physical_memory_read(addr, &tmp1, sizeof(tmp1)); >> + ret.cmd_code = tmp1.cmd_code; >> + ret.flags = tmp1.flags; >> + ret.count = be16_to_cpu(tmp1.count); >> + ret.cda = be32_to_cpu(tmp1.cda); >> + } else { >> + cpu_physical_memory_read(addr, &tmp0, sizeof(tmp0)); >> + ret.cmd_code = tmp0.cmd_code; >> + ret.flags = tmp0.flags; >> + ret.count = be16_to_cpu(tmp0.count); >> + ret.cda = be16_to_cpu(tmp0.cda1) | (tmp0.cda0 << 16); >> + } >> return ret; >> } >> >> @@ -268,7 +276,8 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr) >> return -EIO; >> } >> >> - ccw = copy_ccw_from_guest(ccw_addr); >> + /* Translate everything to format-1 ccws - the information is the same. */ >> + ccw = copy_ccw_from_guest(ccw_addr, sch->ccw_fmt_1); >> >> /* Check for invalid command codes. */ >> if ((ccw.cmd_code & 0x0f) == 0) { >> @@ -386,6 +395,7 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb) >> s->ctrl |= (SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND); >> return; >> } >> + sch->ccw_fmt_1 = !!(orb->ctrl0 & ORB_CTRL0_MASK_FMT); >> } else { >> s->ctrl &= ~(SCSW_ACTL_SUSP | SCSW_ACTL_RESUME_PEND); >> } >> @@ -1347,6 +1357,7 @@ void subch_device_save(SubchDev *s, QEMUFile *f) >> qemu_put_byte(f, s->id.ciw[i].command); >> qemu_put_be16(f, s->id.ciw[i].count); >> } >> + qemu_put_byte(f, s->ccw_fmt_1); > > This changes the migration stream format. Please increase the version > number for the device that gets migrated, so that we have the chance to > catch it. > > Though - does migration work at all yet? :) Not yet. Myself and Jens are currently testing Davids latest patches regarding CPU states. (just chasing the final (tm) bug). After that I can push the initial cpu migration patch set. So maybe we can leave this as is? Whatever you suggest. > > > Alex > >> return; >> } >> >> @@ -1402,6 +1413,7 @@ int subch_device_load(SubchDev *s, QEMUFile *f) >> s->id.ciw[i].command = qemu_get_byte(f); >> s->id.ciw[i].count = qemu_get_be16(f); >> } >> + s->ccw_fmt_1 = qemu_get_byte(f); >> return 0; >> } >> >> diff --git a/hw/s390x/css.h b/hw/s390x/css.h >> index c864ea7..384a455 100644 >> --- a/hw/s390x/css.h >> +++ b/hw/s390x/css.h >> @@ -76,6 +76,7 @@ struct SubchDev { >> hwaddr channel_prog; >> CCW1 last_cmd; >> bool last_cmd_valid; >> + bool ccw_fmt_1; >> bool thinint_active; >> /* transport-provided data: */ >> int (*ccw_cb) (SubchDev *, CCW1); >> diff --git a/target-s390x/ioinst.h b/target-s390x/ioinst.h >> index 5bbc67d..29f6423 100644 >> --- a/target-s390x/ioinst.h >> +++ b/target-s390x/ioinst.h >> @@ -156,6 +156,16 @@ typedef struct ORB { >> #define ORB_CTRL1_MASK_ORBX 0x01 >> #define ORB_CTRL1_MASK_INVALID 0x3e >> >> +/* channel command word (type 0) */ >> +typedef struct CCW0 { >> + uint8_t cmd_code; >> + uint8_t cda0; >> + uint16_t cda1; >> + uint8_t flags; >> + uint8_t reserved; >> + uint16_t count; >> +} QEMU_PACKED CCW0; >> + >> /* channel command word (type 1) */ >> typedef struct CCW1 { >> uint8_t cmd_code; >> >