From d90cbb55fe3ec232091a24137cab45419aac8bc5 Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Fri, 9 Oct 2020 10:08:44 -0400

Subject: [PATCH 08/14] pc-bios/s390-ccw: Move the inner logic of find_subch()

 to a separate function

RH-Author: Thomas Huth <thuth@redhat.com>

Message-id: <20201009100849.264994-5-thuth@redhat.com>

Patchwork-id: 98598

O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 4/9] pc-bios/s390-ccw: Move the inner logic of find_subch() to a separate function

Bugzilla: 1846975

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

Move the code to a separate function to be able to re-use it from a

different spot later.

Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>

Message-Id: <20200806105349.632-5-thuth@redhat.com>

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Reviewed-by: Janosch Frank <frankja@linux.ibm.com>

Signed-off-by: Thomas Huth <thuth@redhat.com>

(cherry picked from commit d2cf4af1f4af02f6f2d5827d9a06c31690084d3b)

Signed-off-by: Danilo C. L. de Paula <ddepaula@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 5e565be5b1..d6fd218074 100644

--- a/pc-bios/s390-ccw/main.c

+++ b/pc-bios/s390-ccw/main.c

@@ -60,6 +60,60 @@ unsigned int get_loadparm_index(void)

     return atoui(loadparm_str);

 }

+static int is_dev_possibly_bootable(int dev_no, int sch_no)

+{

+    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 -ENODEV;

+    }

+    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 whether the device is possibly bootable */

+    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.

@@ -71,53 +125,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 = is_dev_possibly_bootable(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;

         }

     }

-- 

2.27.0