From: Janosch Frank <frankja@linux.ibm.com>
To: Thomas Huth <thuth@redhat.com>,
qemu-s390x@nongnu.org, qemu-devel@nongnu.org
Cc: "Jason J . Herne" <jjherne@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Collin Walling <walling@linux.ibm.com>,
Cornelia Huck <cohuck@redhat.com>,
Claudio Imbrenda <imbrenda@linux.ibm.com>
Subject: Re: [PATCH for-5.2 3/6] pc-bios/s390-ccw: Move the inner logic of find_subch() to a separate function
Date: Tue, 4 Aug 2020 15:26:34 +0200 [thread overview]
Message-ID: <88dfc306-ac09-c370-73d6-dc9a2e159431@linux.ibm.com> (raw)
In-Reply-To: <20200728183734.7838-4-thuth@redhat.com>
[-- Attachment #1.1: Type: text/plain, Size: 4366 bytes --]
On 7/28/20 8:37 PM, 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 <thuth@redhat.com>
> ---
> 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)
How about something like is_sch_no_bootable() or check_sch_no_bootable()?
check_sch_no doesn't tell me what you actually check for.
Otherwise LGTM
> +{
> + 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;
> + }
> + 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 */
> + 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.
> @@ -62,53 +116,14 @@ unsigned int get_loadparm_index(void)
> */
> static bool find_subch(int dev_no)
> {
> - Schib schib;
> int i, r;
> - bool is_virtio;
>
> for (i = 0; i < 0x10000; i++) {
> - blk_schid.sch_no = i;
> - r = stsch_err(blk_schid, &schib);
> - if ((r == 3) || (r == -EIO)) {
> + r = check_sch_no(dev_no, i);
> + if (r < 0) {
> break;
> }
> - if (!schib.pmcw.dnv) {
> - continue;
> - }
> -
> - 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 */
> - 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;
> - }
> - }
> - continue;
> - case CU_TYPE_DASD_3990:
> - case CU_TYPE_DASD_2107:
> - return true;
> - default:
> - continue;
> - }
> - }
> -
> - /* Caller asked for a specific devno */
> - if (schib.pmcw.dev == dev_no) {
> + if (r == true) {
> return true;
> }
> }
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-08-04 13:27 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 18:37 [PATCH for-5.2 0/6] Continue booting in case the first device is not bootable Thomas Huth
2020-07-28 18:37 ` [PATCH for-5.2 1/6] pc-bios/s390-ccw/Makefile: Compile with -std=gnu99, -fwrapv and -fno-common Thomas Huth
2020-07-29 8:00 ` Claudio Imbrenda
2020-07-29 8:34 ` Cornelia Huck
2020-07-31 7:46 ` Janosch Frank
2020-07-31 7:51 ` Thomas Huth
2020-07-28 18:37 ` [PATCH for-5.2 2/6] pc-bios/s390-ccw: Move ipl-related code from main() into a separate function Thomas Huth
2020-07-29 8:01 ` Claudio Imbrenda
2020-07-29 8:47 ` Cornelia Huck
2020-07-29 11:05 ` Thomas Huth
2020-08-05 9:16 ` Cornelia Huck
2020-08-04 12:52 ` Janosch Frank
2020-07-28 18:37 ` [PATCH for-5.2 3/6] pc-bios/s390-ccw: Move the inner logic of find_subch() to " Thomas Huth
2020-07-29 8:54 ` Cornelia Huck
2020-07-29 11:13 ` Thomas Huth
2020-08-05 9:19 ` Cornelia Huck
2020-08-03 8:46 ` Claudio Imbrenda
2020-08-04 13:24 ` Thomas Huth
2020-08-04 15:30 ` Claudio Imbrenda
2020-08-04 13:26 ` Janosch Frank [this message]
2020-07-28 18:37 ` [PATCH for-5.2 4/6] pc-bios/s390-ccw: Do not bail out early if not finding a SCSI disk Thomas Huth
2020-07-29 10:03 ` Cornelia Huck
2020-07-28 18:37 ` [PATCH for-5.2 5/6] pc-bios/s390-ccw: Scan through all boot devices if none has been specified Thomas Huth
2020-08-04 11:06 ` Claudio Imbrenda
2020-08-05 9:36 ` Cornelia Huck
2020-08-05 9:39 ` Thomas Huth
2020-07-28 18:37 ` [PATCH for-5.2 6/6] pc-bios/s390-ccw: Allow booting in case the first virtio-blk disk is bad Thomas Huth
2020-08-05 10:04 ` Cornelia Huck
2020-08-05 10:08 ` Thomas Huth
2020-08-05 10:27 ` Cornelia Huck
2020-07-29 10:10 ` [PATCH for-5.2 0/6] Continue booting in case the first device is not bootable Cornelia Huck
2020-07-29 11:42 ` Viktor Mihajlovski
2020-07-29 17:17 ` Cornelia Huck
2020-07-30 4:39 ` Thomas Huth
2020-08-04 14:49 ` Janosch Frank
2020-08-04 15:19 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=88dfc306-ac09-c370-73d6-dc9a2e159431@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=imbrenda@linux.ibm.com \
--cc=jjherne@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
--cc=walling@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).