david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390-bios: decouple cio setup from virtio

Browse Source 
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>
This commit is contained in:
Jason J. Herne 2019-04-04 10:34:21 -04:00 committed by Thomas Huth
parent 44445d8668
commit 87f910c142
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pc-bios/s390-ccw/main.c
View File

@ -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) static void virtio_setup(void)
{ {
Schib schib; Schib schib;
@ -109,13 +121,6 @@ static void virtio_setup(void)
VDev *vdev = virtio_get_device(); VDev *vdev = virtio_get_device();
QemuIplParameters *early_qipl = (QemuIplParameters *)QIPL_ADDRESS; 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); sclp_get_loadparm_ascii(loadparm_str);
memcpy(ldp + 10, loadparm_str, LOADPARM_LEN); memcpy(ldp + 10, loadparm_str, LOADPARM_LEN);
sclp_print(ldp); sclp_print(ldp);
@ -168,6 +173,7 @@ static void virtio_setup(void)
int main(void) int main(void)
{ {
sclp_setup(); sclp_setup();
css_setup();
virtio_setup(); virtio_setup();
zipl_load(); /* no return */ zipl_load(); /* no return */