{"id":807704,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807704/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170830163609.50260-7-pasic@linux.vnet.ibm.com>","date":"2017-08-30T16:36:06","name":"[6/9] s390x: refactor error handling for CSCH handler","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8460754dbdb97f2fa7d451f13cfdfd6e7fc46829","submitter":{"id":68297,"url":"http://patchwork.ozlabs.org/api/1.0/people/68297/?format=json","name":"Halil Pasic","email":"pasic@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830163609.50260-7-pasic@linux.vnet.ibm.com/mbox/","series":[{"id":648,"url":"http://patchwork.ozlabs.org/api/1.0/series/648/?format=json","date":"2017-08-30T16:36:02","name":"","version":1,"mbox":"http://patchwork.ozlabs.org/series/648/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807704/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjB4K68vlz9sNn\n\tfor ;\n\tThu, 31 Aug 2017 02:37:21 +1000 (AEST)","from localhost ([::1]:51543 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn5zT-0007K6-7m\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 12:37:19 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:50181)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn5yl-0007Hw-6O\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:36:37 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn5yj-0006JS-9s\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:36:35 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:59888\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dn5yj-0006J9-4F\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:36:33 -0400","from pps.filterd (m0098414.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7UGTBKp111808\n\tfor ; Wed, 30 Aug 2017 12:36:32 -0400","from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cnx1vp5pc-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Wed, 30 Aug 2017 12:36:32 -0400","from localhost\n\tby e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tWed, 30 Aug 2017 17:36:30 +0100","from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195)\n\tby e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tWed, 30 Aug 2017 17:36:27 +0100","from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com\n\t[9.149.105.232])\n\tby b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7UGaR6i29687854; Wed, 30 Aug 2017 16:36:27 GMT","from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 1198352041;\n\tWed, 30 Aug 2017 16:31:54 +0100 (BST)","from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9])\n\tby d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id D039C5203F; \n\tWed, 30 Aug 2017 16:31:53 +0100 (BST)"],"From":"Halil Pasic ","To":"Cornelia Huck ","Date":"Wed, 30 Aug 2017 18:36:06 +0200","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170830163609.50260-1-pasic@linux.vnet.ibm.com>","References":"<20170830163609.50260-1-pasic@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17083016-0020-0000-0000-000003B26EAE","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17083016-0021-0000-0000-00004242C0A5","Message-Id":"<20170830163609.50260-7-pasic@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-30_07:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=0\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708300251","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 6/9] s390x: refactor error handling for CSCH\n\thandler","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Dong Jia Shi ,\n\tHalil Pasic ,\n\tPierre Morel , qemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Simplify the error handling of the CSCH handler avoiding arbitrary and\ncryptic error codes being mapped to what a subchannel is supposed to do.\nLet the code detecting the condition tell how it's to be handled in a\nless ambiguous way.\n\nSigned-off-by: Halil Pasic \nReviewed-by: Pierre Morel\n---\n hw/s390x/css.c | 11 +++--------\n include/hw/s390x/css.h | 2 +-\n target/s390x/ioinst.c | 18 +++++++++---------\n 3 files changed, 13 insertions(+), 18 deletions(-)","diff":"diff --git a/hw/s390x/css.c b/hw/s390x/css.c\nindex 7880c2c025..e661a87387 100644\n--- a/hw/s390x/css.c\n+++ b/hw/s390x/css.c\n@@ -1272,15 +1272,14 @@ void css_do_xsch(SubchDev *sch)\n s->cstat = 0;\n }\n \n-int css_do_csch(SubchDev *sch)\n+void css_do_csch(SubchDev *sch)\n {\n SCSW *s = &sch->curr_status.scsw;\n PMCW *p = &sch->curr_status.pmcw;\n- int ret;\n \n if (~(p->flags) & (PMCW_FLAGS_MASK_DNV | PMCW_FLAGS_MASK_ENA)) {\n- ret = -ENODEV;\n- goto out;\n+ sch->iret.cc = 3;\n+ return;\n }\n \n /* Trigger the clear function. */\n@@ -1288,10 +1287,6 @@ int css_do_csch(SubchDev *sch)\n s->ctrl |= SCSW_FCTL_CLEAR_FUNC | SCSW_ACTL_CLEAR_PEND;\n \n do_subchannel_work(sch);\n- ret = 0;\n-\n-out:\n- return ret;\n }\n \n int css_do_hsch(SubchDev *sch)\ndiff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h\nindex d78ee5714b..d5a7e460ec 100644\n--- a/include/hw/s390x/css.h\n+++ b/include/hw/s390x/css.h\n@@ -205,7 +205,7 @@ int css_do_stsch(SubchDev *sch, SCHIB *schib);\n bool css_schid_final(int m, uint8_t cssid, uint8_t ssid, uint16_t schid);\n int css_do_msch(SubchDev *sch, const SCHIB *schib);\n void css_do_xsch(SubchDev *sch);\n-int css_do_csch(SubchDev *sch);\n+void css_do_csch(SubchDev *sch);\n int css_do_hsch(SubchDev *sch);\n void css_do_ssch(SubchDev *sch, ORB *orb);\n int css_do_tsch_get_irb(SubchDev *sch, IRB *irb, int *irb_len);\ndiff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c\nindex f8e038fac7..501f3135ad 100644\n--- a/target/s390x/ioinst.c\n+++ b/target/s390x/ioinst.c\n@@ -65,8 +65,6 @@ void ioinst_handle_csch(S390CPU *cpu, uint64_t reg1)\n {\n int cssid, ssid, schid, m;\n SubchDev *sch;\n- int ret = -ENODEV;\n- int cc;\n \n if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) {\n program_interrupt(&cpu->env, PGM_OPERAND, 4);\n@@ -74,15 +72,17 @@ void ioinst_handle_csch(S390CPU *cpu, uint64_t reg1)\n }\n trace_ioinst_sch_id(\"csch\", cssid, ssid, schid);\n sch = css_find_subch(m, cssid, ssid, schid);\n- if (sch && css_subch_visible(sch)) {\n- ret = css_do_csch(sch);\n+ if (!sch || !css_subch_visible(sch)) {\n+ setcc(cpu, 3);\n+ return;\n }\n- if (ret == -ENODEV) {\n- cc = 3;\n- } else {\n- cc = 0;\n+ css_subch_clear_iret(sch);\n+ css_do_csch(sch);\n+ if (sch->iret.pgm_chk) {\n+ program_interrupt(&cpu->env, sch->iret.irq_code, 4);\n+ return;\n }\n- setcc(cpu, cc);\n+ setcc(cpu, sch->iret.cc);\n }\n \n void ioinst_handle_hsch(S390CPU *cpu, uint64_t reg1)\n","prefixes":["6/9"]}