83 lines
2.6 KiB
Diff
83 lines
2.6 KiB
Diff
From 19b96c7f412b9b8d893ec9ebd2603565d6afa178 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Mon, 14 Oct 2019 10:06:31 +0100
|
|
Subject: [PATCH 06/21] s390-bios: decouple cio setup from virtio
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
Message-id: <20191014100645.22862-4-thuth@redhat.com>
|
|
Patchwork-id: 91776
|
|
O-Subject: [RHEL-8.2.0 qemu-kvm PATCH v2 03/17] s390-bios: decouple cio setup from virtio
|
|
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>
|
|
|
|
Move channel i/o setup code out to a separate function. This decouples cio
|
|
setup from the virtio code path and allows us to make use of it for booting
|
|
dasd devices.
|
|
|
|
Signed-off-by: Jason J. Herne <jjherne@linux.ibm.com>
|
|
Acked-by: Halil Pasic <pasic@linux.vnet.ibm.com>
|
|
Reviewed-by: Collin Walling <walling@linux.ibm.com>
|
|
Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
Message-Id: <1554388475-18329-3-git-send-email-jjherne@linux.ibm.com>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
(cherry picked from commit 87f910c142d5589ef937ac216f92c6dcddae955e)
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
pc-bios/s390-ccw/main.c | 20 +++++++++++++-------
|
|
1 file changed, 13 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
|
|
index 544851d..e82fe2c 100644
|
|
--- a/pc-bios/s390-ccw/main.c
|
|
+++ b/pc-bios/s390-ccw/main.c
|
|
@@ -99,6 +99,18 @@ static void menu_setup(void)
|
|
}
|
|
}
|
|
|
|
+/*
|
|
+ * Initialize the channel I/O subsystem so we can talk to our ipl/boot device.
|
|
+ */
|
|
+static void css_setup(void)
|
|
+{
|
|
+ /*
|
|
+ * Unconditionally enable mss support. In every sane configuration this
|
|
+ * will succeed; and even if it doesn't, stsch_err() can handle it.
|
|
+ */
|
|
+ enable_mss_facility();
|
|
+}
|
|
+
|
|
static void virtio_setup(void)
|
|
{
|
|
Schib schib;
|
|
@@ -109,13 +121,6 @@ static void virtio_setup(void)
|
|
VDev *vdev = virtio_get_device();
|
|
QemuIplParameters *early_qipl = (QemuIplParameters *)QIPL_ADDRESS;
|
|
|
|
- /*
|
|
- * We unconditionally enable mss support. In every sane configuration,
|
|
- * this will succeed; and even if it doesn't, stsch_err() can deal
|
|
- * with the consequences.
|
|
- */
|
|
- enable_mss_facility();
|
|
-
|
|
sclp_get_loadparm_ascii(loadparm_str);
|
|
memcpy(ldp + 10, loadparm_str, LOADPARM_LEN);
|
|
sclp_print(ldp);
|
|
@@ -168,6 +173,7 @@ static void virtio_setup(void)
|
|
int main(void)
|
|
{
|
|
sclp_setup();
|
|
+ css_setup();
|
|
virtio_setup();
|
|
|
|
zipl_load(); /* no return */
|
|
--
|
|
1.8.3.1
|
|
|