From nobody Sat Feb 7 08:07:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506017548078601.4320830092174; Thu, 21 Sep 2017 11:12:28 -0700 (PDT) Received: from localhost ([::1]:54996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dv5xR-0007xa-9M for importer@patchew.org; Thu, 21 Sep 2017 14:12:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dv5uC-0005jw-Ec for qemu-devel@nongnu.org; Thu, 21 Sep 2017 14:08:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dv5uA-0006Gp-T9 for qemu-devel@nongnu.org; Thu, 21 Sep 2017 14:08:56 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:44166 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dv5uA-0006GO-NW for qemu-devel@nongnu.org; Thu, 21 Sep 2017 14:08:54 -0400 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v8LI4LUS095107 for ; Thu, 21 Sep 2017 14:08:54 -0400 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0b-001b2d01.pphosted.com with ESMTP id 2d4fncgsgf-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 21 Sep 2017 14:08:54 -0400 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 21 Sep 2017 19:08:52 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 21 Sep 2017 19:08:50 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v8LI8ovx20840536; Thu, 21 Sep 2017 18:08:50 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C46EC4C044; Thu, 21 Sep 2017 19:05:12 +0100 (BST) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8FBFB4C040; Thu, 21 Sep 2017 19:05:12 +0100 (BST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Thu, 21 Sep 2017 19:05:12 +0100 (BST) From: Halil Pasic To: Cornelia Huck Date: Thu, 21 Sep 2017 20:08:41 +0200 X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170921180841.24490-1-pasic@linux.vnet.ibm.com> References: <20170921180841.24490-1-pasic@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17092118-0040-0000-0000-000003DC1587 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17092118-0041-0000-0000-000025DD5198 Message-Id: <20170921180841.24490-6-pasic@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-09-21_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709210244 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH v4 5/5] s390x/css: support ccw IDA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dong Jia Shi , Halil Pasic , Pierre Morel , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Let's add indirect data addressing support for our virtual channel subsystem. This implementation does not bother with any kind of prefetching. We simply step through the IDAL on demand. Signed-off-by: Halil Pasic Reviewed-by: Dong Jia Shi --- hw/s390x/css.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index cd5580ebb8..9079d274b8 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -827,6 +827,118 @@ incr: return 0; } =20 +/* returns values between 1 and bsz, where bsz is a power of 2 */ +static inline uint16_t ida_continuous_left(hwaddr cda, uint64_t bsz) +{ + return bsz - (cda & (bsz - 1)); +} + +static inline uint64_t ccw_ida_block_size(uint8_t flags) +{ + if ((flags & CDS_F_C64) && !(flags & CDS_F_I2K)) { + return 1ULL << 12; + } + return 1ULL << 11; +} + +static inline int ida_read_next_idaw(CcwDataStream *cds) +{ + union {uint64_t fmt2; uint32_t fmt1; } idaw; + int ret; + hwaddr idaw_addr; + bool idaw_fmt2 =3D cds->flags & CDS_F_C64; + bool ccw_fmt1 =3D cds->flags & CDS_F_FMT; + + if (idaw_fmt2) { + idaw_addr =3D cds->cda_orig + sizeof(idaw.fmt2) * cds->at_idaw; + if (idaw_addr & 0x07 || !cds_ccw_addrs_ok(idaw_addr, 0, ccw_fmt1))= { + return -EINVAL; /* channel program check */ + } + ret =3D address_space_rw(&address_space_memory, idaw_addr, + MEMTXATTRS_UNSPECIFIED, (void *) &idaw.fmt2, + sizeof(idaw.fmt2), false); + cds->cda =3D be64_to_cpu(idaw.fmt2); + } else { + idaw_addr =3D cds->cda_orig + sizeof(idaw.fmt1) * cds->at_idaw; + if (idaw_addr & 0x03 || !cds_ccw_addrs_ok(idaw_addr, 0, ccw_fmt1))= { + return -EINVAL; /* channel program check */ + } + ret =3D address_space_rw(&address_space_memory, idaw_addr, + MEMTXATTRS_UNSPECIFIED, (void *) &idaw.fmt1, + sizeof(idaw.fmt1), false); + cds->cda =3D be64_to_cpu(idaw.fmt1); + if (cds->cda & 0x80000000) { + return -EINVAL; /* channel program check */ + } + } + ++(cds->at_idaw); + if (ret !=3D MEMTX_OK) { + /* assume inaccessible address */ + return -EINVAL; /* channel program check */ + } + return 0; +} + +static int ccw_dstream_rw_ida(CcwDataStream *cds, void *buff, int len, + CcwDataStreamOp op) +{ + uint64_t bsz =3D ccw_ida_block_size(cds->flags); + int ret =3D 0; + uint16_t cont_left, iter_len; + + ret =3D cds_check_len(cds, len); + if (ret <=3D 0) { + return ret; + } + if (!cds->at_idaw) { + /* read first idaw */ + ret =3D ida_read_next_idaw(cds); + if (ret) { + goto err; + } + cont_left =3D ida_continuous_left(cds->cda, bsz); + } else { + cont_left =3D ida_continuous_left(cds->cda, bsz); + if (cont_left =3D=3D bsz) { + ret =3D ida_read_next_idaw(cds); + if (ret) { + goto err; + } + if (cds->cda & (bsz - 1)) { + ret =3D -EINVAL; /* channel program check */ + goto err; + } + } + } + do { + iter_len =3D MIN(len, cont_left); + if (op !=3D CDS_OP_A) { + ret =3D address_space_rw(&address_space_memory, cds->cda, + MEMTXATTRS_UNSPECIFIED, buff, iter_len,= op); + if (ret !=3D MEMTX_OK) { + /* assume inaccessible address */ + ret =3D -EINVAL; /* channel program check */ + goto err; + } + } + cds->at_byte +=3D iter_len; + cds->cda +=3D iter_len; + len -=3D iter_len; + if (!len) { + break; + } + ret =3D ida_read_next_idaw(cds); + if (ret) { + goto err; + } + cont_left =3D bsz; + } while (true); + return ret; +err: + cds->flags |=3D CDS_F_STREAM_BROKEN; + return ret; +} + void ccw_dstream_init(CcwDataStream *cds, CCW1 const *ccw, ORB const *orb) { /* @@ -845,7 +957,7 @@ void ccw_dstream_init(CcwDataStream *cds, CCW1 const *c= cw, ORB const *orb) if (!(cds->flags & CDS_F_IDA)) { cds->op_handler =3D ccw_dstream_rw_noflags; } else { - assert(false); + cds->op_handler =3D ccw_dstream_rw_ida; } } =20 --=20 2.13.5