[Qemu-devel] [PULL 1.5 0/6] s390 patch queue 2013-05-06

[Qemu-devel] [PULL 1.5 0/6] s390 patch queue 2013-05-06

[Alexander Graf]

Hi Blue / Aurelien,

This is my current patch queue for s390.  Please pull.

Alex


The following changes since commit 8e515b125d5f7849167dbee6cbe6ef61636607d4:
  Peter Maydell (1):
        configure: Check that "libtool" is not the MacOSX one

are available in the git repository at:

  git://github.com/agraf/qemu.git s390-for-upstream

Alexander Graf (1):
      s390: update s390-ccw.img

Dominik Dingel (5):
      S390: BIOS check for file
      S390: BIOS create link to src folder for .img file
      S390: Merging s390_ipl_cpu and s390_ipl_reset
      S390: Add virtio-blk boot
      S390: BIOS boot from given device

 configure                |    1 +
 hw/s390x/ipl.c           |   38 +++++++++++++++++++++++++++-----------
 pc-bios/s390-ccw.img     |  Bin 9432 -> 9432 bytes
 pc-bios/s390-ccw/main.c  |   24 ++++++++++++++++++------
 pc-bios/s390-ccw/start.S |    2 ++
 5 files changed, 48 insertions(+), 17 deletions(-)

[Qemu-devel] [PATCH 1/6] S390: BIOS check for file

[Alexander Graf]

From: Dominik Dingel <dingel@linux.vnet.ibm.com>

Add a check if the BIOS blob exists before trying to load.

Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/s390x/ipl.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index ace5ff5..cc3cd23 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -82,6 +82,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) {
-- 
1.6.0.2

[Qemu-devel] [PATCH 2/6] S390: BIOS create link to src folder for .img file

[Alexander Graf]

From: Dominik Dingel <dingel@linux.vnet.ibm.com>

For *.img files, there will be a link created directly to the src folder,
like for all other blobs.

Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 configure |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index a9ff4ad..9439f1c 100755
--- a/configure
+++ b/configure
@@ -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
-- 
1.6.0.2

[Qemu-devel] [PATCH 3/6] S390: Merging s390_ipl_cpu and s390_ipl_reset

[Alexander Graf]

From: Dominik Dingel <dingel@linux.vnet.ibm.com>

There is no use in have this splitted in two functions.

Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/s390x/ipl.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index cc3cd23..d14c548 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -57,16 +57,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);
@@ -155,8 +145,12 @@ 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;
 
-    s390_ipl_cpu(ipl->start_addr);
+    env->psw.addr = ipl->start_addr;
+    env->psw.mask = IPL_PSW_MASK;
+    s390_add_running_cpu(cpu);
 }
 
 static void s390_ipl_class_init(ObjectClass *klass, void *data)
-- 
1.6.0.2

[Qemu-devel] [PATCH 4/6] S390: Add virtio-blk boot

[Alexander Graf]

From: Dominik Dingel <dingel@linux.vnet.ibm.com>

If no kernel IPL entry is specified, boot the bios and pass if available
device information for the first boot device (as given by the boot index).

The provided information will be used in the next commit from the BIOS.

Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/s390x/ipl.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index d14c548..0aeb003 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -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
@@ -150,6 +152,22 @@ static void s390_ipl_reset(DeviceState *dev)
 
     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_add_running_cpu(cpu);
 }
 
-- 
1.6.0.2

[Qemu-devel] [PATCH 5/6] S390: BIOS boot from given device

[Alexander Graf]

From: Dominik Dingel <dingel@linux.vnet.ibm.com>

Use the passed device, if there is no device, use the first applicable device.

Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 pc-bios/s390-ccw/main.c  |   24 ++++++++++++++++++------
 pc-bios/s390-ccw/start.S |    2 ++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index fd40fa5..1665c57 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -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,9 +44,11 @@ static void virtio_setup(void)
             break;
         }
         if (schib.pmcw.dnv) {
-            if (virtio_is_blk(blk_schid)) {
-                found = true;
-                break;
+            if (!check_devno || (schib.pmcw.dev == dev_no)) {
+                if (virtio_is_blk(blk_schid)) {
+                    found = true;
+                    break;
+                }
             }
         }
     }
@@ -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();
diff --git a/pc-bios/s390-ccw/start.S b/pc-bios/s390-ccw/start.S
index 09deee7..5d5df0d 100644
--- a/pc-bios/s390-ccw/start.S
+++ b/pc-bios/s390-ccw/start.S
@@ -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 */
 
 /*
-- 
1.6.0.2

[Qemu-devel] [PATCH 6/6] s390: update s390-ccw.img

[Alexander Graf]

Now that we have boot device selection support, update the firmware
blob accordingly.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 pc-bios/s390-ccw.img |  Bin 9432 -> 9432 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img
index 149cf70140e9e690960b49337b4e5f419c452a86..1b2a11e728d1e17d386d64a9f13a90b4635dc2ba 100644
GIT binary patch
delta 1298
zcmX|Be`s4p9RFTk(w8)Cc}dEe(uBOU!7ST!0f#L^F?Id1(y9f2v;|>tLYY!nD^&*$
zmSLUU)UDZV;-E?#j%%l2X+&EQdVkbf2D*wC3l#|q9mQ05g^1O;p5MEaKDhhb=lk<>
z_wK!wj+KtF5SdAv?XE>oPvv5Iu#q&SC(e26;?kn$+`E`fke{l~{KnS+?7y=jK;fhn
zhe+NMd&LmXfb(ff`p6_VaDDd!k|BA+z+e^<f{j2A`w)o#MK%L)qaUC-Wqry{331~`
zAc?7r%^&SGGBAB81=IClj+zi)4}pexzBI8W5#8QvY~&2o=MC#7q-*z}DZst~!WP6G
zZepKL_?i&nX0Mq6DMY&_XSn69XD#4Svfq-jcl~|n84)>F6zeK~OvxWWUO=gU_?fO3
zE?EhP@FlGOUEaD+SB=2Iv&)*5F#rWPRpM#Y`1n=eb~X$>&12l;DbPh9&*1z#eZUh6
zwkb&jTMom+%lZ<eWPT6k>!OJs_e4pAUho{O+^0krRNXjT@WhCnTAs$%FrIT#46zsh
zkAuGb1E0eAmW;N&%{gv&Wm%g7zN<?6S*qHe#kZkvf2DG=bif<-T+bUzeh9O9IG}vj
z>BrtExkwkh`-88_zS@M+&^2qv2zi9<%K93u@&zA!MOE#VhoictaJ7o62#bpEas4gt
z#tP%|4wOAcdwoa9n{?b4c9*lmP=!8cSp{A6JwsNrf$FI3$=l2iFP-P$>NYm*>KI?Z
zwufh{p$nTjyXIIQ(UiSg@vocXn<3VL?fQsK*;}R^n+8u{>?9rAbDMlblQqZ45al&T
zZJism+&>p~$iRDN^NG#9U@v^J=>)r8lzW1_@(j~I{H-KU<Fy_8=aeOeJNc7a;Ova>
zB+lXdU=kq0iuYo;GXTf*v;o;nZ9nNR;?;mLA&MJ_GeZ0&xh2HkCVmU15L<X2<S615
z#H0}aBoI?V{9A!Ifx4;@7lrt*3vmmv7vHFXh~J5=Nr?M+Wo;+uKwW$5A*|ej1N0mO
zB;s?Y?ULhS+57r?&UalG%Fnw;E8eL*SJhUvWh?pRd;rI3xzKY2s8ttreO_X=ZfXWX
z;a^HjOG(7%2^_Nih9r7Uo2SV@jjN)>?1MBF2*sop^f?}th|0^_N(v;we&kuX&~s%i
zbTJSOkCd3MRN%TCM+BqBckH9o2!>qqJ8Ydc1*5KFiMb-#6TyNOwj-^^p|wBt9Q@jN
zq|?0e`dZ%SJa+f$+#AuC_YG&i47&+gr@a1g(sa4uq-$Lk0H|H3ry3q9Fa5{>>f&^!
Rq0uu@a@Osj&Ac30`5%hm$Pxem

delta 1220
zcmX|BUu;ul6hGg+-R^Do$KDQE$2xDjHFk?Q`hboY#7_1%EZE=(gJ|4?QR53G@K6`x
z_JCRxS;set*<S7gdS{HWX?d7rV_yV)0vYH`eJdG@B*o+|>0;f0&+~m%PIB+>{?0k~
zcYZzh-sT7MgK3kbrh@(M6v(JcO(nWWbZYKn-;T1#Xa&y`%*Dv<`tcvx8i0%0C4l0%
zvj@Vf4sYitm<9T44@8Yj+VcPxiAB28&LuX1`GTF~{HtGp#4?uRkBoRN$nH)<wiSY@
zAO!4AQ0+6|nIg_N_9^67fY?9tA`9ZA8MekbUm6KoAk+ucX#wz)uhs4WLz)>AW=4V&
zvOyij${Aj;OZ>hRI4e!Pi@aEzbYc)@%P4z|)*9xn@fFpvynw@X**hkOo&Ext3ymD<
zPO~8X0F9qy7M>IIm|>DpI%YJJL-e8%A^Yf6V^>|fbX2k1NjHrSqR_CftJlQUjPet9
z2LOwL_V`bh!Sg-Qt$f57fcpE2ngRA?zIt2CfBY-+V&Ag7=O(p$A!A|HyX=RMeI0hn
z+5)}fi;y|G>3i-#LO55ymL7(FaAAkoPruBbl-J#>v2`!F><-S0OHLVFT1i&llhfYE
z&3r4}d`J@wPir$cL9aeS&o%5PAJFB7P)*o=3F=uKv(M6p4X=}pTzp$ZA!{_b-F$w<
zK1x)%wm6FFLpQsl>!v-3Pw*&FWWFa`weDpxtS!;&+i#IsI^FmdIZjKB1Imy>_xYDX
zQebNqeYS(E`2D*6zel($B(~1eXPSD+UHW#@U}RBd_M_{+Gz{i|eqgU%+UiH&_`+th
zxIBzpzUdt@zM*3-&G|+caUStE#QU88jhy&7FApQe5Whqm;ryQ-M0{B{QHxkO*^kIL
ze;7w}5Z}OOrz0*PMmc|kUxzY^nj*G|6T$oIYoD@+Aat?0^W~j*fwJObf`CAbOy6YH
z`RdQLbNXlQPd#UAQnjDd_0^XZQ4{^A#D!LX8#Ee-xGz<h5}>02GjyZE)FFWwui_ze
z?+Kz6)HJmMjc!+kx%N^PFgt`M)~duhFi3S@WwIbxBT`E%RC}r35(%9aX|13Q2*mK<
z5yq}*K`=i|<1MBeS0LGCnrw-<A5@s`<mOt6Dz!)~BrJ%XsQm{IL*d|^H+%nBd|~Fh
z+1>f%qhpN|vwL!vLp6kCC~JL%L@%@*cV~nMKvRY$+g|ik{(1m*l<9n1myxIxoBu<_
Ie<7Uz7f`gM7XSbN

-- 
1.6.0.2

Re: [Qemu-devel] [PULL 1.5 0/6] s390 patch queue 2013-05-06

[Aurelien Jarno]

On Mon, May 06, 2013 at 05:30:18PM +0200, Alexander Graf wrote:
> Hi Blue / Aurelien,
> 
> This is my current patch queue for s390.  Please pull.
> 
> Alex
> 
> 
> The following changes since commit 8e515b125d5f7849167dbee6cbe6ef61636607d4:
>   Peter Maydell (1):
>         configure: Check that "libtool" is not the MacOSX one
> 
> are available in the git repository at:
> 
>   git://github.com/agraf/qemu.git s390-for-upstream
> 
> Alexander Graf (1):
>       s390: update s390-ccw.img
> 
> Dominik Dingel (5):
>       S390: BIOS check for file
>       S390: BIOS create link to src folder for .img file
>       S390: Merging s390_ipl_cpu and s390_ipl_reset
>       S390: Add virtio-blk boot
>       S390: BIOS boot from given device
> 
>  configure                |    1 +
>  hw/s390x/ipl.c           |   38 +++++++++++++++++++++++++++-----------
>  pc-bios/s390-ccw.img     |  Bin 9432 -> 9432 bytes
>  pc-bios/s390-ccw/main.c  |   24 ++++++++++++++++++------
>  pc-bios/s390-ccw/start.S |    2 ++
>  5 files changed, 48 insertions(+), 17 deletions(-)

Thanks, pulled.

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net