On Tue, 29 Jan 2019 08:29:12 -0500
"Jason J. Herne" <jjhe...@linux.ibm.com> wrote:
> Make a new routine find_boot_device to locate the boot device for all
> cases. not just virtio.
s/cases./cases,/
>
> In one case no boot device is specified and a suitable boot device can not
> be auto detected. The error message for this case was specific to virtio
> devices. We update this message to remove virtio specific wording.
"The error message for the case where no boot device has been specified
and a suitable boot device cannot be auto detected was specific to
virtio devices. We update..."
>
> Signed-off-by: Jason J. Herne <jjhe...@linux.ibm.com>
> ---
> pc-bios/s390-ccw/main.c | 87
> ++++++++++++++++++++++++++----------------------
> tests/boot-serial-test.c | 2 +-
> 2 files changed, 49 insertions(+), 40 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
> index 7e3f65e..2457752 100644
> --- a/pc-bios/s390-ccw/main.c
> +++ b/pc-bios/s390-ccw/main.c
> @@ -55,17 +55,18 @@ unsigned int get_loadparm_index(void)
> * NOTE: The global variable blk_schid is updated to contain the subchannel
> * information.
> */
> -static bool find_dev(Schib *schib, int dev_no)
> +static bool find_subch(int dev_no)
I'm wondering why you drop passing in the schib here? But OTOH, the
usage of global variables or not is a bit confused in the bios anyway...
> {
> + Schib schib;
> int i, r;
>
> for (i = 0; i < 0x10000; i++) {
> blk_schid.sch_no = i;
> - r = stsch_err(blk_schid, schib);
> + r = stsch_err(blk_schid, &schib);
> if ((r == 3) || (r == -EIO)) {
> break;
> }
> - if (!schib->pmcw.dnv) {
> + if (!schib.pmcw.dnv) {
> continue;
> }
>
> @@ -77,7 +78,7 @@ static bool find_dev(Schib *schib, int dev_no)
> continue;
> }
>
> - if ((dev_no < 0) || (schib->pmcw.dev == dev_no)) {
> + if ((dev_no < 0) || (schib.pmcw.dev == dev_no)) {
> return true;
> }
> }
> @@ -133,56 +134,63 @@ static void boot_setup(void)
> have_iplb = store_iplb(&iplb);
> }
>
> -static void virtio_setup(void)
> +static void find_boot_device(void)
> {
> - Schib schib;
> - int ssid;
> - bool found = false;
> - uint16_t dev_no;
> VDev *vdev = virtio_get_device();
> - QemuIplParameters *early_qipl = (QemuIplParameters *)QIPL_ADDRESS;
> -
> - memcpy(&qipl, early_qipl, sizeof(QemuIplParameters));
> + int ssid;
> + bool found;
>
> - if (have_iplb) {
> - switch (iplb.pbt) {
> - case S390_IPL_TYPE_CCW:
> - dev_no = iplb.ccw.devno;
> - debug_print_int("device no. ", dev_no);
> - blk_schid.ssid = iplb.ccw.ssid & 0x3;
> - debug_print_int("ssid ", blk_schid.ssid);
> - found = find_dev(&schib, dev_no);
> - break;
> - case S390_IPL_TYPE_QEMU_SCSI:
> - vdev->scsi_device_selected = true;
> - vdev->selected_scsi_device.channel = iplb.scsi.channel;
> - vdev->selected_scsi_device.target = iplb.scsi.target;
> - vdev->selected_scsi_device.lun = iplb.scsi.lun;
> - blk_schid.ssid = iplb.scsi.ssid & 0x3;
> - found = find_dev(&schib, iplb.scsi.devno);
> - break;
> - default:
> - panic("List-directed IPL not supported yet!\n");
> - }
> - menu_setup();
> - } else {
> + if (!have_iplb) {
> for (ssid = 0; ssid < 0x3; ssid++) {
> blk_schid.ssid = ssid;
> - found = find_dev(&schib, -1);
> + found = find_subch(-1);
> if (found) {
> - break;
> + return;
> }
> }
> + panic("Could not find a suitable boot device (none specified)\n");
> }
>
> - IPL_assert(found, "No virtio device found");
> + switch (iplb.pbt) {
> + case S390_IPL_TYPE_CCW:
> + debug_print_int("device no. ", iplb.ccw.devno);
> + blk_schid.ssid = iplb.ccw.ssid & 0x3;
> + debug_print_int("ssid ", blk_schid.ssid);
> + found = find_subch(iplb.ccw.devno);
> + break;
> + case S390_IPL_TYPE_QEMU_SCSI:
> + vdev->scsi_device_selected = true;
> + vdev->selected_scsi_device.channel = iplb.scsi.channel;
> + vdev->selected_scsi_device.target = iplb.scsi.target;
> + vdev->selected_scsi_device.lun = iplb.scsi.lun;
> + blk_schid.ssid = iplb.scsi.ssid & 0x3;
> + found = find_subch(iplb.scsi.devno);
> + break;
> + default:
> + panic("List-directed IPL not supported yet!\n");
> + }
> +
> + if (!found) {
> + IPL_assert(found, "Boot device not found\n");
You can simply call IPL_assert(found, ...) here, as it does the check
already.
> + }
> +}
