From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A07C9C433E0 for ; Wed, 29 Jul 2020 11:14:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6C8582076E for ; Wed, 29 Jul 2020 11:14:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PrNWUqKW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C8582076E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0k2A-0002gr-NX for qemu-devel@archiver.kernel.org; Wed, 29 Jul 2020 07:14:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0k1Z-0002GX-5c for qemu-devel@nongnu.org; Wed, 29 Jul 2020 07:13:29 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:40067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k0k1W-0008Bb-Kg for qemu-devel@nongnu.org; Wed, 29 Jul 2020 07:13:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596021205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:openpgp:openpgp; bh=I9NOVhOaMYEYq2XEhtATYqpIllsK0ySCwLtdNj/wnaA=; b=PrNWUqKWcuDW+JPkgS7CfBpNb7NJ4BvLzWlrADnfP08JlPIUb68JDl7QWqKWiILG8CYh+H o4RZ5Ep3lmMDhnVxjQhkTsQyJAhlNK7yZG4XRzLqkaf5wCGNhMq68pcX1lNu08fN1KFKJB BrZvDuK8D5wqg6Mr3J/SgZ5UzNd952o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-206-mrRWfxMoNu6SwxzBg3ybcw-1; Wed, 29 Jul 2020 07:13:22 -0400 X-MC-Unique: mrRWfxMoNu6SwxzBg3ybcw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BFD4B80183C; Wed, 29 Jul 2020 11:13:20 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-171.ams2.redhat.com [10.36.112.171]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A9B75C5B7; Wed, 29 Jul 2020 11:13:19 +0000 (UTC) Subject: Re: [PATCH for-5.2 3/6] pc-bios/s390-ccw: Move the inner logic of find_subch() to a separate function To: Cornelia Huck References: <20200728183734.7838-1-thuth@redhat.com> <20200728183734.7838-4-thuth@redhat.com> <20200729105426.6d8a5a61.cohuck@redhat.com> From: Thomas Huth Openpgp: preference=signencrypt Message-ID: <667365fe-b46b-f425-bf67-a6af2b4114fe@redhat.com> Date: Wed, 29 Jul 2020 13:13:17 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20200729105426.6d8a5a61.cohuck@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.74; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-74.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/29 01:09:48 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Jason J . Herne" , Collin Walling , Janosch Frank , qemu-devel@nongnu.org, Christian Borntraeger , qemu-s390x@nongnu.org, Claudio Imbrenda Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 29/07/2020 10.54, Cornelia Huck wrote: > On Tue, 28 Jul 2020 20:37:31 +0200 > Thomas Huth wrote: > >> Move the code to a separate function to be able to re-use it from a >> different spot later. >> >> Signed-off-by: Thomas Huth >> --- >> pc-bios/s390-ccw/main.c | 99 ++++++++++++++++++++++++----------------- >> 1 file changed, 57 insertions(+), 42 deletions(-) >> >> diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c >> index 9b64eb0c24..9477313188 100644 >> --- a/pc-bios/s390-ccw/main.c >> +++ b/pc-bios/s390-ccw/main.c >> @@ -51,6 +51,60 @@ unsigned int get_loadparm_index(void) >> return atoui(loadparm_str); >> } >> >> +static int check_sch_no(int dev_no, int sch_no) > > check_subchannel()? You verify dev_no as well, if supplied. Ok. >> +{ >> + bool is_virtio; >> + Schib schib; >> + int r; >> + >> + blk_schid.sch_no = sch_no; >> + r = stsch_err(blk_schid, &schib); >> + if (r == 3 || r == -EIO) { >> + return -EIO; > > -ENODEV? It means that you either have no devices, or an invalid > subchannel set. We don't have ENODEV in the s390-ccw bios... but I could introduce it, I guess :-) >> + } >> + if (!schib.pmcw.dnv) { >> + return false; >> + } >> + >> + enable_subchannel(blk_schid); >> + cutype = cu_type(blk_schid); >> + >> + /* >> + * Note: we always have to run virtio_is_supported() here to make >> + * sure that the vdev.senseid data gets pre-initialized correctly >> + */ >> + is_virtio = virtio_is_supported(blk_schid); >> + >> + /* No specific devno given, just return 1st possibly bootable device */ > > "just return whether the device is possibly bootable" ? That makes more sense now, indeed. >> + if (dev_no < 0) { >> + switch (cutype) { >> + case CU_TYPE_VIRTIO: >> + if (is_virtio) { >> + /* >> + * Skip net devices since no IPLB is created and therefore >> + * no network bootloader has been loaded >> + */ >> + if (virtio_get_device_type() != VIRTIO_ID_NET) { >> + return true; >> + } >> + } >> + return false; >> + case CU_TYPE_DASD_3990: >> + case CU_TYPE_DASD_2107: >> + return true; >> + default: >> + return false; >> + } >> + } >> + >> + /* Caller asked for a specific devno */ >> + if (schib.pmcw.dev == dev_no) { >> + return true; >> + } >> + >> + return false; >> +} >> + >> /* >> * Find the subchannel connected to the given device (dev_no) and fill in the >> * subchannel information block (schib) with the connected subchannel's info. > (...) > > Otherwise, LGTM. Thanks! Thomas