* [Qemu-devel] [PATCH 1/7] pc-bios/s390-ccw: support all virtio block size
2014-08-29 9:01 [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Jens Freimann
@ 2014-08-29 9:01 ` Jens Freimann
2014-08-29 9:01 ` [Qemu-devel] [PATCH 2/7] pc-bios/s390-ccw: handle more ECKD DASD block sizes Jens Freimann
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jens Freimann @ 2014-08-29 9:01 UTC (permalink / raw)
To: Christian Borntraeger, Alexander Graf, Cornelia Huck
Cc: Eugene (jno) Dvurechenski, Jens Freimann, qemu-devel
From: "Eugene (jno) Dvurechenski" <jno@linux.vnet.ibm.com>
The block size value may be given "as is" OR as a base value and
a shift count (exponent). So, we have to use calculation to get
the proper number in the code.
The main expression reads as
(blk_cfg.blk_size << blk_cfg.physical_block_exp)
E.g., various combinations between blk_size=1/physical_block_exp=12
and blk_size=4096/physical_block_exp=0 are valid for 4K blocks.
Signed-off-by: Eugene (jno) Dvurechenski <jno@linux.vnet.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
---
pc-bios/s390-ccw/virtio.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 31b23b0..04977e4 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -275,12 +275,14 @@ void virtio_assume_scsi(void)
{
guessed_disk_nature = true;
blk_cfg.blk_size = 512;
+ blk_cfg.physical_block_exp = 0;
}
void virtio_assume_eckd(void)
{
guessed_disk_nature = true;
blk_cfg.blk_size = 4096;
+ blk_cfg.physical_block_exp = 0;
/* this must be here to calculate code segment position */
blk_cfg.geometry.heads = 15;
@@ -290,31 +292,31 @@ void virtio_assume_eckd(void)
bool virtio_disk_is_scsi(void)
{
if (guessed_disk_nature) {
- return (blk_cfg.blk_size == 512);
+ return (virtio_get_block_size() == 512);
}
return (blk_cfg.geometry.heads == 255)
&& (blk_cfg.geometry.sectors == 63)
- && (blk_cfg.blk_size == 512);
+ && (virtio_get_block_size() == 512);
}
bool virtio_disk_is_eckd(void)
{
if (guessed_disk_nature) {
- return (blk_cfg.blk_size == 4096);
+ return (virtio_get_block_size() == 4096);
}
return (blk_cfg.geometry.heads == 15)
&& (blk_cfg.geometry.sectors == 12)
- && (blk_cfg.blk_size == 4096);
+ && (virtio_get_block_size() == 4096);
}
bool virtio_ipl_disk_is_valid(void)
{
- return blk_cfg.blk_size && (virtio_disk_is_scsi() || virtio_disk_is_eckd());
+ return virtio_disk_is_scsi() || virtio_disk_is_eckd();
}
int virtio_get_block_size(void)
{
- return blk_cfg.blk_size;
+ return blk_cfg.blk_size << blk_cfg.physical_block_exp;
}
uint16_t virtio_get_cylinders(void)
--
1.8.5.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 2/7] pc-bios/s390-ccw: handle more ECKD DASD block sizes
2014-08-29 9:01 [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Jens Freimann
2014-08-29 9:01 ` [Qemu-devel] [PATCH 1/7] pc-bios/s390-ccw: support all virtio block size Jens Freimann
@ 2014-08-29 9:01 ` Jens Freimann
2014-08-29 9:01 ` [Qemu-devel] [PATCH 3/7] pc-bios/s390-ccw Improve ECKD informational message Jens Freimann
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jens Freimann @ 2014-08-29 9:01 UTC (permalink / raw)
To: Christian Borntraeger, Alexander Graf, Cornelia Huck
Cc: Eugene (jno) Dvurechenski, Jens Freimann, qemu-devel
From: "Eugene (jno) Dvurechenski" <jno@linux.vnet.ibm.com>
Using dasdfmt(8) to format a DASD allows to choose a block size.
There are four supported values: 512, 1024, 2048, and 4096 bytes
per block. Each block size leads to selection of new count of
sectors per track. The head count remains always the same: 15.
This empiric knowledge is used to detect ECKD DASD to IPL from.
Signed-off-by: Eugene (jno) Dvurechenski <jno@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
---
pc-bios/s390-ccw/virtio.c | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 04977e4..6ed3dc9 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -299,14 +299,35 @@ bool virtio_disk_is_scsi(void)
&& (virtio_get_block_size() == 512);
}
+/*
+ * Other supported value pairs, if any, would need to be added here.
+ * Note: head count is always 15.
+ */
+static inline u8 virtio_eckd_sectors_for_block_size(int size)
+{
+ switch (size) {
+ case 512:
+ return 49;
+ case 1024:
+ return 33;
+ case 2048:
+ return 21;
+ case 4096:
+ return 12;
+ }
+ return 0;
+}
+
bool virtio_disk_is_eckd(void)
{
+ const int block_size = virtio_get_block_size();
+
if (guessed_disk_nature) {
- return (virtio_get_block_size() == 4096);
+ return (block_size == 4096);
}
return (blk_cfg.geometry.heads == 15)
- && (blk_cfg.geometry.sectors == 12)
- && (virtio_get_block_size() == 4096);
+ && (blk_cfg.geometry.sectors ==
+ virtio_eckd_sectors_for_block_size(block_size));
}
bool virtio_ipl_disk_is_valid(void)
--
1.8.5.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 3/7] pc-bios/s390-ccw Improve ECKD informational message
2014-08-29 9:01 [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Jens Freimann
2014-08-29 9:01 ` [Qemu-devel] [PATCH 1/7] pc-bios/s390-ccw: support all virtio block size Jens Freimann
2014-08-29 9:01 ` [Qemu-devel] [PATCH 2/7] pc-bios/s390-ccw: handle more ECKD DASD block sizes Jens Freimann
@ 2014-08-29 9:01 ` Jens Freimann
2014-08-29 9:01 ` [Qemu-devel] [PATCH 4/7] pc-bios/s390-ccw Really big EAV ECKD DASD handling Jens Freimann
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jens Freimann @ 2014-08-29 9:01 UTC (permalink / raw)
To: Christian Borntraeger, Alexander Graf, Cornelia Huck
Cc: Eugene (jno) Dvurechenski, Jens Freimann, qemu-devel
From: "Eugene (jno) Dvurechenski" <jno@linux.vnet.ibm.com>
Add block size display to ECKD scheme report.
Signed-off-by: Eugene (jno) Dvurechenski <jno@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
---
pc-bios/s390-ccw/bootmap.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index f175679..e4352b1 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -298,6 +298,25 @@ static void ipl_eckd(ECKD_IPL_mode_t mode)
}
}
+static void print_eckd_msg(void)
+{
+ char msg[] = "Using ECKD scheme (block size *****), ";
+ char *p = &msg[34], *q = &msg[30];
+ int n = virtio_get_block_size();
+
+ /* Fill in the block size and show up the message */
+ if (n > 0 && n <= 99999) {
+ while (n) {
+ *p-- = '0' + (n % 10);
+ n /= 10;
+ }
+ while (p >= q) {
+ *p-- = ' ';
+ }
+ }
+ sclp_print(msg);
+}
+
/***********************************************************************
* IPL a SCSI disk
*/
@@ -447,12 +466,11 @@ void zipl_load(void)
}
/* We have failed to follow the SCSI scheme, so */
- sclp_print("Using ECKD scheme.\n");
if (virtio_guessed_disk_nature()) {
sclp_print("Using guessed DASD geometry.\n");
virtio_assume_eckd();
}
-
+ print_eckd_msg();
if (magic_match(mbr->magic, IPL1_MAGIC)) {
ipl_eckd(ECKD_CDL); /* no return */
}
--
1.8.5.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 4/7] pc-bios/s390-ccw Really big EAV ECKD DASD handling
2014-08-29 9:01 [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Jens Freimann
` (2 preceding siblings ...)
2014-08-29 9:01 ` [Qemu-devel] [PATCH 3/7] pc-bios/s390-ccw Improve ECKD informational message Jens Freimann
@ 2014-08-29 9:01 ` Jens Freimann
2014-08-29 9:01 ` [Qemu-devel] [PATCH 5/7] pc-bios/s390-ccw: IPL from DASD with format variations Jens Freimann
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jens Freimann @ 2014-08-29 9:01 UTC (permalink / raw)
To: Christian Borntraeger, Alexander Graf, Cornelia Huck
Cc: Eugene (jno) Dvurechenski, Jens Freimann, qemu-devel
From: "Eugene (jno) Dvurechenski" <jno@linux.vnet.ibm.com>
For EAV ECKD DASD, the cylinder count will have the magic value
0xfffeU. Therefore, use the block number to test for valid eckd
addresses instead.
Signed-off-by: Eugene (jno) Dvurechenski <jno@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
---
pc-bios/s390-ccw/bootmap.c | 31 +++++++++++++++----------------
pc-bios/s390-ccw/virtio.c | 11 ++++++-----
pc-bios/s390-ccw/virtio.h | 2 +-
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index e4352b1..d4c579c 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -93,11 +93,23 @@ static inline void verify_boot_info(BootInfo *bip)
"Bad block size in zIPL section of the 1st record.");
}
-static bool eckd_valid_address(BootMapPointer *p)
+static block_number_t eckd_block_num(BootMapPointer *p)
{
+ const uint64_t sectors = virtio_get_sectors();
+ const uint64_t heads = virtio_get_heads();
const uint64_t cylinder = p->eckd.cylinder
+ ((p->eckd.head & 0xfff0) << 12);
const uint64_t head = p->eckd.head & 0x000f;
+ const block_number_t block = sectors * heads * cylinder
+ + sectors * head
+ + p->eckd.sector
+ - 1; /* block nr starts with zero */
+ return block;
+}
+
+static bool eckd_valid_address(BootMapPointer *p)
+{
+ const uint64_t head = p->eckd.head & 0x000f;
if (head >= virtio_get_heads()
|| p->eckd.sector > virtio_get_sectors()
@@ -105,27 +117,14 @@ static bool eckd_valid_address(BootMapPointer *p)
return false;
}
- if (!virtio_guessed_disk_nature() && cylinder >= virtio_get_cylinders()) {
+ if (!virtio_guessed_disk_nature() &&
+ eckd_block_num(p) >= virtio_get_blocks()) {
return false;
}
return true;
}
-static block_number_t eckd_block_num(BootMapPointer *p)
-{
- const uint64_t sectors = virtio_get_sectors();
- const uint64_t heads = virtio_get_heads();
- const uint64_t cylinder = p->eckd.cylinder
- + ((p->eckd.head & 0xfff0) << 12);
- const uint64_t head = p->eckd.head & 0x000f;
- const block_number_t block = sectors * heads * cylinder
- + sectors * head
- + p->eckd.sector
- - 1; /* block nr starts with zero */
- return block;
-}
-
static block_number_t load_eckd_segments(block_number_t blk, uint64_t *address)
{
block_number_t block_nr;
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 6ed3dc9..c0540d1 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -340,11 +340,6 @@ int virtio_get_block_size(void)
return blk_cfg.blk_size << blk_cfg.physical_block_exp;
}
-uint16_t virtio_get_cylinders(void)
-{
- return blk_cfg.geometry.cylinders;
-}
-
uint8_t virtio_get_heads(void)
{
return blk_cfg.geometry.heads;
@@ -355,6 +350,12 @@ uint8_t virtio_get_sectors(void)
return blk_cfg.geometry.sectors;
}
+uint64_t virtio_get_blocks(void)
+{
+ return blk_cfg.capacity /
+ (virtio_get_block_size() / VIRTIO_SECTOR_SIZE);
+}
+
void virtio_setup_block(struct subchannel_id schid)
{
struct vq_info_block info;
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
index f1fb1b0..c23466b 100644
--- a/pc-bios/s390-ccw/virtio.h
+++ b/pc-bios/s390-ccw/virtio.h
@@ -192,9 +192,9 @@ extern bool virtio_disk_is_scsi(void);
extern bool virtio_disk_is_eckd(void);
extern bool virtio_ipl_disk_is_valid(void);
extern int virtio_get_block_size(void);
-extern uint16_t virtio_get_cylinders(void);
extern uint8_t virtio_get_heads(void);
extern uint8_t virtio_get_sectors(void);
+extern uint64_t virtio_get_blocks(void);
extern int virtio_read_many(ulong sector, void *load_addr, int sec_num);
#define VIRTIO_SECTOR_SIZE 512
--
1.8.5.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 5/7] pc-bios/s390-ccw: IPL from DASD with format variations
2014-08-29 9:01 [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Jens Freimann
` (3 preceding siblings ...)
2014-08-29 9:01 ` [Qemu-devel] [PATCH 4/7] pc-bios/s390-ccw Really big EAV ECKD DASD handling Jens Freimann
@ 2014-08-29 9:01 ` Jens Freimann
2014-08-29 9:01 ` [Qemu-devel] [PATCH 6/7] pc-bios/s390-ccw: Do proper console setup Jens Freimann
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jens Freimann @ 2014-08-29 9:01 UTC (permalink / raw)
To: Christian Borntraeger, Alexander Graf, Cornelia Huck
Cc: Eugene (jno) Dvurechenski, Jens Freimann, qemu-devel
From: "Eugene (jno) Dvurechenski" <jno@linux.vnet.ibm.com>
There are two known cases of DASD format where signatures are
incomplete or absent:
1. result of <dasdfmt -d ldl -L ...> (ECKD_LDL_UNLABELED)
2. CDL with zero keys in IPL1 and IPL2 records
Now the code attempts to
1. find zIPL and use SCSI layout
2. find IPL1 and use CDL layout
3. find CMS1 and use LDL layout
3. find LNX1 and use LDL layout
4. find zIPL and use unlabeled LDL layout
5. find zIPL and use CDL layout
6. die
in this sequence.
Signed-off-by: Eugene (jno) Dvurechenski <jno@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
---
pc-bios/s390-ccw/bootmap.c | 52 ++++++++++++++++++++++++++--------------------
pc-bios/s390-ccw/bootmap.h | 2 +-
2 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index d4c579c..aa1cf80 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -222,7 +222,6 @@ static void ipl_eckd_cdl(void)
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
read_block(1, ipl2, "Cannot read IPL2 record at block 1");
- IPL_assert(magic_match(ipl2, IPL2_MAGIC), "No IPL2 record");
mbr = &ipl2->u.x.mbr;
IPL_assert(magic_match(mbr, ZIPL_MAGIC), "No zIPL section in IPL2 record.");
@@ -246,12 +245,10 @@ static void ipl_eckd_cdl(void)
/* no return */
}
-static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
+static void print_eckd_ldl_msg(ECKD_IPL_mode_t mode)
{
LDL_VTOC *vlbl = (void *)sec; /* already read, 3rd block */
char msg[4] = { '?', '.', '\n', '\0' };
- block_number_t block_nr;
- BootInfo *bip;
sclp_print((mode == ECKD_CMS) ? "CMS" : "LDL");
sclp_print(" version ");
@@ -271,12 +268,27 @@ static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
}
sclp_print(msg);
print_volser(vlbl->volser);
+}
+
+static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
+{
+ block_number_t block_nr;
+ BootInfo *bip = (void *)(sec + 0x70); /* BootInfo is MBR for LDL */
+
+ if (mode != ECKD_LDL_UNLABELED) {
+ print_eckd_ldl_msg(mode);
+ }
/* DO NOT read BootMap pointer (only one, xECKD) at block #2 */
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
- read_block(0, sec, "Cannot read block 0");
- bip = (void *)(sec + 0x70); /* "boot info" is "eckd mbr" for LDL */
+ read_block(0, sec, "Cannot read block 0 to grab boot info.");
+ if (mode == ECKD_LDL_UNLABELED) {
+ if (!magic_match(bip->magic, ZIPL_MAGIC)) {
+ return; /* not applicable layout */
+ }
+ sclp_print("unlabeled LDL.\n");
+ }
verify_boot_info(bip);
block_nr = eckd_block_num((void *)&(bip->bp.ipl.bm_ptr.eckd.bptr));
@@ -284,19 +296,6 @@ static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
/* no return */
}
-static void ipl_eckd(ECKD_IPL_mode_t mode)
-{
- switch (mode) {
- case ECKD_CDL:
- ipl_eckd_cdl(); /* no return */
- case ECKD_CMS:
- case ECKD_LDL:
- ipl_eckd_ldl(mode); /* no return */
- default:
- virtio_panic("\n! Unknown ECKD IPL mode !\n");
- }
-}
-
static void print_eckd_msg(void)
{
char msg[] = "Using ECKD scheme (block size *****), ";
@@ -471,7 +470,7 @@ void zipl_load(void)
}
print_eckd_msg();
if (magic_match(mbr->magic, IPL1_MAGIC)) {
- ipl_eckd(ECKD_CDL); /* no return */
+ ipl_eckd_cdl(); /* no return */
}
/* LDL/CMS? */
@@ -479,11 +478,18 @@ void zipl_load(void)
read_block(2, vlbl, "Cannot read block 2");
if (magic_match(vlbl->magic, CMS1_MAGIC)) {
- ipl_eckd(ECKD_CMS); /* no return */
+ ipl_eckd_ldl(ECKD_CMS); /* no return */
}
if (magic_match(vlbl->magic, LNX1_MAGIC)) {
- ipl_eckd(ECKD_LDL); /* no return */
+ ipl_eckd_ldl(ECKD_LDL); /* no return */
}
- virtio_panic("\n* invalid MBR magic *\n");
+ ipl_eckd_ldl(ECKD_LDL_UNLABELED); /* it still may return */
+ /*
+ * Ok, it is not a LDL by any means.
+ * It still might be a CDL with zero record keys for IPL1 and IPL2
+ */
+ ipl_eckd_cdl();
+
+ virtio_panic("\n* this can never happen *\n");
}
diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h
index 30ef22f..6a4823d 100644
--- a/pc-bios/s390-ccw/bootmap.h
+++ b/pc-bios/s390-ccw/bootmap.h
@@ -257,9 +257,9 @@ typedef struct IplVolumeLabel {
typedef enum {
ECKD_NO_IPL,
- ECKD_CDL,
ECKD_CMS,
ECKD_LDL,
+ ECKD_LDL_UNLABELED,
} ECKD_IPL_mode_t;
/* utility code below */
--
1.8.5.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 6/7] pc-bios/s390-ccw: Do proper console setup
2014-08-29 9:01 [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Jens Freimann
` (4 preceding siblings ...)
2014-08-29 9:01 ` [Qemu-devel] [PATCH 5/7] pc-bios/s390-ccw: IPL from DASD with format variations Jens Freimann
@ 2014-08-29 9:01 ` Jens Freimann
2014-08-29 9:01 ` [Qemu-devel] [PATCH 7/7] pc-bios/s390-ccw.img binary update Jens Freimann
2014-08-29 10:10 ` [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Christian Borntraeger
7 siblings, 0 replies; 10+ messages in thread
From: Jens Freimann @ 2014-08-29 9:01 UTC (permalink / raw)
To: Christian Borntraeger, Alexander Graf, Cornelia Huck
Cc: Jens Freimann, qemu-devel
From: Christian Borntraeger <borntraeger@de.ibm.com>
The final newline/return must happen before we reset the sclp via
diag 308.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
---
pc-bios/s390-ccw/bootmap.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index aa1cf80..115d8bb 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -40,11 +40,6 @@ static void jump_to_IPL_2(void)
ResetInfo *current = 0;
void (*ipl)(void) = (void *) (uint64_t) current->ipl_continue;
- debug_print_addr("set IPL addr to", ipl);
-
- /* Ensure the guest output starts fresh */
- sclp_print("\n");
-
*current = save;
ipl(); /* should not return */
}
@@ -64,6 +59,11 @@ static void jump_to_IPL_code(uint64_t address)
current->ipl_addr = (uint32_t) (uint64_t) &jump_to_IPL_2;
current->ipl_continue = address & 0x7fffffff;
+ debug_print_int("set IPL addr to", current->ipl_continue);
+
+ /* Ensure the guest output starts fresh */
+ sclp_print("\n");
+
/*
* HACK ALERT.
* We use the load normal reset to keep r15 unchanged. jump_to_IPL_2
--
1.8.5.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 7/7] pc-bios/s390-ccw.img binary update
2014-08-29 9:01 [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Jens Freimann
` (5 preceding siblings ...)
2014-08-29 9:01 ` [Qemu-devel] [PATCH 6/7] pc-bios/s390-ccw: Do proper console setup Jens Freimann
@ 2014-08-29 9:01 ` Jens Freimann
2014-08-29 10:10 ` [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Christian Borntraeger
7 siblings, 0 replies; 10+ messages in thread
From: Jens Freimann @ 2014-08-29 9:01 UTC (permalink / raw)
To: Christian Borntraeger, Alexander Graf, Cornelia Huck
Cc: Eugene (jno) Dvurechenski, Jens Freimann, qemu-devel
From: "Eugene (jno) Dvurechenski" <jno@linux.vnet.ibm.com>
Rebuild of s390-ccw.img containing these patches:
pc-bios/s390-ccw: Do proper console setup
pc-bios/s390-ccw: support all virtio block size
pc-bios/s390-ccw: handle more ECKD DASD block sizes
pc-bios/s390-ccw Improve ECKD informational message
pc-bios/s390-ccw Really big EAV ECKD DASD handling
pc-bios/s390-ccw: IPL from DASD with format variations
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
---
pc-bios/s390-ccw.img | Bin 17752 -> 17752 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img
index e3ea0d5664f01ff472d3531980941fb5f163ff02..44873ad1817f44a5610ea556f86394b2c4a4c1ff 100644
GIT binary patch
literal 17752
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
literal 17752
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
--
1.8.5.5
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support
2014-08-29 9:01 [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Jens Freimann
` (6 preceding siblings ...)
2014-08-29 9:01 ` [Qemu-devel] [PATCH 7/7] pc-bios/s390-ccw.img binary update Jens Freimann
@ 2014-08-29 10:10 ` Christian Borntraeger
2014-09-05 23:26 ` Alexander Graf
7 siblings, 1 reply; 10+ messages in thread
From: Christian Borntraeger @ 2014-08-29 10:10 UTC (permalink / raw)
To: Jens Freimann, Alexander Graf, Cornelia Huck; +Cc: qemu-devel
On 29/08/14 11:01, Jens Freimann wrote:
> Patches 1-5 contain changes improving support of more disk formats
> and block sizes.
>
> Patch 6 makes sure we print a newline to leave a clean slate before
> continuing with IPL.
>
> Patch 7 updates the binary.
>
> regards
> Jens
>
> Christian Borntraeger (1):
> pc-bios/s390-ccw: Do proper console setup
>
> Eugene (jno) Dvurechenski (6):
> pc-bios/s390-ccw: support all virtio block size
> pc-bios/s390-ccw: handle more ECKD DASD block sizes
> pc-bios/s390-ccw Improve ECKD informational message
> pc-bios/s390-ccw Really big EAV ECKD DASD handling
> pc-bios/s390-ccw: IPL from DASD with format variations
> pc-bios/s390-ccw.img binary update
>
> pc-bios/s390-ccw.img | Bin 17752 -> 17752 bytes
> pc-bios/s390-ccw/bootmap.c | 107 +++++++++++++++++++++++++++------------------
> pc-bios/s390-ccw/bootmap.h | 2 +-
> pc-bios/s390-ccw/virtio.c | 48 +++++++++++++++-----
> pc-bios/s390-ccw/virtio.h | 2 +-
> 5 files changed, 103 insertions(+), 56 deletions(-)
>
Thanks
Applied to github.com/borntraeger/qemu.git s390-next.
I will wait till next week before sending the pull request to give others a chance for feedback.
Christian
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support
2014-08-29 10:10 ` [Qemu-devel] [PATCH 0/7] s390-ccw.img: block size and DASD format support Christian Borntraeger
@ 2014-09-05 23:26 ` Alexander Graf
0 siblings, 0 replies; 10+ messages in thread
From: Alexander Graf @ 2014-09-05 23:26 UTC (permalink / raw)
To: Christian Borntraeger, Jens Freimann, Cornelia Huck; +Cc: qemu-devel
On 29.08.14 12:10, Christian Borntraeger wrote:
> On 29/08/14 11:01, Jens Freimann wrote:
>> Patches 1-5 contain changes improving support of more disk formats
>> and block sizes.
>>
>> Patch 6 makes sure we print a newline to leave a clean slate before
>> continuing with IPL.
>>
>> Patch 7 updates the binary.
>>
>> regards
>> Jens
>>
>> Christian Borntraeger (1):
>> pc-bios/s390-ccw: Do proper console setup
>>
>> Eugene (jno) Dvurechenski (6):
>> pc-bios/s390-ccw: support all virtio block size
>> pc-bios/s390-ccw: handle more ECKD DASD block sizes
>> pc-bios/s390-ccw Improve ECKD informational message
>> pc-bios/s390-ccw Really big EAV ECKD DASD handling
>> pc-bios/s390-ccw: IPL from DASD with format variations
>> pc-bios/s390-ccw.img binary update
>>
>> pc-bios/s390-ccw.img | Bin 17752 -> 17752 bytes
>> pc-bios/s390-ccw/bootmap.c | 107 +++++++++++++++++++++++++++------------------
>> pc-bios/s390-ccw/bootmap.h | 2 +-
>> pc-bios/s390-ccw/virtio.c | 48 +++++++++++++++-----
>> pc-bios/s390-ccw/virtio.h | 2 +-
>> 5 files changed, 103 insertions(+), 56 deletions(-)
>>
>
> Thanks
>
>
> Applied to github.com/borntraeger/qemu.git s390-next.
Reviewed-by: Alexander Graf <agraf@suse.de>
Alex
^ permalink raw reply [flat|nested] 10+ messages in thread