| Message ID | 1530811543-6881-4-git-send-email-jjherne@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05.07.2018 19:25, Jason J. Herne wrote: > From: "Jason J. Herne" <jjherne@linux.vnet.ibm.com> git commit --amend --reset-author ? > Create a boot_setup function to handle getting boot information from > the machine/hypervisor. This decouples common boot logic from the > virtio code path and allows us to make use of it for the real dasd boot > scenario. > > Signed-off-by: Jason J. Herne <jjherne@linux.vnet.ibm.com> > Acked-by: Halil Pasic <pasic@linux.vnet.ibm.com> > Reviewed-by: Collin Walling <walling@linux.ibm.com > Signed-off-by: Jason J. Herne <jjherne@linux.ibm.com> > --- > pc-bios/s390-ccw/main.c | 28 ++++++++++++++++++++-------- > 1 file changed, 20 insertions(+), 8 deletions(-) > > diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c > index 63117d1..8ecab93 100644 > --- a/pc-bios/s390-ccw/main.c > +++ b/pc-bios/s390-ccw/main.c > @@ -14,16 +14,17 @@ > > char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE))); > static SubChannelId blk_schid = { .one = 1 }; > -IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); > static char loadparm_str[LOADPARM_LEN + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; > QemuIplParameters qipl; > +IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); > +static bool have_iplb; > > #define LOADPARM_PROMPT "PROMPT " > #define LOADPARM_EMPTY " " > #define BOOT_MENU_FLAG_MASK (QIPL_FLAG_BM_OPTS_CMD | QIPL_FLAG_BM_OPTS_ZIPL) > > /* > - * Priniciples of Operations (SA22-7832-09) chapter 17 requires that > + * Principles of Operations (SA22-7832-09) chapter 17 requires that > * a subsystem-identification is at 184-187 and bytes 188-191 are zero > * after list-directed-IPL and ccw-IPL. > */ > @@ -111,23 +112,33 @@ static void cio_setup(void) > enable_mss_facility(); > } > > +/* > + * Collect various pieces of information from the hypervisor/hardware that > + * we'll use to determine exactly how we'll boot. > + */ > +static void boot_setup(void) > +{ > + char lpmsg[] = "LOADPARM=[________]\n"; > + > + sclp_get_loadparm_ascii(loadparm_str); > + memcpy(lpmsg + 10, loadparm_str, 8); > + sclp_print(lpmsg); > + > + have_iplb = store_iplb(&iplb); > +} > + > static void virtio_setup(void) > { > Schib schib; > int ssid; > bool found = false; > uint16_t dev_no; > - char ldp[] = "LOADPARM=[________]\n"; > VDev *vdev = virtio_get_device(); > QemuIplParameters *early_qipl = (QemuIplParameters *)QIPL_ADDRESS; > > - sclp_get_loadparm_ascii(loadparm_str); > - memcpy(ldp + 10, loadparm_str, LOADPARM_LEN); > - sclp_print(ldp); > - > memcpy(&qipl, early_qipl, sizeof(QemuIplParameters)); > > - if (store_iplb(&iplb)) { > + if (have_iplb) { > switch (iplb.pbt) { > case S390_IPL_TYPE_CCW: > dev_no = iplb.ccw.devno; > @@ -174,6 +185,7 @@ int main(void) > { > sclp_setup(); > cio_setup(); > + boot_setup(); Maybe rather name it bootparm_setup? Just "boot" is IMHO a little bit too generic... Anyway: Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 63117d1..8ecab93 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -14,16 +14,17 @@ char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE))); static SubChannelId blk_schid = { .one = 1 }; -IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); static char loadparm_str[LOADPARM_LEN + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; QemuIplParameters qipl; +IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); +static bool have_iplb; #define LOADPARM_PROMPT "PROMPT " #define LOADPARM_EMPTY " " #define BOOT_MENU_FLAG_MASK (QIPL_FLAG_BM_OPTS_CMD | QIPL_FLAG_BM_OPTS_ZIPL) /* - * Priniciples of Operations (SA22-7832-09) chapter 17 requires that + * Principles of Operations (SA22-7832-09) chapter 17 requires that * a subsystem-identification is at 184-187 and bytes 188-191 are zero * after list-directed-IPL and ccw-IPL. */ @@ -111,23 +112,33 @@ static void cio_setup(void) enable_mss_facility(); } +/* + * Collect various pieces of information from the hypervisor/hardware that + * we'll use to determine exactly how we'll boot. + */ +static void boot_setup(void) +{ + char lpmsg[] = "LOADPARM=[________]\n"; + + sclp_get_loadparm_ascii(loadparm_str); + memcpy(lpmsg + 10, loadparm_str, 8); + sclp_print(lpmsg); + + have_iplb = store_iplb(&iplb); +} + static void virtio_setup(void) { Schib schib; int ssid; bool found = false; uint16_t dev_no; - char ldp[] = "LOADPARM=[________]\n"; VDev *vdev = virtio_get_device(); QemuIplParameters *early_qipl = (QemuIplParameters *)QIPL_ADDRESS; - sclp_get_loadparm_ascii(loadparm_str); - memcpy(ldp + 10, loadparm_str, LOADPARM_LEN); - sclp_print(ldp); - memcpy(&qipl, early_qipl, sizeof(QemuIplParameters)); - if (store_iplb(&iplb)) { + if (have_iplb) { switch (iplb.pbt) { case S390_IPL_TYPE_CCW: dev_no = iplb.ccw.devno; @@ -174,6 +185,7 @@ int main(void) { sclp_setup(); cio_setup(); + boot_setup(); virtio_setup(); zipl_load(); /* no return */