Commit 758af5e8 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170228' into staging 

Network boot for s390x. More information (and instructions
for building a s390-netboot.img) can be found at
http://wiki.qemu-project.org/Features/S390xNetworkBoot



# gpg: Signature made Tue 28 Feb 2017 11:27:18 GMT
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20170228:
  pc-bios/s390-ccw.img: rebuild image
  pc-bios/s390-ccw: Use the ccw bios to start the network boot
  s390x/ipl: Load network boot image
  s390x/ipl: Extend S390IPLState to support network boot
  elf-loader: Allow late loading of elf

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e7c83a88 e8ebf60f

hw/core/loader.c

+15 −2
Original line number Diff line number Diff line
@@ -434,6 +434,19 @@ int load_elf_as(const char *filename, 
                void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,

                uint64_t *highaddr, int big_endian, int elf_machine,

                int clear_lsb, int data_swab, AddressSpace *as)

{

    return load_elf_ram(filename, translate_fn, translate_opaque,

                        pentry, lowaddr, highaddr, big_endian, elf_machine,

                        clear_lsb, data_swab, as, true);

}



/* return < 0 if error, otherwise the number of bytes loaded in memory */

int load_elf_ram(const char *filename,

                 uint64_t (*translate_fn)(void *, uint64_t),

                 void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,

                 uint64_t *highaddr, int big_endian, int elf_machine,

                 int clear_lsb, int data_swab, AddressSpace *as,

                 bool load_rom)

{

    int fd, data_order, target_data_order, must_swab, ret = ELF_LOAD_FAILED;

    uint8_t e_ident[EI_NIDENT];
@@ -473,11 +486,11 @@ int load_elf_as(const char *filename, 
    if (e_ident[EI_CLASS] == ELFCLASS64) {

        ret = load_elf64(filename, fd, translate_fn, translate_opaque, must_swab,

                         pentry, lowaddr, highaddr, elf_machine, clear_lsb,

                         data_swab, as);

                         data_swab, as, load_rom);

    } else {

        ret = load_elf32(filename, fd, translate_fn, translate_opaque, must_swab,

                         pentry, lowaddr, highaddr, elf_machine, clear_lsb,

                         data_swab, as);

                         data_swab, as, load_rom);

    }



 fail:

hw/s390x/ipl.c

+90 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "hw/s390x/virtio-ccw.h"

#include "hw/s390x/css.h"

#include "ipl.h"

#include "qemu/error-report.h"



#define KERN_IMAGE_START                0x010000UL

#define KERN_PARM_AREA                  0x010480UL
@@ -209,6 +210,7 @@ static Property s390_ipl_properties[] = { 
    DEFINE_PROP_STRING("initrd", S390IPLState, initrd),

    DEFINE_PROP_STRING("cmdline", S390IPLState, cmdline),

    DEFINE_PROP_STRING("firmware", S390IPLState, firmware),

    DEFINE_PROP_STRING("netboot_fw", S390IPLState, netboot_fw),

    DEFINE_PROP_BOOL("enforce_bios", S390IPLState, enforce_bios, false),

    DEFINE_PROP_BOOL("iplbext_migration", S390IPLState, iplbext_migration,

                     true),
@@ -226,6 +228,12 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl) 
                TYPE_VIRTIO_CCW_DEVICE);

        SCSIDevice *sd = (SCSIDevice *) object_dynamic_cast(OBJECT(dev_st),

                                                            TYPE_SCSI_DEVICE);

        VirtIONet *vn = (VirtIONet *) object_dynamic_cast(OBJECT(dev_st),

                                                          TYPE_VIRTIO_NET);



        if (vn) {

            ipl->netboot = true;

        }

        if (virtio_ccw_dev) {

            CcwDevice *ccw_dev = CCW_DEVICE(virtio_ccw_dev);
@@ -258,12 +266,86 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl) 
    return false;

}



static int load_netboot_image(Error **errp)

{

    S390IPLState *ipl = get_ipl_device();

    char *netboot_filename;

    MemoryRegion *sysmem =  get_system_memory();

    MemoryRegion *mr = NULL;

    void *ram_ptr = NULL;

    int img_size = -1;



    mr = memory_region_find(sysmem, 0, 1).mr;

    if (!mr) {

        error_setg(errp, "Failed to find memory region at address 0");

        return -1;

    }



    ram_ptr = memory_region_get_ram_ptr(mr);

    if (!ram_ptr) {

        error_setg(errp, "No RAM found");

        goto unref_mr;

    }



    netboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, ipl->netboot_fw);

    if (netboot_filename == NULL) {

        error_setg(errp, "Could not find network bootloader");

        goto unref_mr;

    }



    img_size = load_elf_ram(netboot_filename, NULL, NULL, &ipl->start_addr,

                            NULL, NULL, 1, EM_S390, 0, 0, NULL, false);



    if (img_size < 0) {

        img_size = load_image_size(netboot_filename, ram_ptr, ram_size);

        ipl->start_addr = KERN_IMAGE_START;

    }



    if (img_size < 0) {

        error_setg(errp, "Failed to load network bootloader");

    }



    g_free(netboot_filename);



unref_mr:

    memory_region_unref(mr);

    return img_size;

}



static bool is_virtio_net_device(IplParameterBlock *iplb)

{

    uint8_t cssid;

    uint8_t ssid;

    uint16_t devno;

    uint16_t schid;

    SubchDev *sch = NULL;



    if (iplb->pbt != S390_IPL_TYPE_CCW) {

        return false;

    }



    devno = be16_to_cpu(iplb->ccw.devno);

    ssid = iplb->ccw.ssid & 3;



    for (schid = 0; schid < MAX_SCHID; schid++) {

        for (cssid = 0; cssid < MAX_CSSID; cssid++) {

            sch = css_find_subch(1, cssid, ssid, schid);



            if (sch && sch->devno == devno) {

                return sch->id.cu_model == VIRTIO_ID_NET;

            }

        }

    }

    return false;

}



void s390_ipl_update_diag308(IplParameterBlock *iplb)

{

    S390IPLState *ipl = get_ipl_device();



    ipl->iplb = *iplb;

    ipl->iplb_valid = true;

    ipl->netboot = is_virtio_net_device(iplb);

}



IplParameterBlock *s390_ipl_get_iplb(void)
@@ -287,6 +369,7 @@ void s390_reipl_request(void) 
void s390_ipl_prepare_cpu(S390CPU *cpu)

{

    S390IPLState *ipl = get_ipl_device();

    Error *err = NULL;



    cpu->env.psw.addr = ipl->start_addr;

    cpu->env.psw.mask = IPL_PSW_MASK;
@@ -297,6 +380,13 @@ void s390_ipl_prepare_cpu(S390CPU *cpu) 
            ipl->iplb_valid = s390_gen_initial_iplb(ipl);

        }

    }

    if (ipl->netboot) {

        if (load_netboot_image(&err) < 0) {

            error_report_err(err);

            vm_stop(RUN_STATE_INTERNAL_ERROR);

        }

        ipl->iplb.ccw.netboot_start_addr = ipl->start_addr;

    }

}



static void s390_ipl_reset(DeviceState *dev)

hw/s390x/ipl.h

+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
#include "cpu.h"



struct IplBlockCcw {

    uint8_t  reserved0[85];

    uint64_t netboot_start_addr;

    uint8_t  reserved0[77];

    uint8_t  ssid;

    uint16_t devno;

    uint8_t  vm_flags;
@@ -100,12 +101,14 @@ struct S390IPLState { 
    IplParameterBlock iplb;

    bool iplb_valid;

    bool reipl_requested;

    bool netboot;



    /*< public >*/

    char *kernel;

    char *initrd;

    char *cmdline;

    char *firmware;

    char *netboot_fw;

    uint8_t cssid;

    uint8_t ssid;

    uint16_t devno;

hw/s390x/s390-virtio-ccw.c

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ static void ccw_init(MachineState *machine) 
    /* get a BUS */

    css_bus = virtual_css_bus_init();

    s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,

                      machine->initrd_filename, "s390-ccw.img", true);

                      machine->initrd_filename, "s390-ccw.img",

                      "s390-netboot.img", true);

    s390_flic_init();



    dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);

hw/s390x/s390-virtio.c

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ void s390_init_ipl_dev(const char *kernel_filename, 
                       const char *kernel_cmdline,

                       const char *initrd_filename,

                       const char *firmware,

                       const char *netboot_fw,

                       bool enforce_bios)

{

    Object *new = object_new(TYPE_S390_IPL);
@@ -78,6 +79,7 @@ void s390_init_ipl_dev(const char *kernel_filename, 
    }

    qdev_prop_set_string(dev, "cmdline", kernel_cmdline);

    qdev_prop_set_string(dev, "firmware", firmware);

    qdev_prop_set_string(dev, "netboot_fw", netboot_fw);

    qdev_prop_set_bit(dev, "enforce_bios", enforce_bios);

    object_property_add_child(qdev_get_machine(), TYPE_S390_IPL,

                              new, NULL);