s390 patch queue 2013-04-26
Hi Blue / Aurelien,
This is my current patch queue for s390. Please pull.
Alex
The following changes since commit bf9b255f484fd61cbaa91faeff254140a0ecd18c:
Anthony Liguori (1):
gtk: refactor menu creation
are available in the git repository at:
git://github.com/agraf/qemu.git s390-for-upstream
Alexander Graf (12):
S390: Make IPL reset address dynamic
S390: IPL: Support ELF firmware
S390: IPL: Use different firmware for different machines
S390: ccw firmware: Add start assembly
S390: ccw firmware: Add main program
S390: ccw firmware: Add sclp output
S390: ccw firmware: Add virtio device drivers
S390: ccw firmware: Add glue header
S390: ccw firmware: Add bootmap interpreter
S390: ccw firmware: Add Makefile
S390: ccw firmware: Add compiled blob
S390: CCW: Use new, working firmware by default
Christian Borntraeger (4):
s390-ccw.img: replace while loop with a disabled wait on s390 bios s390-ccw.img: build s390-ccw rom on s3900 system by default s390-ccw.img: Take care of the elf->img transition s390-ccw.img: Fix compile warning in s390 ccw virtio code
Cornelia Huck (4):
s390-ccw.img: Detect devices with stsch.
s390-ccw.img: Enhance drain_irqs().
s390-ccw.img: Rudimentary error checking.
s390-ccw.img: Get queue config from host.
Dominik Dingel (1):
Common: Add quick access to first boot device
Jason J. Herne (2):
Allow selective runtime register synchronization Utilize selective runtime reg sync for hot code paths
KONRAD Frederic (1):
virtio-rng-s390: add properties.
.gitignore | 2 + Makefile | 1 + configure | 7 +- hw/s390x/ipl.c | 41 +++--- hw/s390x/s390-virtio-bus.c | 8 + hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/s390-virtio.c | 7 +- hw/s390x/s390-virtio.h | 3 +- include/sysemu/sysemu.h | 2 + pc-bios/s390-ccw.img | Bin 0 -> 9432 bytes pc-bios/s390-ccw/Makefile | 26 ++++ pc-bios/s390-ccw/bootmap.c | 235 ++++++++++++++++++++++++++++++ pc-bios/s390-ccw/cio.h | 322 +++++++++++++++++++++++++++++++++++++++++ pc-bios/s390-ccw/main.c | 61 ++++++++ pc-bios/s390-ccw/s390-ccw.h | 134 +++++++++++++++++ pc-bios/s390-ccw/sclp-ascii.c | 81 ++++++++++ pc-bios/s390-ccw/sclp.h | 107 ++++++++++++++ pc-bios/s390-ccw/start.S | 31 ++++ pc-bios/s390-ccw/virtio.c | 298 ++++++++++++++++++++++++++++++++++++++ pc-bios/s390-ccw/virtio.h | 163 +++++++++++++++++++++ target-s390x/cpu.h | 17 ++ target-s390x/kvm.c | 82 ++++++++++- vl.c | 18 +++ 23 files changed, 1622 insertions(+), 26 deletions(-) create mode 100644 pc-bios/s390-ccw.img create mode 100644 pc-bios/s390-ccw/Makefile create mode 100644 pc-bios/s390-ccw/bootmap.c create mode 100644 pc-bios/s390-ccw/cio.h create mode 100644 pc-bios/s390-ccw/main.c create mode 100644 pc-bios/s390-ccw/s390-ccw.h create mode 100644 pc-bios/s390-ccw/sclp-ascii.c create mode 100644 pc-bios/s390-ccw/sclp.h create mode 100644 pc-bios/s390-ccw/start.S create mode 100644 pc-bios/s390-ccw/virtio.c create mode 100644 pc-bios/s390-ccw/virtio.h
PATCH 1/24 S390: Make IPL reset address dynamic
We can have different load addresses for different blobs we boot with. Make the reset IP dynamic, so that we can handle things more flexibly.
--- hw/s390x/ipl.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
hw/s390x/ipl.c +11 -11
@@ -48,8 +48,9 @@ typedef struct S390IPLClass { typedef struct S390IPLState { /*< private >*/ SysBusDevice parent_obj; - /*< public >*/ + uint64_t start_addr; + /*< public >*/ char *kernel; char *initrd; char *cmdline;
@@ -82,6 +83,7 @@ static int s390_ipl_init(SysBusDevice *dev) bios_filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); bios_size =load_image_targphys (bios_filename,ZIPL_IMAGE_START ,4096 ); + ipl->start_addr =ZIPL_IMAGE_START ;g_free (bios_filename);if ((long )bios_size <0 ) {
@@ -104,6 +106,13 @@ static int s390_ipl_init(SysBusDevice *dev) }/* we have to overwrite values in the kernel image, which are "rom" */ strcpy (rom_ptr (KERN_PARM_AREA ), ipl->cmdline); + +/* +* 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. +*/ + ipl->start_addr =KERN_IMAGE_START ; }if (ipl->initrd) {ram_addr_t initrd_offset, initrd_size;
@@ -138,16 +147,7 @@ static void s390_ipl_reset(DeviceState *dev) {S390IPLState *ipl =S390_IPL (dev); -if (ipl->kernel) { -/* -* 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. -*/ -return s390_ipl_cpu (KERN_IMAGE_START ); - }else { -return s390_ipl_cpu (ZIPL_IMAGE_START ); - } +s390_ipl_cpu (ipl->start_addr); }static void s390_ipl_class_init (ObjectClass *klass,void *data)
Signature · 1 line
1.6.0.2
PATCH 2/24 S390: IPL: Support ELF firmware
In reply to Alexander GrafOur firmware blob is always a raw file that we load at a fixed address today. Support loading an ELF blob instead that we can map high up in memory.
This way we don't have to be so conscious about size constraints.
--- hw/s390x/ipl.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
hw/s390x/ipl.c +10 -6
@@ -82,17 +82,21 @@ static int s390_ipl_init(SysBusDevice *dev) } bios_filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name); - bios_size =load_image_targphys (bios_filename,ZIPL_IMAGE_START ,4096 ); - ipl->start_addr =ZIPL_IMAGE_START ; + bios_size =load_elf (bios_filename,NULL ,NULL , &ipl->start_addr,NULL , +NULL ,1 ,ELF_MACHINE ,0 ); +if (bios_size ==-1UL ) { + bios_size =load_image_targphys (bios_filename,ZIPL_IMAGE_START , +4096 ); + ipl->start_addr =ZIPL_IMAGE_START ; +if (bios_size >4096 ) { +hw_error ("stage1 bootloader is > 4k\n" ); + } + }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,
Signature · 1 line
1.6.0.2
PATCH 3/24 S390: IPL: Use different firmware for different machines
In reply to Alexander GrafWe have a virtio-s390 and a virtio-ccw machine in QEMU. Both use vastly different ways to do I/O. Having the same firmware blob for both doesn't really make any sense.
Instead, let's parametrize the firmware file name, so that we can have different blobs for different machines.
--- hw/s390x/ipl.c | 5 +++-- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/s390-virtio.c | 7 +++++-- hw/s390x/s390-virtio.h | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-)
hw/s390x/ipl.c +3 -2
@@ -23,7 +23,6 @@#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 (PSW_MASK_32 | PSW_MASK_64)
@@ -54,6 +53,7 @@ typedef struct S390IPLState {char *kernel;char *initrd;char *cmdline; +char *firmware; } S390IPLState;
@@ -78,7 +78,7 @@ static int s390_ipl_init(SysBusDevice *dev)/* Load zipl bootloader */ if (bios_name ==NULL ) { - bios_name =ZIPL_FILENAME ; + bios_name = ipl->firmware; } bios_filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , bios_name);
@@ -144,6 +144,7 @@ static Property s390_ipl_properties[] = {DEFINE_PROP_STRING ("kernel" , S390IPLState, kernel),DEFINE_PROP_STRING ("initrd" , S390IPLState, initrd),DEFINE_PROP_STRING ("cmdline" , S390IPLState, cmdline), +DEFINE_PROP_STRING ("firmware" , S390IPLState, firmware), DEFINE_PROP_END_OF_LIST(), };
hw/s390x/s390-virtio-ccw.c +1 -1
@@ -83,7 +83,7 @@ static void ccw_init(QEMUMachineInitArgs *args) css_bus =virtual_css_bus_init ();s390_sclp_init ();s390_init_ipl_dev (args->kernel_filename, args->kernel_cmdline, - args->initrd_filename); + args->initrd_filename,"s390-zipl.rom" );/* register hypercalls */ virtio_ccw_register_hcalls ();
hw/s390x/s390-virtio.c +5 -2
@@ -49,6 +49,7 @@#endif #define MAX_BLK_DEVS 10 +#define ZIPL_FILENAME "s390-zipl.rom"static VirtIOS390Bus *s390_bus;static S390CPU **ipi_states;
@@ -158,7 +159,8 @@ unsigned s390_del_running_cpu(S390CPU *cpu)void s390_init_ipl_dev (const char *kernel_filename,const char *kernel_cmdline, -const char *initrd_filename) +const char *initrd_filename, +const char *firmware) {DeviceState *dev;
@@ -170,6 +172,7 @@ void s390_init_ipl_dev(const char *kernel_filename,qdev_prop_set_string (dev,"initrd" , initrd_filename); }qdev_prop_set_string (dev,"cmdline" , kernel_cmdline); +qdev_prop_set_string (dev,"firmware" , firmware);qdev_init_nofail (dev); }
@@ -247,7 +250,7 @@ static void s390_init(QEMUMachineInitArgs *args) s390_bus =s390_virtio_bus_init (&my_ram_size);s390_sclp_init ();s390_init_ipl_dev (args->kernel_filename, args->kernel_cmdline, - args->initrd_filename); + args->initrd_filename,ZIPL_FILENAME );/* register hypercalls */ s390_virtio_register_hcalls ();
hw/s390x/s390-virtio.h +2 -1
@@ -23,6 +23,7 @@ void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn);void s390_init_cpus (const char *cpu_model,uint8_t *storage_keys);void s390_init_ipl_dev (const char *kernel_filename,const char *kernel_cmdline, -const char *initrd_filename); +const char *initrd_filename, +const char *firmware);void s390_create_virtio_net (BusState *bus,const char *name);#endif
Signature · 1 line
1.6.0.2
PATCH 4/24 S390: ccw firmware: Add start assembly
In reply to Alexander GrafWe want to write most of our code in C, so add a small assembly stub that jumps straight into C code for us to continue booting.
--- pc-bios/s390-ccw/start.S | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 pc-bios/s390-ccw/start.S
pc-bios/s390-ccw/start.S new file +16 -0
@@ -0,0 +1,16 @@ +/* + * First stage boot loader for virtio devices. The compiled output goes + * into the pc-bios directory of qemu. + * + * Copyright (c) 2013 Alexander Graf <[email protected]> + * + * 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. + */ + + .globl _start +_start: + +larl %r15, stack + 0x8000 /* Set up stack */ +j main /* And call C */
Signature · 1 line
1.6.0.2
PATCH 5/24 S390: ccw firmware: Add main program
In reply to Alexander GrafThis C file is the main driving piece of the s390 ccw firmware. It provides a search for a workable block device, sets it as the default to boot off of and boots from it.
--- pc-bios/s390-ccw/main.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) create mode 100644 pc-bios/s390-ccw/main.c
pc-bios/s390-ccw/main.c new file +56 -0
@@ -0,0 +1,56 @@ +/* +* S390 virtio-ccw loading program +* +* Copyright (c) 2013 Alexander Graf <[email protected]> +* +* 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 "s390-ccw.h" + +struct subchannel_id blk_schid; +char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE))); + +void virtio_panic (const char *string) +{ +sclp_print (string); +while (1 ) { } +} + +static void virtio_setup (void ) +{ +struct irb irb; +int i; +int r; +bool found = false; + + blk_schid.one =1 ; + +for (i =0 ; i <0x10000 ; i++) { + blk_schid.sch_no = i; + r =tsch (blk_schid, &irb); +if (r !=3 ) { +if (virtio_is_blk (blk_schid)) { + found = true; +break ; + } + } + } + +if (!found) { +virtio_panic ("No virtio-blk device found!\n" ); + } + +virtio_setup_block (blk_schid); +} + +int main (void ) +{ +sclp_setup (); +virtio_setup (); +if (zipl_load () <0 ) +sclp_print ("Failed to load OS from hard disk\n" ); +while (1 ) { } +}
Signature · 1 line
1.6.0.2
PATCH 6/24 S390: ccw firmware: Add sclp output
In reply to Alexander GrafIn order to communicate with the user, we need an I/O mechanism that he can read. Implement SCLP ASCII support, which happens to be the default in the s390 ccw machine.
This file is missing read support for now. It can only print messages.
--- pc-bios/s390-ccw/sclp-ascii.c | 81 +++++++++++++++++++++++++++++++ pc-bios/s390-ccw/sclp.h | 107 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 0 deletions(-) create mode 100644 pc-bios/s390-ccw/sclp-ascii.c create mode 100644 pc-bios/s390-ccw/sclp.h
pc-bios/s390-ccw/sclp-ascii.c new file +81 -0
@@ -0,0 +1,81 @@ +/* +* SCLP ASCII access driver +* +* Copyright (c) 2013 Alexander Graf <[email protected]> +* +* 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 "s390-ccw.h" +#include "sclp.h" + +static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096))); + +/* Perform service call. Return 0 on success, non-zero otherwise. */ +static int sclp_service_call (unsigned int command,void *sccb) +{ +int cc; + + asmvolatile ( +" .insn rre,0xb2200000,%1,%2\n" /* servc %1,%2 */ +" ipm %0\n" +" srl %0,28" + :"=&d" (cc) :"d" (command),"a" (__pa (sccb)) + :"cc" ,"memory" ); +if (cc ==3 ) +return -EIO ; +if (cc ==2 ) +return -EBUSY ; +return 0 ; +} + +static void sclp_set_write_mask (void ) +{ +WriteEventMask *sccb = (void *)_sccb; + + sccb->h.length =sizeof (WriteEventMask); + sccb->mask_length =sizeof (unsigned int ); + sccb->receive_mask =SCLP_EVENT_MASK_MSG_ASCII ; + sccb->cp_receive_mask =SCLP_EVENT_MASK_MSG_ASCII ; + sccb->send_mask =SCLP_EVENT_MASK_MSG_ASCII ; + sccb->cp_send_mask =SCLP_EVENT_MASK_MSG_ASCII ; + +sclp_service_call (SCLP_CMD_WRITE_EVENT_MASK , sccb); +} + +void sclp_setup (void ) +{ +sclp_set_write_mask (); +} + +static int _strlen (const char *str) +{ +int i; +for (i =0 ; *str; i++) + str++; +return i; +} + +static void _memcpy (char *dest,const char *src,int len) +{ +int i; +for (i =0 ; i < len; i++) + dest[i] = src[i]; +} + +void sclp_print (const char *str) +{ +int len =_strlen (str); +WriteEventData *sccb = (void *)_sccb; + + sccb->h.length =sizeof (WriteEventData) + len; + sccb->h.function_code =SCLP_FC_NORMAL_WRITE ; + sccb->ebh.length =sizeof (EventBufferHeader) + len; + sccb->ebh.type =SCLP_EVENT_ASCII_CONSOLE_DATA ; + sccb->ebh.flags =0 ; +_memcpy (sccb->data, str, len); + +sclp_service_call (SCLP_CMD_WRITE_EVENT_DATA , sccb); +}
pc-bios/s390-ccw/sclp.h new file +107 -0
107 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 7/24 S390: ccw firmware: Add virtio device drivers
In reply to Alexander GrafIn order to boot, we need to be able to access a virtio-blk device through the CCW bus. Implement support for this.
--- pc-bios/s390-ccw/cio.h | 322 +++++++++++++++++++++++++++++++++++++++++++++ pc-bios/s390-ccw/virtio.c | 274 ++++++++++++++++++++++++++++++++++++++ pc-bios/s390-ccw/virtio.h | 158 ++++++++++++++++++++++ 3 files changed, 754 insertions(+), 0 deletions(-) create mode 100644 pc-bios/s390-ccw/cio.h create mode 100644 pc-bios/s390-ccw/virtio.c create mode 100644 pc-bios/s390-ccw/virtio.h
pc-bios/s390-ccw/cio.h new file +322 -0
@@ -0,0 +1,322 @@ +/* +* Channel IO definitions +* +* Copyright (c) 2013 Alexander Graf <[email protected]> +* +* Inspired by various s390 headers in Linux 3.9. +* +* 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. +*/ + +#ifndef CIO_H +#define CIO_H + +/* +* path management control word +*/ +struct pmcw { +__u32 intparm;/* interruption parameter */ +__u32 qf :1 ;/* qdio facility */ +__u32 w :1 ; +__u32 isc :3 ;/* interruption sublass */ +__u32 res5 :3 ;/* reserved zeros */ +__u32 ena :1 ;/* enabled */ +__u32 lm :2 ;/* limit mode */ +__u32 mme :2 ;/* measurement-mode enable */ +__u32 mp :1 ;/* multipath mode */ +__u32 tf :1 ;/* timing facility */ +__u32 dnv :1 ;/* device number valid */ +__u32 dev :16 ;/* device number */ +__u8 lpm;/* logical path mask */ +__u8 pnom;/* path not operational mask */ +__u8 lpum;/* last path used mask */ +__u8 pim;/* path installed mask */ +__u16 mbi;/* measurement-block index */ +__u8 pom;/* path operational mask */ +__u8 pam;/* path available mask */ +__u8 chpid[8 ];/* CHPID 0-7 (if available) */ +__u32 unused1 :8 ;/* reserved zeros */ +__u32 st :3 ;/* subchannel type */ +__u32 unused2 :18 ;/* reserved zeros */ +__u32 mbfc :1 ;/* measurement block format control */ +__u32 xmwme :1 ;/* extended measurement word mode enable */ +__u32 csense :1 ;/* concurrent sense; can be enabled ...*/ +/* ... per MSCH, however, if facility */ +/* ... is not installed, this results */ +/* ... in an operand exception. */ +} __attribute__ ((packed)); + +/* Target SCHIB configuration. */ +struct schib_config { +__u64 mba; +__u32 intparm; +__u16 mbi; +__u32 isc:3 ; +__u32 ena:1 ; +__u32 mme:2 ; +__u32 mp:1 ; +__u32 csense:1 ; +__u32 mbfc:1 ; +} __attribute__ ((packed)); + +struct scsw { +__u16 flags; +__u16 ctrl; +__u32 cpa; +__u8 dstat; +__u8 cstat; +__u16 count; +} __attribute__ ((packed)); + +#define SCSW_FCTL_CLEAR_FUNC 0x1000 +#define SCSW_FCTL_HALT_FUNC 0x2000 +#define SCSW_FCTL_START_FUNC 0x4000 + +/* +* subchannel information block +*/ +struct schib { +struct pmcw pmcw;/* path management control word */ +struct scsw scsw;/* subchannel status word */ +__u64 mba;/* measurement block address */ +__u8 mda[4 ];/* model dependent area */ +} __attribute__ ((packed,aligned (4 ))); + +struct subchannel_id { +__u32 cssid :8 ; + __u32 : 4; +__u32 m :1 ; +__u32 ssid :2 ; +__u32 one :1 ; +__u32 sch_no :16 ; +} __attribute__ ((packed,aligned (4 ))); + +/* +* TPI info structure +*/ +struct tpi_info { +struct subchannel_id schid; +__u32 intparm;/* interruption parameter */ +__u32 adapter_IO :1 ; +__u32 reserved2 :1 ; +__u32 isc :3 ; +__u32 reserved3 :12 ; +__u32 int_type :3 ; +__u32 reserved4 :12 ; +} __attribute__ ((packed)); + +/* channel command word (type 1) */ +struct ccw1 { +__u8 cmd_code; +__u8 flags; +__u16 count; +__u32 cda; +} __attribute__ ((packed)); + +#define CCW_FLAG_DC 0x80 +#define CCW_FLAG_CC 0x40 +#define CCW_FLAG_SLI 0x20 +#define CCW_FLAG_SKIP 0x10 +#define CCW_FLAG_PCI 0x08 +#define CCW_FLAG_IDA 0x04 +#define CCW_FLAG_SUSPEND 0x02 + +#define CCW_CMD_NOOP 0x03 +#define CCW_CMD_BASIC_SENSE 0x04 +#define CCW_CMD_TIC 0x08 +#define CCW_CMD_SENSE_ID 0xe4 + +#define CCW_CMD_SET_VQ 0x13 +#define CCW_CMD_VDEV_RESET 0x33 +#define CCW_CMD_READ_FEAT 0x12 +#define CCW_CMD_WRITE_FEAT 0x11 +#define CCW_CMD_READ_CONF 0x22 +#define CCW_CMD_WRITE_CONF 0x21 +#define CCW_CMD_WRITE_STATUS 0x31 +#define CCW_CMD_SET_IND 0x43 +#define CCW_CMD_SET_CONF_IND 0x53 +#define CCW_CMD_READ_VQ_CONF 0x32 + +/* +* Command-mode operation request block +*/ +struct cmd_orb { +__u32 intparm;/* interruption parameter */ +__u32 key:4 ;/* flags, like key, suspend control, etc. */ +__u32 spnd:1 ;/* suspend control */ +__u32 res1:1 ;/* reserved */ +__u32 mod:1 ;/* modification control */ +__u32 sync:1 ;/* synchronize control */ +__u32 fmt:1 ;/* format control */ +__u32 pfch:1 ;/* prefetch control */ +__u32 isic:1 ;/* initial-status-interruption control */ +__u32 alcc:1 ;/* address-limit-checking control */ +__u32 ssic:1 ;/* suppress-suspended-interr. control */ +__u32 res2:1 ;/* reserved */ +__u32 c64:1 ;/* IDAW/QDIO 64 bit control */ +__u32 i2k:1 ;/* IDAW 2/4kB block size control */ +__u32 lpm:8 ;/* logical path mask */ +__u32 ils:1 ;/* incorrect length */ +__u32 zero:6 ;/* reserved zeros */ +__u32 orbx:1 ;/* ORB extension control */ +__u32 cpa;/* channel program address */ +} __attribute__ ((packed,aligned (4 ))); + +struct ciw { +__u8 type; +__u8 command; +__u16 count; +}; + +/* +* sense-id response buffer layout +*/ +struct senseid { +/* common part */ +__u8 reserved;/* always 0x'FF' */ +__u16 cu_type;/* control unit type */ +__u8 cu_model;/* control unit model */ +__u16 dev_type;/* device type */ +__u8 dev_model;/* device model */ +__u8 unused;/* padding byte */ +/* extended part */ +struct ciw ciw[62 ]; +} __attribute__ ((packed,aligned (4 ))); + +/* interruption response block */ +struct irb { +struct scsw scsw; +__u32 esw[5 ]; +__u32 ecw[8 ]; +__u32 emw[8 ]; +} __attribute__ ((packed,aligned (4 ))); + +/* +* Some S390 specific IO instructions as inline +*/ + +static inline int stsch_err (struct subchannel_id schid,struct schib *addr) +{ + register struct subchannel_id reg1 asm ("1") = schid; +int ccode = -EIO ; + + asmvolatile ( +" stsch 0(%3)\n" +"0: ipm %0\n" +" srl %0,28\n" +"1:\n" + :"+d" (ccode),"=m" (*addr) + :"d" (reg1),"a" (addr) + :"cc" ); +return ccode; +} + +static inline int msch (struct subchannel_id schid,struct schib *addr) +{ + register struct subchannel_id reg1 asm ("1") = schid; +int ccode; + + asmvolatile ( +" msch 0(%2)\n" +" ipm %0\n" +" srl %0,28" + :"=d" (ccode) + :"d" (reg1),"a" (addr),"m" (*addr) + :"cc" ); +return ccode; +} + +static inline int msch_err (struct subchannel_id schid,struct schib *addr) +{ + register struct subchannel_id reg1 asm ("1") = schid; +int ccode = -EIO ; + + asmvolatile ( +" msch 0(%2)\n" +"0: ipm %0\n" +" srl %0,28\n" +"1:\n" + :"+d" (ccode) + :"d" (reg1),"a" (addr),"m" (*addr) + :"cc" ); +return ccode; +} + +static inline int tsch (struct subchannel_id schid,struct irb *addr) +{ + register struct subchannel_id reg1 asm ("1") = schid; +int ccode; + + asmvolatile ( +" tsch 0(%3)\n" +" ipm %0\n" +" srl %0,28" + :"=d" (ccode),"=m" (*addr) + :"d" (reg1),"a" (addr) + :"cc" ); +return ccode; +} + +static inline int ssch (struct subchannel_id schid,struct cmd_orb *addr) +{ + register struct subchannel_id reg1 asm("1") = schid; +int ccode = -EIO ; + + asmvolatile ( +" ssch 0(%2)\n" +"0: ipm %0\n" +" srl %0,28\n" +"1:\n" + :"+d" (ccode) + :"d" (reg1),"a" (addr),"m" (*addr) + :"cc" ,"memory" ); +return ccode; +} + +static inline int csch (struct subchannel_id schid) +{ + register struct subchannel_id reg1 asm("1") = schid; +int ccode; + + asmvolatile ( +" csch\n" +" ipm %0\n" +" srl %0,28" + :"=d" (ccode) + :"d" (reg1) + :"cc" ); +return ccode; +} + +static inline int tpi (struct tpi_info *addr) +{ +int ccode; + + asmvolatile ( +" tpi 0(%2)\n" +" ipm %0\n" +" srl %0,28" + :"=d" (ccode),"=m" (*addr) + :"a" (addr) + :"cc" ); +return ccode; +} + +static inline int chsc (void *chsc_area) +{ +typedef struct {char _[4096 ]; }addr_type ; +int cc; + + asmvolatile ( +" .insn rre,0xb25f0000,%2,0\n" +" ipm %0\n" +" srl %0,28\n" + :"=d" (cc),"=m" (*(addr_type *) chsc_area) + :"d" (chsc_area),"m" (*(addr_type *) chsc_area) + :"cc" ); +return cc; +} + +#endif /* CIO_H */
pc-bios/s390-ccw/virtio.c new file +274 -0
274 lines not on this page · raw message
pc-bios/s390-ccw/virtio.h new file +158 -0
158 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 8/24 S390: ccw firmware: Add glue header
In reply to Alexander GrafLike all great programs, we have to call between different functions in different object files. And all of them need a common ground of defines.
Provide a file that provides these defines.
--- pc-bios/s390-ccw/s390-ccw.h | 131 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 131 insertions(+), 0 deletions(-) create mode 100644 pc-bios/s390-ccw/s390-ccw.h
pc-bios/s390-ccw/s390-ccw.h new file +131 -0
@@ -0,0 +1,131 @@ +/* +* S390 CCW boot loader +* +* Copyright (c) 2013 Alexander Graf <[email protected]> +* +* 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. +*/ + +#ifndef S390_CCW_H +#define S390_CCW_H + +/* #define DEBUG */ + +typedef unsigned char u8 ; +typedef unsigned short u16 ; +typedef unsigned int u32 ; +typedef unsigned long long u64 ; +typedef unsigned long ulong ; +typedef long size_t ; +typedef int bool ; +typedef unsigned char uint8_t ; +typedef unsigned short uint16_t ; +typedef unsigned int uint32_t ; +typedef unsigned long long uint64_t ; +typedef unsigned char __u8 ; +typedef unsigned short __u16 ; +typedef unsigned int __u32 ; +typedef unsigned long long __u64 ; + +#define true 1 +#define false 0 +#define PAGE_SIZE 4096 + +#ifndef EIO +#define EIO 1 +#endif +#ifndef EBUSY +#define EBUSY 2 +#endif +#ifndef NULL +#define NULL 0 +#endif + +#include "cio.h" + +/* main.c */ +void virtio_panic (const char *string); + +/* sclp-ascii.c */ +void sclp_print (const char *string); +void sclp_setup (void ); + +/* virtio.c */ +unsigned long virtio_load_direct (ulong rec_list1,ulong rec_list2, +ulong subchan_id,void *load_addr); +bool virtio_is_blk (struct subchannel_id schid); +void virtio_setup_block (struct subchannel_id schid); +int virtio_read (ulong sector,void *load_addr); + +/* bootmap.c */ +int zipl_load (void ); + +static inline void *memset (void *s,int c,size_t n) +{ +int i; +unsigned char *p = s; + +for (i =0 ; i < n; i++) { + p[i] = c; + } + +return s; +} + +static inline void fill_hex (char *out,unsigned char val) +{ +const char hex[] ="0123456789abcdef" ; + + out[0 ] = hex[(val >>4 ) &0xf ]; + out[1 ] = hex[val &0xf ]; +} + +static inline void print_int (const char *desc,u64 addr) +{ +unsigned char *addr_c = (unsigned char *)&addr; +char out[] =": 0xffffffffffffffff\n" ; +unsigned int i; + +for (i =0 ; i <sizeof (addr); i++) { +fill_hex (&out[4 + (i*2 )], addr_c[i]); + } + +sclp_print (desc); +sclp_print (out); +} + +static inline void debug_print_int (const char *desc,u64 addr) +{ +#ifdef DEBUG +print_int (desc, addr); +#endif +} + +static inline void debug_print_addr (const char *desc,void *p) +{ +#ifdef DEBUG +debug_print_int (desc, (unsigned int )(unsigned long )p); +#endif +} + +/*********************************************** +* Hypercall functions * +***********************************************/ + +#define KVM_S390_VIRTIO_NOTIFY 0 +#define KVM_S390_VIRTIO_RESET 1 +#define KVM_S390_VIRTIO_SET_STATUS 2 +#define KVM_S390_VIRTIO_CCW_NOTIFY 3 + +static inline void yield (void ) +{ + asmvolatile ("diag 0,0,0x44" + : : + :"memory" ,"cc" ); +} + +#define SECTOR_SIZE 512 + +#endif /* S390_CCW_H */
Signature · 1 line
1.6.0.2
PATCH 9/24 S390: ccw firmware: Add bootmap interpreter
In reply to Alexander GrafOn s390, there is an architected boot map format that we can read to boot a certain entry off the disk. Implement a simple reader for this that always boots the first (default) entry.
--- pc-bios/s390-ccw/bootmap.c | 235 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 235 insertions(+), 0 deletions(-) create mode 100644 pc-bios/s390-ccw/bootmap.c
pc-bios/s390-ccw/bootmap.c new file +235 -0
@@ -0,0 +1,235 @@ +/* +* QEMU S390 bootmap interpreter +* +* Copyright (c) 2009 Alexander Graf <[email protected]> +* +* 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 "s390-ccw.h" + +// #define DEBUG_FALLBACK + +#ifdef DEBUG_FALLBACK +#define dputs (txt) \ + do { sclp_print("zipl: " txt); } while (0) +#else +#define dputs (fmt, ...) \ + do { } while (0) +#endif + +struct scsi_blockptr { +uint64_t blockno; +uint16_t size; +uint16_t blockct; +uint8_t reserved[4 ]; +} __attribute__ ((packed)); + +struct component_entry { +struct scsi_blockptr data; +uint8_t pad[7 ]; +uint8_t component_type; +uint64_t load_address; +} __attribute((packed)); + +struct component_header { +uint8_t magic[4 ]; +uint8_t type; +uint8_t reserved[27 ]; +} __attribute((packed)); + +struct mbr { +uint8_t magic[4 ]; +uint32_t version_id; +uint8_t reserved[8 ]; +struct scsi_blockptr blockptr; +} __attribute__ ((packed)); + +#define ZIPL_MAGIC "zIPL" + +#define ZIPL_COMP_HEADER_IPL 0x00 +#define ZIPL_COMP_HEADER_DUMP 0x01 + +#define ZIPL_COMP_ENTRY_LOAD 0x02 +#define ZIPL_COMP_ENTRY_EXEC 0x01 + +/* Scratch space */ +static uint8_t sec[SECTOR_SIZE] __attribute__((__aligned__(SECTOR_SIZE))); + +/* Check for ZIPL magic. Returns 0 if not matched. */ +static int zipl_magic (uint8_t *ptr) +{ +uint32_t *p = (void *)ptr; +uint32_t *z = (void *)ZIPL_MAGIC ; + +if (*p != *z) { +debug_print_int ("invalid magic" , *p); +virtio_panic ("invalid magic" ); + } + +return 1 ; +} + +static int zipl_load_segment (struct component_entry *entry) +{ +const int max_entries = (SECTOR_SIZE /sizeof (struct scsi_blockptr )); +struct scsi_blockptr *bprs = (void *)sec; +uint64_t blockno; +long address; +int i; + + blockno = entry->data.blockno; + address = entry->load_address; + +debug_print_int ("loading segment at block" , blockno); +debug_print_int ("addr" , address); + +do { +if (virtio_read (blockno, (uint8_t *)bprs)) { +debug_print_int ("failed reading bprs at" , blockno); + goto fail; + } + +for (i =0 ;; i++) { +u64 *cur_desc = (void *)&bprs[i]; + + blockno = bprs[i].blockno; +if (!blockno) +break ; + +/* we need the updated blockno for the next indirect entry in the +chain, but don't want to advance address */ +if (i == (max_entries -1 )) +break ; + + address =virtio_load_direct (cur_desc[0 ], cur_desc[1 ],0 , + (void *)address); +if (address ==-1 ) + goto fail; + } + }while (blockno); + +return 0 ; + +fail: +sclp_print ("failed loading segment\n" ); +return -1 ; +} + +/* Run a zipl program */ +static int zipl_run (struct scsi_blockptr *pte) +{ +struct component_header *header; +struct component_entry *entry; +void (*ipl)(void ); +uint8_t tmp_sec[SECTOR_SIZE ]; + +virtio_read (pte->blockno, tmp_sec); + header = (struct component_header *)tmp_sec; + +if (!zipl_magic (tmp_sec)) { + goto fail; + } + +if (header->type !=ZIPL_COMP_HEADER_IPL ) { + goto fail; + } + +dputs ("start loading images\n" ); + +/* Load image(s) into RAM */ + entry = (struct component_entry *)(&header[1 ]); +while (entry->component_type ==ZIPL_COMP_ENTRY_LOAD ) { +if (zipl_load_segment (entry) <0 ) { + goto fail; + } + + entry++; + +if ((uint8_t *)(&entry[1 ]) > (tmp_sec +SECTOR_SIZE )) { + goto fail; + } + } + +if (entry->component_type !=ZIPL_COMP_ENTRY_EXEC ) { + goto fail; + } + +/* Ensure the guest output starts fresh */ +sclp_print ("\n" ); + +/* And run the OS! */ + ipl = (void *)(entry->load_address &0x7fffffff ); +debug_print_addr ("set IPL addr to" , ipl); +/* should not return */ +ipl (); + +return 0 ; + +fail: +sclp_print ("failed running zipl\n" ); +return -1 ; +} + +int zipl_load (void ) +{ +struct mbr *mbr = (void *)sec; +uint8_t *ns, *ns_end; +int program_table_entries =0 ; +int pte_len =sizeof (struct scsi_blockptr ); +struct scsi_blockptr *prog_table_entry; +const char *error ="" ; + +/* Grab the MBR */ +virtio_read (0 , (void *)mbr); + +dputs ("checking magic\n" ); + +if (!zipl_magic (mbr->magic)) { + error ="zipl_magic 1" ; + goto fail; + } + +debug_print_int ("program table" , mbr->blockptr.blockno); + +/* Parse the program table */ +if (virtio_read (mbr->blockptr.blockno, sec)) { + error ="virtio_read" ; + goto fail; + } + +if (!zipl_magic (sec)) { + error ="zipl_magic 2" ; + goto fail; + } + + ns_end = sec +SECTOR_SIZE ; +for (ns = (sec + pte_len); (ns + pte_len) < ns_end; ns++) { + prog_table_entry = (struct scsi_blockptr *)ns; +if (!prog_table_entry->blockno) { +break ; + } + + program_table_entries++; + } + +debug_print_int ("program table entries" , program_table_entries); + +if (!program_table_entries) { + goto fail; + } + +/* Run the default entry */ + + prog_table_entry = (struct scsi_blockptr *)(sec + pte_len); + +return zipl_run (prog_table_entry); + +fail: +sclp_print ("failed loading zipl: " ); +sclp_print (error); +sclp_print ("\n" ); +return -1 ; +}
Signature · 1 line
1.6.0.2
PATCH 10/24 S390: ccw firmware: Add Makefile
In reply to Alexander GrafThis patch adds a makefile, so we can build our ccw firmware. Also add the resulting binaries to .gitignore, so that nobody is annoyed they might be in the tree.
--- .gitignore | 2 ++ pc-bios/s390-ccw/Makefile | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) create mode 100644 pc-bios/s390-ccw/Makefile
.gitignore +2 -0
@@ -100,6 +100,8 @@ pc-bios/optionrom/kvmvapic.asm pc-bios/optionrom/kvmvapic.bin pc-bios/optionrom/kvmvapic.raw pc-bios/optionrom/kvmvapic.img +pc-bios/s390-ccw/s390-ccw.elf +pc-bios/s390-ccw/s390-ccw.img .stgit-* cscope.* tags
pc-bios/s390-ccw/Makefile new file +26 -0
@@ -0,0 +1,26 @@ +all: build-all +# Dummy command so that make thinks it has done something + @true + +include ../../config-host.mak +include $(SRC_PATH)/rules.mak + +$(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw) + +.PHONY : all clean build-all + +OBJECTS=main.o bootmap.o sclp-ascii.o virtio.o start.o +CFLAGS += -fno-stack-protector +# XXX find a more clever to locate the bootloader +LDFLAGS += -Wl,-Ttext,0x7e00000,-Tbss,0x7f00000 -nostdlib + +build-all: s390-ccw.img + +s390-ccw.elf: $(OBJECTS) + $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS)," Building $(TARGET_DIR)$@") + +s390-ccw.img: s390-ccw.elf + $(call quiet-command,strip $@," Stripping $(TARGET_DIR)$@") + +clean: + rm -f *.o *.d *.img *~
Signature · 1 line
1.6.0.2
PATCH 11/24 s390-ccw.img: replace while loop with a disabled wait on s390 bios
In reply to Alexander GrafFrom: Christian Borntraeger <[email protected]>
dont waste cpu power on an error condition. Lets stop the guest with a disabled wait.
--- pc-bios/s390-ccw/main.c | 2 ++ pc-bios/s390-ccw/s390-ccw.h | 3 +++ pc-bios/s390-ccw/start.S | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-)
pc-bios/s390-ccw/main.c +2 -0
@@ -16,6 +16,7 @@ char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));void virtio_panic (const char *string) {sclp_print (string); +disabled_wait ();while (1 ) { } }
@@ -52,5 +53,6 @@ int main(void)virtio_setup ();if (zipl_load () <0 )sclp_print ("Failed to load OS from hard disk\n" ); +disabled_wait ();while (1 ) { } }
pc-bios/s390-ccw/s390-ccw.h +3 -0
@@ -45,6 +45,9 @@ typedef unsigned long long __u64;#include "cio.h" +/* start.s */ +void disabled_wait (void ); +/* main.c */ void virtio_panic (const char *string);
pc-bios/s390-ccw/start.S +15 -0
@@ -3,6 +3,7 @@ * into the pc-bios directory of qemu. * * Copyright (c) 2013 Alexander Graf <[email protected]> + * Copyright 2013 IBM Corp. * * 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
@@ -14,3 +15,17 @@ _start: larl %r15, stack + 0x8000 /* Set up stack */ j main /* And call C */ + +/* + * void disabled_wait(void) + * + * stops the current guest cpu. + */ + .globl disabled_wait +disabled_wait: + larl %r1,disabled_wait_psw + lpswe 0(%r1) + + .align 8 +disabled_wait_psw: + .quad 0x0002000180000000,0x0000000000000000
Signature · 1 line
1.6.0.2
PATCH 12/24 s390-ccw.img: build s390-ccw rom on s3900 system by default
In reply to Alexander GrafFrom: Christian Borntraeger <[email protected]>
Lets build the s390-ccw rom if on s390. Also fix the separate build folder case.
--- configure | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
configure +6 -1
@@ -3460,6 +3460,10 @@ if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then roms="$roms spapr-rtas" fi +if test "$cpu" = "s390x" ; then + roms="$roms s390-ccw" +fi + # add pixman flags after all config tests are done QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags $fdt_cflags" libs_softmmu="$libs_softmmu $pixman_libs"
@@ -4511,7 +4515,7 @@ fi # build tree in object directory in case the source is not in the current directory DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos" -DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" +DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS qapi-generated" FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
@@ -4519,6 +4523,7 @@ FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" FILES="$FILES tests/tcg/lm32/Makefile po/Makefile" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" FILES="$FILES pc-bios/spapr-rtas/Makefile" +FILES="$FILES pc-bios/s390-ccw/Makefile" FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" FILES="$FILES pc-bios/qemu-icon.bmp" for bios_file in \
Signature · 1 line
1.6.0.2
PATCH 13/24 s390-ccw.img: Take care of the elf->img transition
In reply to Alexander GrafFrom: Christian Borntraeger <[email protected]>
We have to call strip with s390-ccw.elf as input and s390-ccw.img as output
--- pc-bios/s390-ccw/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
pc-bios/s390-ccw/Makefile +2 -2
@@ -20,7 +20,7 @@ s390-ccw.elf: $(OBJECTS) $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS)," Building $(TARGET_DIR)$@") s390-ccw.img: s390-ccw.elf - $(call quiet-command,strip $@," Stripping $(TARGET_DIR)$@") + $(call quiet-command,strip $< -o $@," Stripping $(TARGET_DIR)$@") clean: - rm -f *.o *.d *.img *~ + rm -f *.o *.d *.img *.elf *~
Signature · 1 line
1.6.0.2
PATCH 14/24 s390-ccw.img: Fix compile warning in s390 ccw virtio code
In reply to Alexander GrafFrom: Christian Borntraeger <[email protected]>
Lets fix this gcc warning:
virtio.c: In function ‘vring_send_buf’:
virtio.c:125:35: error: operation on ‘vr->next_idx’ may be undefined [-Werror=sequence-point]
--- pc-bios/s390-ccw/virtio.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
pc-bios/s390-ccw/virtio.c +3 -1
@@ -122,7 +122,9 @@ static void vring_send_buf(struct vring *vr, void *p, int len, int flags) vr->desc[vr->next_idx].addr = (ulong )p; vr->desc[vr->next_idx].len = len; vr->desc[vr->next_idx].flags = flags & ~VRING_HIDDEN_IS_CHAIN ; - vr->desc[vr->next_idx].next = ++vr->next_idx; + vr->desc[vr->next_idx].next = vr->next_idx; + vr->desc[vr->next_idx].next++; + vr->next_idx++;/* Chains only have a single ID */ if (!(flags &VRING_DESC_F_NEXT )) {
Signature · 1 line
1.6.0.2
PATCH 15/24 s390-ccw.img: Detect devices with stsch.
In reply to Alexander GrafFrom: Cornelia Huck <[email protected]>
stsch is the canonical way to detect devices. As a bonus, we can abort the loop if we get cc 3, and we need to check only the valid devices (dnv set).
--- pc-bios/s390-ccw/main.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
pc-bios/s390-ccw/main.c +6 -3
@@ -22,7 +22,7 @@ void virtio_panic(const char *string)static void virtio_setup (void ) { -struct irb irb; +struct schib schib;int i;int r;bool found = false;
@@ -31,8 +31,11 @@ static void virtio_setup(void)for (i =0 ; i <0x10000 ; i++) { blk_schid.sch_no = i; - r =tsch (blk_schid, &irb); -if (r !=3 ) { + r =stsch_err (blk_schid, &schib); +if (r ==3 ) { +break ; + } +if (schib.pmcw.dnv) {if (virtio_is_blk (blk_schid)) { found = true;break ;
Signature · 1 line
1.6.0.2
PATCH 16/24 s390-ccw.img: Enhance drain_irqs().
In reply to Alexander GrafFrom: Cornelia Huck <[email protected]>
- Use tpi + tsch to get interrupts.
- Return an error if the irb indicates problems.
--- pc-bios/s390-ccw/virtio.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-)
pc-bios/s390-ccw/virtio.c +11 -2
@@ -38,12 +38,21 @@ static void virtio_notify(struct subchannel_id schid)* Virtio functions * ***********************************************/ -static void drain_irqs (struct subchannel_id schid) +static int drain_irqs (struct subchannel_id schid) {struct irb irb = {}; +int r =0 ; +while (1 ) { +/* FIXME: make use of TPI, for that enable subchannel and isc */ if (tsch (schid, &irb)) { -return ; +/* Might want to differentiate error codes later on. */ +if (irb.scsw.cstat) { + r = -EIO ; + }else if (irb.scsw.dstat !=0xc ) { + r = -EIO ; + } +return r; } } }
Signature · 1 line
1.6.0.2
PATCH 17/24 s390-ccw.img: Rudimentary error checking.
In reply to Alexander GrafFrom: Cornelia Huck <[email protected]>
Try to handle at least some of the errors that may happen.
--- pc-bios/s390-ccw/virtio.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
pc-bios/s390-ccw/virtio.c +15 -6
@@ -84,7 +84,9 @@ static int run_ccw(struct subchannel_id schid, int cmd, void *ptr, int len)* assume that a simple tsch will have finished the CCW processing, * but the architecture allows for asynchronous operation */ -drain_irqs (schid); +if (!r) { + r =drain_irqs (schid); + }return r; }
@@ -92,7 +94,9 @@ static void virtio_set_status(struct subchannel_id schid, unsigned long dev_addr) {unsigned char status = dev_addr; -run_ccw (schid,CCW_CMD_WRITE_STATUS , &status,sizeof (status)); +if (run_ccw (schid,CCW_CMD_WRITE_STATUS , &status,sizeof (status))) { +virtio_panic ("Could not write status to host!\n" ); + } }static void virtio_reset (struct subchannel_id schid)
@@ -193,6 +197,7 @@ static int virtio_read_many(ulong sector, void *load_addr, int sec_num) {struct virtio_blk_outhdr out_hdr;u8 status; +int r;/* Tell the host we want to read */ out_hdr.type =VIRTIO_BLK_T_IN ;
@@ -213,8 +218,11 @@ static int virtio_read_many(ulong sector, void *load_addr, int sec_num)/* Now we can tell the host to read */ vring_wait_reply (&block,0 ); -drain_irqs (block.schid); - + r =drain_irqs (block.schid); +if (r) { +/* Well, whatever status is supposed to contain... */ + status =1 ; + }return status; }
@@ -262,8 +270,9 @@ void virtio_setup_block(struct subchannel_id schid) info.num =128 ; block.schid = schid; -run_ccw (schid,CCW_CMD_SET_VQ , &info,sizeof (info)); -virtio_set_status (schid,VIRTIO_CONFIG_S_DRIVER_OK ); +if (!run_ccw (schid,CCW_CMD_SET_VQ , &info,sizeof (info))) { +virtio_set_status (schid,VIRTIO_CONFIG_S_DRIVER_OK ); + } }bool virtio_is_blk (struct subchannel_id schid)
Signature · 1 line
1.6.0.2
PATCH 18/24 s390-ccw.img: Get queue config from host.
In reply to Alexander GrafFrom: Cornelia Huck <[email protected]>
Ask the host about the configuration instead of guessing it.
--- pc-bios/s390-ccw/virtio.c | 10 +++++++--- pc-bios/s390-ccw/virtio.h | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-)
pc-bios/s390-ccw/virtio.c +7 -3
@@ -257,17 +257,21 @@ int virtio_read(ulong sector, void *load_addr)void virtio_setup_block (struct subchannel_id schid) {struct vq_info_block info; +struct vq_config_block config = {};virtio_reset (schid); -/* XXX need to fetch the 128 from host */ -vring_init (&block,128 , (void *)(100 *1024 *1024 ), + config.index =0 ; +if (run_ccw (schid,CCW_CMD_READ_VQ_CONF , &config,sizeof (config))) { +virtio_panic ("Could not get block device configuration\n" ); + } +vring_init (&block, config.num, (void *)(100 *1024 *1024 ),KVM_S390_VIRTIO_RING_ALIGN ); info.queue = (100ULL *1024ULL *1024ULL ); info.align =KVM_S390_VIRTIO_RING_ALIGN ; info.index =0 ; - info.num =128 ; + info.num = config.num; block.schid = schid;if (!run_ccw (schid,CCW_CMD_SET_VQ , &info,sizeof (info))) {
pc-bios/s390-ccw/virtio.h +5 -0
@@ -53,6 +53,11 @@ struct vq_info_block {u16 num; } __attribute__((packed)); +struct vq_config_block { +u16 index; +u16 num; +} __attribute__((packed)); +struct virtio_dev {struct virtio_dev_header *header;struct virtio_vqconfig *vqconfig;
Signature · 1 line
1.6.0.2
PATCH 19/24 S390: ccw firmware: Add compiled blob
In reply to Alexander GrafNow that we have all the source code ready, add a compiled blob into the QEMU source tree, so that people without access to an s390 compiler can run the s390-ccw firmware.
--- Makefile | 1 + pc-bios/s390-ccw.img | Bin 0 -> 9432 bytes 2 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 pc-bios/s390-ccw.img
Makefile +1 -0
@@ -295,6 +295,7 @@ qemu-icon.bmp \ bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ multiboot.bin linuxboot.bin kvmvapic.bin \ s390-zipl.rom \ +s390-ccw.img \ spapr-rtas.bin slof.bin \ palcode-clipper else
pc-bios/s390-ccw.img new file binary +0 -0
Signature · 1 line
1.6.0.2
PATCH 20/24 S390: CCW: Use new, working firmware by default
In reply to Alexander GrafSince we now have working firmware for s390-ccw in the tree, we can default to it on our s390-ccw machine, rendering it more useful.
--- hw/s390x/s390-virtio-ccw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
hw/s390x/s390-virtio-ccw.c +1 -1
@@ -83,7 +83,7 @@ static void ccw_init(QEMUMachineInitArgs *args) css_bus =virtual_css_bus_init ();s390_sclp_init ();s390_init_ipl_dev (args->kernel_filename, args->kernel_cmdline, - args->initrd_filename,"s390-zipl.rom" ); + args->initrd_filename,"s390-ccw.img" );/* register hypercalls */ virtio_ccw_register_hcalls ();
Signature · 1 line
1.6.0.2
PATCH 21/24 Common: Add quick access to first boot device
In reply to Alexander GrafFrom: Dominik Dingel <[email protected]>
Instead of manually parsing the boot_list as character stream, we can access the nth boot device, specified by the position in the boot order.
--- include/sysemu/sysemu.h | 2 ++ vl.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-)
include/sysemu/sysemu.h +2 -0
@@ -181,6 +181,8 @@ void add_boot_device_path(int32_t bootindex, DeviceState *dev, const char *suffix);char *get_boot_devices_list (size_t *size); +DeviceState *get_boot_device (uint32_t position); +bool usb_enabled (bool default_usb);extern QemuOptsList qemu_drive_opts;
vl.c +18 -0
@@ -1222,6 +1222,24 @@ void add_boot_device_path(int32_t bootindex, DeviceState *dev,QTAILQ_INSERT_TAIL (&fw_boot_order, node, link); } +DeviceState *get_boot_device (uint32_t position) +{ +uint32_t counter =0 ; +FWBootEntry *i =NULL ; +DeviceState *res =NULL ; + +if (!QTAILQ_EMPTY (&fw_boot_order)) { + QTAILQ_FOREACH(i, &fw_boot_order, link) { +if (counter == position) { + res = i->dev; +break ; + } + counter++; + } + } +return res; +} +/* * This function returns null terminated string that consist of new line * separated device paths.
Signature · 1 line
1.6.0.2
PATCH 22/24 Allow selective runtime register synchronization
In reply to Alexander GrafFrom: Jason J. Herne <[email protected]>
We want to avoid expensive register synchronization IOCTL's on the hot path so a new kvm_s390_get_registers_partial() is introduced as a compliment to kvm_arch_get_registers(). The new function is called on the hot path, and kvm_arch_get_registers() is called when we need the complete runtime register state.
kvm_arch_put_registers() is updated to only sync the partial runtime set when we've only dirtied the partial runtime set. This is to avoid sending bad data back to KVM if we've only partially synced the runtime register set.
--- target-s390x/cpu.h | 17 +++++++++++++ target-s390x/kvm.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-)
target-s390x/cpu.h +17 -0
@@ -78,6 +78,11 @@ typedef struct MchkQueue {uint16_t type; } MchkQueue; +/* Defined values for CPUS390XState.runtime_reg_dirty_mask */ +#define KVM_S390_RUNTIME_DIRTY_NONE 0 +#define KVM_S390_RUNTIME_DIRTY_PARTIAL 1 +#define KVM_S390_RUNTIME_DIRTY_FULL 2 + typedef struct CPUS390XState { uint64_t regs[16]; /* GP registers */ CPU_DoubleU fregs[16]; /* FP registers */
@@ -121,6 +126,13 @@ typedef struct CPUS390XState {uint64_t cputm;uint32_t todpr; +/* on S390 the runtime register set has two dirty states: +* a partial dirty state in which only the registers that +* are needed all the time are fetched. And a fully dirty +* state in which all runtime registers are fetched. +*/ +uint32_t runtime_reg_dirty_mask; +CPU_COMMON /* reset does memset(0) up to here */
@@ -1068,6 +1080,7 @@ void kvm_s390_io_interrupt(S390CPU *cpu, uint16_t subchannel_id, uint32_t io_int_word);void kvm_s390_crw_mchk (S390CPU *cpu);void kvm_s390_enable_css_support (S390CPU *cpu); +int kvm_s390_get_registers_partial (CPUState *cpu);#else static inline void kvm_s390_io_interrupt(S390CPU *cpu, uint16_t subchannel_id,
@@ -1082,6 +1095,10 @@ static inline void kvm_s390_crw_mchk(S390CPU *cpu)static inline void kvm_s390_enable_css_support (S390CPU *cpu) { } +static inline int kvm_s390_get_registers_partial (CPUState *cpu) +{ +return -ENOSYS ; +}#endif static inline void s390_io_interrupt(S390CPU *cpu,
target-s390x/kvm.c +67 -0
96 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 23/24 Utilize selective runtime reg sync for hot code paths
In reply to Alexander GrafFrom: Jason J. Herne <[email protected]>
Make use of new kvm_s390_get_registers_partial() for kvm_handle_css_inst() and handle_hypercall() since they only need registers from the partial set and they are called quite frequently.
--- target-s390x/kvm.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-)
target-s390x/kvm.c +12 -3
@@ -467,12 +467,16 @@ static int kvm_handle_css_inst(S390CPU *cpu, struct kvm_run *run,int r =0 ;int no_cc =0 ;CPUS390XState *env = &cpu->env; +CPUState *cs =ENV_GET_CPU (env);if (ipa0 !=0xb2 ) {/* Not handled for now. */ return -1 ; } -cpu_synchronize_state (env); + +kvm_s390_get_registers_partial (cs); + cs->kvm_vcpu_dirty = true; +switch (ipa1) {case PRIV_XSCH : r =ioinst_handle_xsch (env, env->regs[1 ]);
@@ -603,7 +607,10 @@ static int handle_priv(S390CPU *cpu, struct kvm_run *run,static int handle_hypercall (CPUS390XState *env,struct kvm_run *run) { -cpu_synchronize_state (env); +CPUState *cs =ENV_GET_CPU (env); + +kvm_s390_get_registers_partial (cs); + cs->kvm_vcpu_dirty = true; env->regs[2 ] =s390_virtio_hypercall (env);return 0 ;
@@ -808,7 +815,9 @@ static int handle_tsch(S390CPU *cpu)struct kvm_run *run = cs->kvm_run;int ret; -cpu_synchronize_state (env); +kvm_s390_get_registers_partial (cs); + cs->kvm_vcpu_dirty = true; + ret =ioinst_handle_tsch (env, env->regs[1 ], run->s390_tsch.ipb);if (ret >=0 ) {/* Success; set condition code. */
Signature · 1 line
1.6.0.2
PATCH 24/24 virtio-rng-s390: add properties.
In reply to Alexander GrafFrom: KONRAD Frederic <[email protected]>
I don't see any reason why these properties are missing.
Note: Need to apply virtio-rng-refactoring first!
--- hw/s390x/s390-virtio-bus.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
hw/s390x/s390-virtio-bus.c +8 -0
@@ -531,11 +531,19 @@ static const TypeInfo s390_virtio_serial = { .class_init = s390_virtio_serial_class_init, }; +static Property s390_virtio_rng_properties[] = { +DEFINE_VIRTIO_COMMON_FEATURES (VirtIOS390Device, host_features), +DEFINE_VIRTIO_RNG_PROPERTIES (VirtIORNGS390, vdev.conf), +DEFINE_PROP_END_OF_LIST (), +}; +static void s390_virtio_rng_class_init (ObjectClass *klass,void *data) { +DeviceClass *dc =DEVICE_CLASS (klass);VirtIOS390DeviceClass *k =VIRTIO_S390_DEVICE_CLASS (klass); k->init = s390_virtio_rng_init; + dc->props = s390_virtio_rng_properties; }static const TypeInfo s390_virtio_rng = {
Signature · 1 line
1.6.0.2
Quoted 3 lines · Alexander Graf
Hi Blue / Aurelien,
This is my current patch queue for s390. Please pull.
Thanks, pulled.
Quoted 83 lines
Alex
The following changes since commit
bf9b255f484fd61cbaa91faeff254140a0ecd18c:
Anthony Liguori (1):
gtk: refactor menu creationare available in the git repository at:
git://github.com/agraf/qemu.gits390-for-upstreamAlexander Graf (12):
S390: Make IPL reset address dynamic
S390: IPL: Support ELF firmware
S390: IPL: Use different firmware for different machines
S390: ccw firmware: Add start assembly
S390: ccw firmware: Add main program
S390: ccw firmware: Add sclp output
S390: ccw firmware: Add virtio device drivers
S390: ccw firmware: Add glue header
S390: ccw firmware: Add bootmap interpreter
S390: ccw firmware: AddMakefile
S390: ccw firmware: Add compiled blob
S390: CCW: Use new, working firmware by defaultChristian Borntraeger (4):
s390-ccw.img: replace while loop with a disabled wait on s390 bios s390-ccw.img: build s390-ccw rom on s3900 system by default s390-ccw.img: Take care of theelf->imgtransition s390-ccw.img: Fix compile warning in s390 ccw virtio codeCornelia Huck (4):
s390-ccw.img: Detect devices with stsch.
s390-ccw.img: Enhancedrain_irqs().
s390-ccw.img: Rudimentary error checking.
s390-ccw.img: Get queue config from host.Dominik Dingel (1):
Common: Add quick access to first boot deviceJason J. Herne (2):
Allow selective runtime register synchronization Utilize selective runtime reg sync for hot code pathsKONRAD Frederic (1):
virtio-rng-s390: add properties..gitignore | 2 + Makefile | 1 + configure | 7 +- hw/s390x/ipl.c | 41 +++--- hw/s390x/s390-virtio-bus.c | 8 + hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/s390-virtio.c | 7 +- hw/s390x/s390-virtio.h | 3 +- include/sysemu/sysemu.h | 2 + pc-bios/s390-ccw.img | Bin 0 -> 9432 bytes pc-bios/s390-ccw/Makefile | 26 ++++ pc-bios/s390-ccw/bootmap.c | 235 ++++++++++++++++++++++++++++++ pc-bios/s390-ccw/cio.h | 322 +++++++++++++++++++++++++++++++++++++++++ pc-bios/s390-ccw/main.c | 61 ++++++++ pc-bios/s390-ccw/s390-ccw.h | 134 +++++++++++++++++ pc-bios/s390-ccw/sclp-ascii.c | 81 ++++++++++ pc-bios/s390-ccw/sclp.h | 107 ++++++++++++++ pc-bios/s390-ccw/start.S | 31 ++++ pc-bios/s390-ccw/virtio.c | 298 ++++++++++++++++++++++++++++++++++++++ pc-bios/s390-ccw/virtio.h | 163 +++++++++++++++++++++ target-s390x/cpu.h | 17 ++ target-s390x/kvm.c | 82 ++++++++++- vl.c | 18 +++ 23 files changed, 1622 insertions(+), 26 deletions(-) create mode 100644 pc-bios/s390-ccw.img create mode 100644 pc-bios/s390-ccw/Makefile create mode 100644 pc-bios/s390-ccw/bootmap.c create mode 100644 pc-bios/s390-ccw/cio.h create mode 100644 pc-bios/s390-ccw/main.c create mode 100644 pc-bios/s390-ccw/s390-ccw.h create mode 100644 pc-bios/s390-ccw/sclp-ascii.c create mode 100644 pc-bios/s390-ccw/sclp.h create mode 100644 pc-bios/s390-ccw/start.S create mode 100644 pc-bios/s390-ccw/virtio.c create mode 100644 pc-bios/s390-ccw/virtio.h