Commit ba298832 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20200310' into staging 



s390x/ipl: Fixes for ipl and bios

- provide a pointer to the loadparm. This fixes crashes in zipl
- do not throw away guest changes of the IPL parameter during reset
- refactor IPLB checks

# gpg: Signature made Tue 10 Mar 2020 14:50:31 GMT
# gpg:                using RSA key 117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (2nd IBM address) <borntraeger@linux.ibm.com>" [unknown]
# gpg:                 aka "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>" [full]
# gpg:                 aka "Christian Borntraeger (kernel.org email address) <borntraeger@kernel.org>" [unknown]
# Primary key fingerprint: F922 9381 A334 08F9 DBAB  FBCA 117B BC80 B5A6 1C7C

* remotes/borntraeger/tags/s390x-20200310:
  s390x: ipl: Consolidate iplb validity check into one function
  s390/ipl: sync back loadparm
  s390x/bios: rebuild s390-ccw.img
  pc-bios: s390x: Save iplb location in lowcore

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7bc4d198 94c21436

hw/s390x/ipl.c

+25 −0
Original line number Diff line number Diff line
@@ -538,6 +538,30 @@ static bool is_virtio_scsi_device(IplParameterBlock *iplb) 
    return is_virtio_ccw_device_of_type(iplb, VIRTIO_ID_SCSI);

}



static void update_machine_ipl_properties(IplParameterBlock *iplb)

{

    Object *machine = qdev_get_machine();

    Error *err = NULL;



    /* Sync loadparm */

    if (iplb->flags & DIAG308_FLAGS_LP_VALID) {

        uint8_t *ebcdic_loadparm = iplb->loadparm;

        char ascii_loadparm[8];

        int i;



        for (i = 0; i < 8 && ebcdic_loadparm[i]; i++) {

            ascii_loadparm[i] = ebcdic2ascii[(uint8_t) ebcdic_loadparm[i]];

        }

        ascii_loadparm[i] = 0;

        object_property_set_str(machine, ascii_loadparm, "loadparm", &err);

    } else {

        object_property_set_str(machine, "", "loadparm", &err);

    }

    if (err) {

        warn_report_err(err);

    }

}



void s390_ipl_update_diag308(IplParameterBlock *iplb)

{

    S390IPLState *ipl = get_ipl_device();
@@ -545,6 +569,7 @@ void s390_ipl_update_diag308(IplParameterBlock *iplb) 
    ipl->iplb = *iplb;

    ipl->iplb_valid = true;

    ipl->netboot = is_virtio_net_device(iplb);

    update_machine_ipl_properties(iplb);

}



IplParameterBlock *s390_ipl_get_iplb(void)

hw/s390x/ipl.h

+9 −9
Original line number Diff line number Diff line
@@ -173,16 +173,16 @@ static inline bool iplb_valid_len(IplParameterBlock *iplb) 
    return be32_to_cpu(iplb->len) <= sizeof(IplParameterBlock);

}



static inline bool iplb_valid_ccw(IplParameterBlock *iplb)

static inline bool iplb_valid(IplParameterBlock *iplb)

{

    return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_CCW_LEN &&

           iplb->pbt == S390_IPL_TYPE_CCW;

    switch (iplb->pbt) {

    case S390_IPL_TYPE_FCP:

        return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_FCP_LEN;

    case S390_IPL_TYPE_CCW:

        return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_CCW_LEN;

    default:

        return false;

    }



static inline bool iplb_valid_fcp(IplParameterBlock *iplb)

{

    return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_FCP_LEN &&

           iplb->pbt == S390_IPL_TYPE_FCP;

}



#endif

pc-bios/s390-ccw.img

(41.6 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

pc-bios/s390-ccw/jump2ipl.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ void jump_to_IPL_code(uint64_t address) 
{

    /* store the subsystem information _after_ the bootmap was loaded */

    write_subsystem_identification();

    write_iplb_location();



    /* prevent unknown IPL types in the guest */

    if (iplb.pbt == S390_IPL_TYPE_QEMU_SCSI) {

pc-bios/s390-ccw/main.c

+7 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include "libc.h"

#include "helper.h"

#include "s390-arch.h"

#include "s390-ccw.h"

#include "cio.h"
@@ -22,7 +23,7 @@ QemuIplParameters qipl; 
IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));

static bool have_iplb;

static uint16_t cutype;

LowCore const *lowcore; /* Yes, this *is* a pointer to address 0 */

LowCore *lowcore; /* Yes, this *is* a pointer to address 0 */



#define LOADPARM_PROMPT "PROMPT  "

#define LOADPARM_EMPTY  "        "
@@ -42,6 +43,11 @@ void write_subsystem_identification(void) 
    *zeroes = 0;

}



void write_iplb_location(void)

{

    lowcore->ptr_iplb = ptr2u32(&iplb);

}



void panic(const char *string)

{

    sclp_print(string);