On 18.12.2012, at 18:50, Jens Freimann wrote:
> From: Christian Borntraeger <borntrae...@de.ibm.com>
>
> Lets move the code to setup IPL for external kernel
> or via the zipl rom into a separate file. This allows to
>
> - define a reboot handler, setting up the PSW appropriately
> - enhance the boot code to IPL disks that contain a bootmap that
> was created with zipl under LPAR or z/VM (future patch)
> - reuse that code for several machines (e.g. virtio-ccw and virtio-s390)
> - allow different machines to provide different defaults
>
> Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com>
> Signed-off-by: Jens Freimann <jf...@linux.vnet.ibm.com>
>
> ---
> v2 -> v3:
> * changed include <sysemu.h> -> "sysemu.h"
> * make S390IPLState non-anonymous struct
> * add QOM cast macro S390_IPL(dev)
> * remove trailing whitespace
>
> v1 -> v2:
> * get rid of ipl.h
> * move defines to ipl.c and make s390_ipl_cpu static
> ---
> ---
> hw/s390-virtio.c | 98 +++-------------------------
> hw/s390x/Makefile.objs | 1 +
> hw/s390x/ipl.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 185 insertions(+), 88 deletions(-)
> create mode 100644 hw/s390x/ipl.c
>
> diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
> index ca1bb09..a350430 100644
> --- a/hw/s390-virtio.c
> +++ b/hw/s390-virtio.c
> @@ -25,7 +25,6 @@
> #include "boards.h"
> #include "monitor.h"
> #include "loader.h"
> -#include "elf.h"
> #include "hw/virtio.h"
> #include "hw/sysbus.h"
> #include "kvm.h"
> @@ -48,17 +47,6 @@
> #define KVM_S390_VIRTIO_RESET 1
> #define KVM_S390_VIRTIO_SET_STATUS 2
>
> -#define KERN_IMAGE_START 0x010000UL
> -#define KERN_PARM_AREA 0x010480UL
> -#define INITRD_START 0x800000UL
> -#define INITRD_PARM_START 0x010408UL
> -#define INITRD_PARM_SIZE 0x010410UL
> -#define PARMFILE_START 0x001000UL
> -
> -#define ZIPL_START 0x009000UL
> -#define ZIPL_LOAD_ADDR 0x009000UL
> -#define ZIPL_FILENAME "s390-zipl.rom"
> -
> #define MAX_BLK_DEVS 10
>
> static VirtIOS390Bus *s390_bus;
> @@ -156,15 +144,10 @@ static void s390_init(QEMUMachineInitArgs *args)
> {
> ram_addr_t my_ram_size = args->ram_size;
> const char *cpu_model = args->cpu_model;
> - const char *kernel_filename = args->kernel_filename;
> - const char *kernel_cmdline = args->kernel_cmdline;
> - const char *initrd_filename = args->initrd_filename;
> CPUS390XState *env = NULL;
> + DeviceState *dev;
> MemoryRegion *sysmem = get_system_memory();
> MemoryRegion *ram = g_new(MemoryRegion, 1);
> - ram_addr_t kernel_size = 0;
> - ram_addr_t initrd_offset;
> - ram_addr_t initrd_size = 0;
> int shift = 0;
> uint8_t *storage_keys;
> void *virtio_region;
> @@ -185,6 +168,15 @@ static void s390_init(QEMUMachineInitArgs *args)
> /* get a BUS */
> s390_bus = s390_virtio_bus_init(&my_ram_size);
> s390_sclp_init();
> + dev = qdev_create(NULL, "s390-ipl");
> + if (args->kernel_filename) {
> + qdev_prop_set_string(dev, "kernel", args->kernel_filename);
> + }
> + if (args->initrd_filename) {
> + qdev_prop_set_string(dev, "initrd", args->initrd_filename);
> + }
> + qdev_prop_set_string(dev, "cmdline", args->kernel_cmdline);
> + qdev_init_nofail(dev);
>
> /* allocate RAM */
> memory_region_init_ram(ram, "s390.ram", my_ram_size);
> @@ -225,76 +217,6 @@ static void s390_init(QEMUMachineInitArgs *args)
> tmp_env->storage_keys = storage_keys;
> }
>
> - /* One CPU has to run */
> - s390_add_running_cpu(env);
> -
> - if (kernel_filename) {
> -
> - kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, NULL,
> - NULL, 1, ELF_MACHINE, 0);
> - if (kernel_size == -1UL) {
> - kernel_size = load_image_targphys(kernel_filename, 0, ram_size);
> - }
> - if (kernel_size == -1UL) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> - kernel_filename);
> - exit(1);
> - }
> - /*
> - * we can not rely on the ELF entry point, since up to 3.2 this
> - * value was 0x800 (the SALIPL loader) and it wont work. For
> - * all (Linux) cases 0x10000 (KERN_IMAGE_START) should be fine.
> - */
> - env->psw.addr = KERN_IMAGE_START;
> - env->psw.mask = 0x0000000180000000ULL;
> - } else {
> - ram_addr_t bios_size = 0;
> - char *bios_filename;
> -
> - /* Load zipl bootloader */
> - if (bios_name == NULL) {
> - bios_name = ZIPL_FILENAME;
> - }
> -
> - bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
> - bios_size = load_image_targphys(bios_filename, ZIPL_LOAD_ADDR, 4096);
> - g_free(bios_filename);
> -
> - if ((long)bios_size < 0) {
> - hw_error("could not load bootloader '%s'\n", bios_name);
> - }
> -
> - if (bios_size > 4096) {
> - hw_error("stage1 bootloader is > 4k\n");
> - }
> -
> - env->psw.addr = ZIPL_START;
> - env->psw.mask = 0x0000000180000000ULL;
> - }
> -
> - if (initrd_filename) {
> - initrd_offset = INITRD_START;
> - while (kernel_size + 0x100000 > initrd_offset) {
> - initrd_offset += 0x100000;
> - }
> - initrd_size = load_image_targphys(initrd_filename, initrd_offset,
> - ram_size - initrd_offset);
> - if (initrd_size == -1UL) {
> - fprintf(stderr, "qemu: could not load initrd '%s'\n",
> - initrd_filename);
> - exit(1);
> - }
> -
> - /* we have to overwrite values in the kernel image, which are "rom"
> */
> - stq_p(rom_ptr(INITRD_PARM_START), initrd_offset);
> - stq_p(rom_ptr(INITRD_PARM_SIZE), initrd_size);
> - }
> -
> - if (rom_ptr(KERN_PARM_AREA)) {
> - /* we have to overwrite values in the kernel image, which are "rom"
> */
> - memcpy(rom_ptr(KERN_PARM_AREA), kernel_cmdline,
> - strlen(kernel_cmdline) + 1);
> - }
>
> /* Create VirtIO network adapters */
> for(i = 0; i < nb_nics; i++) {
> diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
> index 096dfcd..4a5a5d8 100644
> --- a/hw/s390x/Makefile.objs
> +++ b/hw/s390x/Makefile.objs
> @@ -4,3 +4,4 @@ obj-y := $(addprefix ../,$(obj-y))
> obj-y += sclp.o
> obj-y += event-facility.o
> obj-y += sclpquiesce.o sclpconsole.o
> +obj-y += ipl.o
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> new file mode 100644
> index 0000000..7670079
> --- /dev/null
> +++ b/hw/s390x/ipl.c
> @@ -0,0 +1,174 @@
> +/*
> + * bootloader support
> + *
> + * Copyright IBM, Corp. 2012
> + *
> + * Authors:
> + * Christian Borntraeger <borntrae...@de.ibm.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or (at
> your
> + * option) any later version. See the COPYING file in the top-level
> directory.
> + *
> + */
> +
> +#include "sysemu.h"
> +#include "cpu.h"
> +#include "elf.h"
> +#include "hw/loader.h"
> +#include "hw/sysbus.h"
> +
> +#define KERN_IMAGE_START 0x010000UL
> +#define KERN_PARM_AREA 0x010480UL
> +#define INITRD_START 0x800000UL
> +#define INITRD_PARM_START 0x010408UL
> +#define INITRD_PARM_SIZE 0x010410UL
> +#define PARMFILE_START 0x001000UL
> +#define ZIPL_FILENAME "s390-zipl.rom"
> +#define ZIPL_IMAGE_START 0x009000UL
> +#define IPL_PSW_MASK 0x0000000180000000ULL
I actually meant something along the lines of
#define IPL_PSW_MASK (PSW_MASK_32 | PSW_MASK_64)
but I'll just change it accordingly while applying the patch :).
> +
> +#define TYPE_S390_IPL "s390-ipl"
> +#define S390_IPL(obj) \
> + OBJECT_CHECK(S390IPLState, (obj), TYPE_S390_IPL)
> +#if 0
> +#define S390_IPL_CLASS(klass) \
> + OBJECT_CLASS_CHECK(S390IPLState, (klass), TYPE_S390_IPL)
> +#define S390_IPL_GET_CLASS(obj) \
> + OBJECT_GET_CLASS(S390IPLState, (obj), TYPE_S390_IPL)
> +#endif
> +
> +typedef struct S390IPLClass {
> + /*< private >*/
> + SysBusDeviceClass parent_class;
> + /*< public >*/
> +
> + void (*parent_reset) (SysBusDevice *dev);
> +} S390IPLClass;
> +
> +typedef struct S390IPLState {
> + /*< private >*/
> + SysBusDevice parent_obj;
> + /*< public >*/
> +
> + char *kernel;
> + char *initrd;
> + char *cmdline;
> +} S390IPLState;
> +
> +
> +static void s390_ipl_cpu(uint64_t pswaddr)
> +{
> + CPUS390XState *env = qemu_get_cpu(0);
> + env->psw.addr = pswaddr;
> + env->psw.mask = IPL_PSW_MASK;
> + s390_add_running_cpu(env);
> +}
> +
> +static int s390_ipl_init(SysBusDevice *dev)
> +{
> + S390IPLState *ipl = S390_IPL(dev);
> + ram_addr_t kernel_size = 0;
> +
> + if (!ipl->kernel) {
> + ram_addr_t bios_size = 0;
> + char *bios_filename;
> +
> + /* Load zipl bootloader */
> + if (bios_name == NULL) {
> + bios_name = ZIPL_FILENAME;
> + }
> +
> + bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
> + bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START,
> 4096);
> + g_free(bios_filename);
> +
> + if ((long)bios_size < 0) {
> + hw_error("could not load bootloader '%s'\n", bios_name);
> + }
> +
> + if (bios_size > 4096) {
> + hw_error("stage1 bootloader is > 4k\n");
> + }
> + return 0;
> + } else {
> + kernel_size = load_elf(ipl->kernel, NULL, NULL, NULL, NULL,
> + NULL, 1, ELF_MACHINE, 0);
> + if (kernel_size == -1UL) {
> + kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);
> + }
> + if (kernel_size == -1UL) {
> + fprintf(stderr, "could not load kernel '%s'\n", ipl->kernel);
> + return -1;
> + }
> + /* we have to overwrite values in the kernel image, which are "rom"
> */
> + strcpy(rom_ptr(KERN_PARM_AREA), ipl->cmdline);
> + }
> + if (ipl->initrd) {
> + ram_addr_t initrd_offset, initrd_size;
> +
> + initrd_offset = INITRD_START;
> + while (kernel_size + 0x100000 > initrd_offset) {
> + initrd_offset += 0x100000;
> + }
> + initrd_size = load_image_targphys(ipl->initrd, initrd_offset,
> + ram_size - initrd_offset);
> + if (initrd_size == -1UL) {
> + fprintf(stderr, "qemu: could not load initrd '%s'\n",
> ipl->initrd);
> + exit(1);
> + }
> +
> + /* we have to overwrite values in the kernel image, which are "rom"
> */
> + stq_p(rom_ptr(INITRD_PARM_START), initrd_offset);
> + stq_p(rom_ptr(INITRD_PARM_SIZE), initrd_size);
In the long run, these should be overwritten in RAM manually on reset, so that
we can change load_image_targphys to reload the kernel from a file on reset.
Thanks, applied to s390-next.
Alex
