From edf2dd4c4eda49957b845ea90a084dde0951f92a Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Mon, 14 Oct 2019 10:06:39 +0100

Subject: [PATCH 14/21] s390-bios: Extend find_dev() for non-virtio devices

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

Message-id: <20191014100645.22862-12-thuth@redhat.com>

Patchwork-id: 91784

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH v2 11/17] s390-bios: Extend find_dev() for non-virtio devices

Bugzilla: 1664376

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

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

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

From: "Jason J. Herne" <jjherne@linux.ibm.com>

We need a method for finding the subchannel of a dasd device. Let's

modify find_dev to handle this since it mostly does what we need. Up to

this point find_dev has been specific to only virtio devices.

Signed-off-by: Jason J. Herne <jjherne@linux.ibm.com>

Acked-by: Halil Pasic <pasic@linux.vnet.ibm.com>

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

Message-Id: <1554388475-18329-11-git-send-email-jjherne@linux.ibm.com>

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

(cherry picked from commit 930072d2bf30986e57dac5c5945a32492f288944)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 pc-bios/s390-ccw/main.c | 16 +++++++++++-----

 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c

index e403b5f..d04ea89 100644

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

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

@@ -52,6 +52,12 @@ unsigned int get_loadparm_index(void)

     return atoui(loadparm_str);

 }

+/*

+ * Find the subchannel connected to the given device (dev_no) and fill in the

+ * subchannel information block (schib) with the connected subchannel's info.

+ * NOTE: The global variable blk_schid is updated to contain the subchannel

+ * information.

+ */

 static bool find_dev(Schib *schib, int dev_no)

 {

     int i, r;

@@ -65,15 +71,15 @@ static bool find_dev(Schib *schib, int dev_no)

         if (!schib->pmcw.dnv) {

             continue;

         }

-        if (!virtio_is_supported(blk_schid)) {

-            continue;

-        }

+

         /* Skip net devices since no IPLB is created and therefore no

-         * no network bootloader has been loaded

+         * network bootloader has been loaded

          */

-        if (virtio_get_device_type() == VIRTIO_ID_NET && dev_no < 0) {

+        if (virtio_is_supported(blk_schid) &&

+            virtio_get_device_type() == VIRTIO_ID_NET && dev_no < 0) {

             continue;

         }

+

         if ((dev_no < 0) || (schib->pmcw.dev == dev_no)) {

             return true;

         }

-- 

1.8.3.1