Refactor network device setup to separate virtio-ccw from generic virtio-net logic for easier reuse of existing virtio functions with non-CCW devices.
Signed-off-by: Zhuoying Cai <[email protected]> --- pc-bios/s390-ccw/netmain.c | 64 +---------------------------------- pc-bios/s390-ccw/virtio-ccw.c | 62 +++++++++++++++++++++++++++++++++ pc-bios/s390-ccw/virtio-ccw.h | 1 + pc-bios/s390-ccw/virtio-net.c | 10 ++++++ pc-bios/s390-ccw/virtio.h | 1 + 5 files changed, 75 insertions(+), 63 deletions(-) diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c index 791854fce0..e2f2278b8d 100644 --- a/pc-bios/s390-ccw/netmain.c +++ b/pc-bios/s390-ccw/netmain.c @@ -489,68 +489,6 @@ static int net_try_direct_tftp_load(filename_ip_t *fn_ip) return rc; } -static bool find_net_dev(Schib *schib, int dev_no) -{ - int i, r; - - for (i = 0; i < 0x10000; i++) { - net_schid.sch_no = i; - r = stsch_err(net_schid, schib); - if (r == 3 || r == -EIO) { - break; - } - if (!schib->pmcw.dnv) { - continue; - } - enable_subchannel(net_schid); - if (!virtio_is_supported(virtio_get_device())) { - continue; - } - if (virtio_get_device_type() != VIRTIO_ID_NET) { - continue; - } - if (dev_no < 0 || schib->pmcw.dev == dev_no) { - return true; - } - } - - return false; -} - -static bool virtio_setup(void) -{ - Schib schib; - int ssid; - bool found = false; - uint16_t dev_no; - - /* - * 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(); - - if (have_iplb || store_iplb(&iplb)) { - IPL_assert(iplb.pbt == S390_IPL_TYPE_CCW, "IPL_TYPE_CCW expected"); - dev_no = iplb.ccw.devno; - debug_print_int("device no. ", dev_no); - net_schid.ssid = iplb.ccw.ssid & 0x3; - debug_print_int("ssid ", net_schid.ssid); - found = find_net_dev(&schib, dev_no); - } else { - for (ssid = 0; ssid < 0x3; ssid++) { - net_schid.ssid = ssid; - found = find_net_dev(&schib, -1); - if (found) { - break; - } - } - } - - return found; -} - int netmain(void) { filename_ip_t fn_ip; @@ -559,7 +497,7 @@ int netmain(void) sclp_setup(); puts("Network boot starting..."); - if (!virtio_setup()) { + if (!virtio_net_setup()) { puts("No virtio net device found."); return -1; } diff --git a/pc-bios/s390-ccw/virtio-ccw.c b/pc-bios/s390-ccw/virtio-ccw.c index 5cb2158ed2..403bd8a785 100644 --- a/pc-bios/s390-ccw/virtio-ccw.c +++ b/pc-bios/s390-ccw/virtio-ccw.c @@ -237,3 +237,65 @@ int virtio_ccw_setup(VDev *vdev) return 0; } + +static bool find_ccw_net_dev(Schib *schib, int dev_no) +{ + int i, r; + + for (i = 0; i < 0x10000; i++) { + net_schid.sch_no = i; + r = stsch_err(net_schid, schib); + if (r == 3 || r == -EIO) { + break; + } + if (!schib->pmcw.dnv) { + continue; + } + enable_subchannel(net_schid); + if (!virtio_is_supported(virtio_get_device())) { + continue; + } + if (virtio_get_device_type() != VIRTIO_ID_NET) { + continue; + } + if (dev_no < 0 || schib->pmcw.dev == dev_no) { + return true; + } + } + + return false; +} + +bool virtio_ccw_net_setup(void) +{ + Schib schib; + int ssid; + bool found = false; + uint16_t dev_no; + + /* + * 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(); + + if (have_iplb || store_iplb(&iplb)) { + IPL_assert(iplb.pbt == S390_IPL_TYPE_CCW, "IPL_TYPE_CCW expected"); + dev_no = iplb.ccw.devno; + debug_print_int("device no. ", dev_no); + net_schid.ssid = iplb.ccw.ssid & 0x3; + debug_print_int("ssid ", net_schid.ssid); + found = find_ccw_net_dev(&schib, dev_no); + } else { + for (ssid = 0; ssid < 0x3; ssid++) { + net_schid.ssid = ssid; + found = find_ccw_net_dev(&schib, -1); + if (found) { + break; + } + } + } + + return found; +} diff --git a/pc-bios/s390-ccw/virtio-ccw.h b/pc-bios/s390-ccw/virtio-ccw.h index a506767eaa..c330e02f99 100644 --- a/pc-bios/s390-ccw/virtio-ccw.h +++ b/pc-bios/s390-ccw/virtio-ccw.h @@ -20,5 +20,6 @@ int virtio_ccw_run(VDev *vdev, int vqid, VirtioCmd *cmd); long virtio_ccw_notify(SubChannelId schid, int vq_idx, long cookie); int virtio_ccw_setup(VDev *vdev); int virtio_ccw_reset(VDev *vdev); +bool virtio_ccw_net_setup(void); #endif diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-net.c index f58f7ffc55..0ee51653ab 100644 --- a/pc-bios/s390-ccw/virtio-net.c +++ b/pc-bios/s390-ccw/virtio-net.c @@ -146,3 +146,13 @@ void virtio_net_deinit(void) { virtio_reset(virtio_get_device()); } + +bool virtio_net_setup(void) +{ + switch (virtio_get_device()->ipl_type) { + case S390_IPL_TYPE_CCW: + return virtio_ccw_net_setup(); + default: + return false; + } +} diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h index aa307025e0..04dbc65dbd 100644 --- a/pc-bios/s390-ccw/virtio.h +++ b/pc-bios/s390-ccw/virtio.h @@ -290,6 +290,7 @@ int virtio_setup_ccw(VDev *vdev); /* virtio-net.c */ int virtio_net_init(void *mac_addr); void virtio_net_deinit(void); +bool virtio_net_setup(void); /* virtio-blkdev.c */ int virtio_blk_setup_device(VDev *vdev); -- 2.55.0
