Skip to contentSkip to conversation

s390 patch queue 2013-05-06

GIT PULL New Alexander Graf 2 participants 8 messages May 6, 2013

lore
Share & tools
lore
#0 lore raw

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(-)
#1 lore raw

PATCH 1/6 S390: BIOS check for file

From: Dominik Dingel <[email protected]>

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

---
 hw/s390x/ipl.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
hw/s390x/ipl.c +4 -0
index ace5ff5..cc3cd23 100644
@@ -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) {
Signature · 1 line
1.6.0.2
#2 lore raw

PATCH 2/6 S390: BIOS create link to src folder for .img file

In reply to Alexander Graf

From: Dominik Dingel <[email protected]>

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

---
 configure |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
configure +1 -0
index a9ff4ad..9439f1c 100755
@@ -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
Signature · 1 line
1.6.0.2
#3 lore raw

PATCH 3/6 S390: Merging s390_ipl_cpu and s390_ipl_reset

In reply to Alexander Graf

From: Dominik Dingel <[email protected]>

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

---
 hw/s390x/ipl.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)
hw/s390x/ipl.c +5 -11
index cc3cd23..d14c548 100644
@@ -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)
Signature · 1 line
1.6.0.2
#4 lore raw

PATCH 4/6 S390: Add virtio-blk boot

In reply to Alexander Graf

From: Dominik Dingel <[email protected]>

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.

---
 hw/s390x/ipl.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
hw/s390x/ipl.c +18 -0
index d14c548..0aeb003 100644
@@ -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);
 }
 
Signature · 1 line
1.6.0.2
#5 lore raw

PATCH 5/6 S390: BIOS boot from given device

In reply to Alexander Graf

From: Dominik Dingel <[email protected]>

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

---
 pc-bios/s390-ccw/main.c  |   24 ++++++++++++++++++------
 pc-bios/s390-ccw/start.S |    2 ++
 2 files changed, 20 insertions(+), 6 deletions(-)
pc-bios/s390-ccw/main.c +18 -6
index fd40fa5..1665c57 100644
@@ -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();
pc-bios/s390-ccw/start.S +2 -0
index 09deee7..5d5df0d 100644
@@ -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 */
 
 /*
Signature · 1 line
1.6.0.2
#6 lore raw

PATCH 6/6 s390: update s390-ccw.img

In reply to Alexander Graf

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

---
 pc-bios/s390-ccw.img |  Bin 9432 -> 9432 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)
pc-bios/s390-ccw.img binary +0 -0
index 149cf70140e9e690960b49337b4e5f419c452a86..1b2a11e728d1e17d386d64a9f13a90b4635dc2ba 100644
GIT binary patch
Signature · 1 line
1.6.0.2
#7 lore raw
In reply to Alexander Graf
Quoted 25 lines · 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

Quoted 6 lines
 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.

Signature · 2 lines
Aurelien Jarno                          GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net