From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NxNTq-00054v-FU for qemu-devel@nongnu.org; Thu, 01 Apr 2010 12:42:54 -0400 Received: from [140.186.70.92] (port=33811 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxNTo-00053g-Hq for qemu-devel@nongnu.org; Thu, 01 Apr 2010 12:42:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NxNTf-0004NI-I0 for qemu-devel@nongnu.org; Thu, 01 Apr 2010 12:42:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48905 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NxNTf-0004MT-5s for qemu-devel@nongnu.org; Thu, 01 Apr 2010 12:42:43 -0400 From: Alexander Graf Date: Thu, 1 Apr 2010 18:42:41 +0200 Message-Id: <1270140161-17216-7-git-send-email-agraf@suse.de> In-Reply-To: <1270140161-17216-1-git-send-email-agraf@suse.de> References: <1270140161-17216-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 6/6] [S390] Add firmware code List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: waldi@debian.org, Carsten Otte , aurelien@aurel32.net This patch adds a firmware blob to the S390 target. The blob is a simple implementation of a virtio client that tries to read the second stage bootloader from sectors described as of offset 0x20 in the MBR. In combination with an updated zipl this allows for booting from virtio block devices. This firmware is built from the same sources as the second stage bootloader. You can find the zipl patch to build both here: http://alex.csgraf.de/qemu/0001-Zipl-VirtIO-bootloader-code.patch Signed-off-by: Alexander Graf --- hw/s390-virtio.c | 20 ++++++++++++++++++++ pc-bios/s390-zipl.rom | Bin 0 -> 2448 bytes 2 files changed, 20 insertions(+), 0 deletions(-) create mode 100755 pc-bios/s390-zipl.rom diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index c36a8b2..91a3065 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -52,6 +52,10 @@ #define INITRD_PARM_SIZE 0x010410UL #define PARMFILE_START 0x001000UL +#define ZIPL_START 0x001000UL +#define ZIPL_LOAD_ADDR 0x001000UL +#define ZIPL_FILENAME "s390-zipl.rom" + #define MAX_BLK_DEVS 10 static VirtIOS390Bus *s390_bus; @@ -140,6 +144,8 @@ static void s390_init(ram_addr_t ram_size, ram_addr_t kernel_size = 0; ram_addr_t initrd_offset; ram_addr_t initrd_size = 0; + ram_addr_t bios_size = 0; + char *bios_filename; int i; /* XXX we only work on KVM for now */ @@ -178,6 +184,20 @@ static void s390_init(ram_addr_t ram_size, env->halted = 0; env->exception_index = 0; + /* 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(bios_filename, qemu_get_ram_ptr(ZIPL_LOAD_ADDR)); + + if ((long)bios_size < 0) { + hw_error("could not load bootloader '%s'\n", bios_name); + } + + env->psw.addr = ZIPL_START; + env->psw.mask = 0x0000000180000000ULL; + if (kernel_filename) { kernel_size = load_image(kernel_filename, qemu_get_ram_ptr(0)); diff --git a/pc-bios/s390-zipl.rom b/pc-bios/s390-zipl.rom new file mode 100755 index 0000000000000000000000000000000000000000..0f1b26afd5ad530035cdc6fbe285bae278ad5983 GIT binary patch literal 2448 zcmZuyX>1%t7Jl9Cqz1=MDvoU?BtY32h)oXKjv|5ZGN{GmwmH6&7LzAs7Twb4f`2NQ49u%AbMeSTYi6vqKaSaPz&g7uXFW^>o#% zcYN=w_g?D*w~($>eHz8_Cdz~Xk<*|L?(6eqoG&`mrdwrxm?Y^rWckf86&2O#fn@)1 zHhxy8C3(<`B%47}*r{mN&Sp{%Dw?YoQ z(x#!}1C%K?QggQ(PAxZ+MYUeLbb4jza70KPs?|r36{#>qsq_hjrQ=E3*Xzg%NTocf zrbnajnDJay6Tk|Qra>2xx}~z&5;}Gy!!$Vto8x)X7UShzaUb~GO;mMZ-v%!N>;9-OE96gwPgmcnqJj;jz=`jnn_mH^w>a8pGOi zWsT8rWlB`w4>bX_`{I7&Bth^#tK+M0pdEGJHC`w+Mm;9KTDFN$?W&*Uj#%Uj}qb4K8JW9&|1UCt;`Ux;933@Z-bal<$) zJ_$#$`Y!Cp4K51%u>LyCVl8+E7_Gfw4*MCrkEleHtK*s|MXF>`&JRjl&s~u$*_6{~ zQrce=ke*Jq-yzB0YU<}E?5mL7>ybN}rp#vQqsSYTl!;0Ro{92kz)Td3rqK5TwEgv_ z-GsWf_1m-!cOYpf3IfzDy1YFKvd}88<~|4K+}mf&Nc^yLWT3KKNsIj@0Yw3N-HF^R z#|Uz;@Hf`P? z%dpimk>jEHanJmi<1&-u0CixJa(-$uzqUa3)Bod$R6jEVM*JnpK z-Am|NGkfYc8C?rKJBW$gidwB;LIazTUlO{AHi#<2jmHJ_MTUb z@AC5I7GOJFpN=@kCi@IGUl}i*hvtGBuneOa&iCivAlhRl(SPsMDeTHB-3oRqREw_} z-<-=mVLWdEv+@J6n?kOp^~e#^D*4L9ex5awxq7xrVLHN2j0u5kCVn>h4*dQ2o6+S> ztdnF?c7-*$z$+okt`didyD&Yc)znU(A!pXj64fb@o(+ll%@v~h@Hu8VWh!2cyma`l zzCj$Jl6wd5%ZvLT*ml9<&XxsD$KLbcLk~amC-LWxFUlO(y7J;h$BVx}^^t5rEIj6t zRVRxaTME(Nw_=_*|D1CH+aphINx%!$Hc0fFK;M(hcd;JX?`)~Z+h#nHd;`2Ly zKXB6@Zr*gutp8LgcHZCScdcG?%BiPyuN99zw)t6c$LVMM>ddo# z9jsd~9>4pEt$)36|Jgm~oO@pHhV#D{e}lf;*1n|UgcFx8TQ0=kv1ck4Q*AZTqE(7c QS)s0MzqFbZ_CNi800lxdZvX%Q literal 0 HcmV?d00001 -- 1.6.0.2