Commit fe677fd1 authored by Aurelien Jarno's avatar Aurelien Jarno
Browse files

Merge branch 's390-for-upstream' of git://github.com/agraf/qemu 

* 's390-for-upstream' of git://github.com/agraf/qemu:
  s390: update s390-ccw.img
  S390: BIOS boot from given device
  S390: Add virtio-blk boot
  S390: Merging s390_ipl_cpu and s390_ipl_reset
  S390: BIOS create link to src folder for .img file
  S390: BIOS check for file
parents e0ff466c 2ddef429

configure

+1 −0
Original line number Diff line number Diff line
@@ -4518,6 +4518,7 @@ for bios_file in \ 
    $source_path/pc-bios/*.aml \

    $source_path/pc-bios/*.rom \

    $source_path/pc-bios/*.dtb \

    $source_path/pc-bios/*.img \

    $source_path/pc-bios/openbios-* \

    $source_path/pc-bios/palcode-*

do

hw/s390x/ipl.c

+27 −11
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include "elf.h"

#include "hw/loader.h"

#include "hw/sysbus.h"

#include "hw/s390x/virtio-ccw.h"

#include "hw/s390x/css.h"



#define KERN_IMAGE_START                0x010000UL

#define KERN_PARM_AREA                  0x010480UL
@@ -57,16 +59,6 @@ typedef struct S390IPLState { 
} S390IPLState;





static void s390_ipl_cpu(uint64_t pswaddr)

{

    S390CPU *cpu = S390_CPU(qemu_get_cpu(0));

    CPUS390XState *env = &cpu->env;



    env->psw.addr = pswaddr;

    env->psw.mask = IPL_PSW_MASK;

    s390_add_running_cpu(cpu);

}



static int s390_ipl_init(SysBusDevice *dev)

{

    S390IPLState *ipl = S390_IPL(dev);
@@ -82,6 +74,10 @@ static int s390_ipl_init(SysBusDevice *dev) 
        }



        bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);

        if (bios_filename == NULL) {

            hw_error("could not find stage1 bootloader\n");

        }



        bios_size = load_elf(bios_filename, NULL, NULL, &ipl->start_addr, NULL,

                             NULL, 1, ELF_MACHINE, 0);

        if (bios_size == -1UL) {
@@ -151,8 +147,28 @@ static Property s390_ipl_properties[] = { 
static void s390_ipl_reset(DeviceState *dev)

{

    S390IPLState *ipl = S390_IPL(dev);

    S390CPU *cpu = S390_CPU(qemu_get_cpu(0));

    CPUS390XState *env = &cpu->env;



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

    env->psw.mask = IPL_PSW_MASK;



    if (!ipl->kernel) {

        /* booting firmware, tell what device to boot from */

        DeviceState *dev_st = get_boot_device(0);

        VirtioCcwDevice *ccw_dev = (VirtioCcwDevice *) object_dynamic_cast(

                OBJECT(&(dev_st->parent_obj)), "virtio-blk-ccw");



        if (ccw_dev) {

            env->regs[7] = ccw_dev->sch->cssid << 24 |

                           ccw_dev->sch->ssid << 16 |

                           ccw_dev->sch->devno;

        } else {

            env->regs[7] = -1;

        }

    }



    s390_ipl_cpu(ipl->start_addr);

    s390_add_running_cpu(cpu);

}



static void s390_ipl_class_init(ObjectClass *klass, void *data)

pc-bios/s390-ccw.img

(9.21 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

pc-bios/s390-ccw/main.c

+18 −6
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


struct subchannel_id blk_schid;

char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));

uint64_t boot_value;



void virtio_panic(const char *string)

{
@@ -20,15 +21,22 @@ void virtio_panic(const char *string) 
    while (1) { }

}



static void virtio_setup(void)

static void virtio_setup(uint64_t dev_info)

{

    struct schib schib;

    int i;

    int r;

    bool found = false;



    bool check_devno = false;

    uint16_t dev_no = -1;

    blk_schid.one = 1;



    if (dev_info != -1) {

        check_devno = true;

        dev_no = dev_info & 0xffff;

        debug_print_int("device no. ", dev_no);

    }



    for (i = 0; i < 0x10000; i++) {

        blk_schid.sch_no = i;

        r = stsch_err(blk_schid, &schib);
@@ -36,12 +44,14 @@ static void virtio_setup(void) 
            break;

        }

        if (schib.pmcw.dnv) {

            if (!check_devno || (schib.pmcw.dev == dev_no)) {

                if (virtio_is_blk(blk_schid)) {

                    found = true;

                    break;

                }

            }

        }

    }



    if (!found) {

        virtio_panic("No virtio-blk device found!\n");
@@ -53,7 +63,9 @@ static void virtio_setup(void) 
int main(void)

{

    sclp_setup();

    virtio_setup();

    debug_print_int("boot reg[7] ", boot_value);

    virtio_setup(boot_value);



    if (zipl_load() < 0)

        sclp_print("Failed to load OS from hard disk\n");

    disabled_wait();

pc-bios/s390-ccw/start.S

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
_start:



larl	%r15, stack + 0x8000    /* Set up stack */

larl    %r6, boot_value

stg     %r7, 0(%r6)     /* save the boot_value before any function calls */

j	main                    /* And call C */



/*