From ad3b92699ba5e2280950fa9866f79673cecdb695 Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Mon, 14 Oct 2019 10:06:29 +0100

Subject: [PATCH 04/21] pc-bios/s390-ccw: define loadparm length

RH-Author: Thomas Huth <thuth@redhat.com>

Message-id: <20191014100645.22862-2-thuth@redhat.com>

Patchwork-id: 91780

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH v2 01/17] pc-bios/s390-ccw: define loadparm length

Bugzilla: 1664376

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

From: Collin Walling <walling@linux.ibm.com>

Loadparm is defined by the s390 architecture to be 8 bytes

in length. Let's define this size in the s390-ccw bios.

Suggested-by: Laszlo Ersek <lersek@redhat.com>

Signed-off-by: Collin Walling <walling@linux.ibm.com>

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Signed-off-by: Thomas Huth <thuth@redhat.com>

(cherry picked from commit a0e11b617b9ef41cefe8739dff4d6a7b01ca967f)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 pc-bios/s390-ccw/iplb.h | 4 +++-

 pc-bios/s390-ccw/main.c | 8 ++++----

 pc-bios/s390-ccw/sclp.c | 2 +-

 pc-bios/s390-ccw/sclp.h | 2 +-

 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h

index ded20c8..772d5c5 100644

--- a/pc-bios/s390-ccw/iplb.h

+++ b/pc-bios/s390-ccw/iplb.h

@@ -12,6 +12,8 @@

 #ifndef IPLB_H

 #define IPLB_H

+#define LOADPARM_LEN    8

+

 struct IplBlockCcw {

     uint8_t  reserved0[85];

     uint8_t  ssid;

@@ -61,7 +63,7 @@ struct IplParameterBlock {

     uint8_t  pbt;

     uint8_t  flags;

     uint16_t reserved01;

-    uint8_t  loadparm[8];

+    uint8_t  loadparm[LOADPARM_LEN];

     union {

         IplBlockCcw ccw;

         IplBlockFcp fcp;

diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c

index 26f9adf..544851d 100644

--- a/pc-bios/s390-ccw/main.c

+++ b/pc-bios/s390-ccw/main.c

@@ -15,7 +15,7 @@

 char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));

 static SubChannelId blk_schid = { .one = 1 };

 IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));

-static char loadparm_str[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };

+static char loadparm_str[LOADPARM_LEN + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };

 QemuIplParameters qipl;

 #define LOADPARM_PROMPT "PROMPT  "

@@ -80,13 +80,13 @@ static bool find_dev(Schib *schib, int dev_no)

 static void menu_setup(void)

 {

-    if (memcmp(loadparm_str, LOADPARM_PROMPT, 8) == 0) {

+    if (memcmp(loadparm_str, LOADPARM_PROMPT, LOADPARM_LEN) == 0) {

         menu_set_parms(QIPL_FLAG_BM_OPTS_CMD, 0);

         return;

     }

     /* If loadparm was set to any other value, then do not enable menu */

-    if (memcmp(loadparm_str, LOADPARM_EMPTY, 8) != 0) {

+    if (memcmp(loadparm_str, LOADPARM_EMPTY, LOADPARM_LEN) != 0) {

         return;

     }

@@ -117,7 +117,7 @@ static void virtio_setup(void)

     enable_mss_facility();

     sclp_get_loadparm_ascii(loadparm_str);

-    memcpy(ldp + 10, loadparm_str, 8);

+    memcpy(ldp + 10, loadparm_str, LOADPARM_LEN);

     sclp_print(ldp);

     memcpy(&qipl, early_qipl, sizeof(QemuIplParameters));

diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c

index 3836cb4..c0223fa 100644

--- a/pc-bios/s390-ccw/sclp.c

+++ b/pc-bios/s390-ccw/sclp.c

@@ -114,7 +114,7 @@ void sclp_get_loadparm_ascii(char *loadparm)

     memset((char *)_sccb, 0, sizeof(ReadInfo));

     sccb->h.length = sizeof(ReadInfo);

     if (!sclp_service_call(SCLP_CMDW_READ_SCP_INFO, sccb)) {

-        ebcdic_to_ascii((char *) sccb->loadparm, loadparm, 8);

+        ebcdic_to_ascii((char *) sccb->loadparm, loadparm, LOADPARM_LEN);

     }

 }

diff --git a/pc-bios/s390-ccw/sclp.h b/pc-bios/s390-ccw/sclp.h

index 0dd987f..8450161 100644

--- a/pc-bios/s390-ccw/sclp.h

+++ b/pc-bios/s390-ccw/sclp.h

@@ -56,7 +56,7 @@ typedef struct ReadInfo {

     uint16_t rnmax;

     uint8_t rnsize;

     uint8_t reserved[13];

-    uint8_t loadparm[8];

+    uint8_t loadparm[LOADPARM_LEN];

 } __attribute__((packed)) ReadInfo;

 typedef struct SCCB {

-- 

1.8.3.1