[v2] Implement network booting directly into the s390-ccw BIOS

[Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c

Posted by Thomas Huth 8 years, 4 months ago

We will later need this array in a file that we will link to the
netboot code, too. Since there is some ebcdic convertion done
in sclp_get_loadparm_ascii(), the sclp.c file seems to be a good
candidate.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 pc-bios/s390-ccw/main.c | 11 -----------
 pc-bios/s390-ccw/sclp.c | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 40cba8d..0580eac 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -17,17 +17,6 @@ static SubChannelId blk_schid = { .one = 1 };
 IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
 static char loadparm[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
-const unsigned char ebc2asc[256] =
-      /* 0123456789abcdef0123456789abcdef */
-        "................................" /* 1F */
-        "................................" /* 3F */
-        " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space */
-        "-/.........,%_>?.........`:#@'=\""/* 7F */
-        ".abcdefghi.......jklmnopqr......" /* 9F */
-        "..stuvwxyz......................" /* BF */
-        ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
-        "..STUVWXYZ......0123456789......";/* FF */
-
 /*
  * Priniciples of Operations (SA22-7832-09) chapter 17 requires that
  * a subsystem-identification is at 184-187 and bytes 188-191 are zero
diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
index aa1c862..2ee204a 100644
--- a/pc-bios/s390-ccw/sclp.c
+++ b/pc-bios/s390-ccw/sclp.c
@@ -14,6 +14,17 @@
 
 static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096)));
 
+const unsigned char ebc2asc[256] =
+      /* 0123456789abcdef0123456789abcdef */
+        "................................" /* 1F */
+        "................................" /* 3F */
+        " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space */
+        "-/.........,%_>?.........`:#@'=\""/* 7F */
+        ".abcdefghi.......jklmnopqr......" /* 9F */
+        "..stuvwxyz......................" /* BF */
+        ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
+        "..STUVWXYZ......0123456789......";/* FF */
+
 /* Perform service call. Return 0 on success, non-zero otherwise. */
 static int sclp_service_call(unsigned int command, void *sccb)
 {
-- 
1.8.3.1

Re: [Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c

Posted by Cornelia Huck 8 years, 4 months ago

On Fri,  7 Jul 2017 12:26:58 +0200
Thomas Huth <thuth@redhat.com> wrote:

> We will later need this array in a file that we will link to the
> netboot code, too. Since there is some ebcdic convertion done
> in sclp_get_loadparm_ascii(), the sclp.c file seems to be a good
> candidate.

Interacting with sclp is probably the only place we'll need to deal
with ebcdic in the ccw bios, so this seems sensible.

> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  pc-bios/s390-ccw/main.c | 11 -----------
>  pc-bios/s390-ccw/sclp.c | 11 +++++++++++
>  2 files changed, 11 insertions(+), 11 deletions(-)

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

Re: [Qemu-devel] [RFC PATCH v2 2/8] pc-bios/s390-ccw: Move ebc2asc to sclp.c

Posted by Farhan Ali 8 years, 4 months ago


On 07/07/2017 06:26 AM, Thomas Huth wrote:
> We will later need this array in a file that we will link to the
> netboot code, too. Since there is some ebcdic convertion done
> in sclp_get_loadparm_ascii(), the sclp.c file seems to be a good
> candidate.

s/convertion/conversion
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  pc-bios/s390-ccw/main.c | 11 -----------
>  pc-bios/s390-ccw/sclp.c | 11 +++++++++++
>  2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
> index 40cba8d..0580eac 100644
> --- a/pc-bios/s390-ccw/main.c
> +++ b/pc-bios/s390-ccw/main.c
> @@ -17,17 +17,6 @@ static SubChannelId blk_schid = { .one = 1 };
>  IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
>  static char loadparm[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
>
> -const unsigned char ebc2asc[256] =
> -      /* 0123456789abcdef0123456789abcdef */
> -        "................................" /* 1F */
> -        "................................" /* 3F */
> -        " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space */
> -        "-/.........,%_>?.........`:#@'=\""/* 7F */
> -        ".abcdefghi.......jklmnopqr......" /* 9F */
> -        "..stuvwxyz......................" /* BF */
> -        ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
> -        "..STUVWXYZ......0123456789......";/* FF */
> -
>  /*
>   * Priniciples of Operations (SA22-7832-09) chapter 17 requires that
>   * a subsystem-identification is at 184-187 and bytes 188-191 are zero
> diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
> index aa1c862..2ee204a 100644
> --- a/pc-bios/s390-ccw/sclp.c
> +++ b/pc-bios/s390-ccw/sclp.c
> @@ -14,6 +14,17 @@
>
>  static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096)));
>
> +const unsigned char ebc2asc[256] =
> +      /* 0123456789abcdef0123456789abcdef */
> +        "................................" /* 1F */
> +        "................................" /* 3F */
> +        " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space */
> +        "-/.........,%_>?.........`:#@'=\""/* 7F */
> +        ".abcdefghi.......jklmnopqr......" /* 9F */
> +        "..stuvwxyz......................" /* BF */
> +        ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
> +        "..STUVWXYZ......0123456789......";/* FF */
> +
>  /* Perform service call. Return 0 on success, non-zero otherwise. */
>  static int sclp_service_call(unsigned int command, void *sccb)
>  {
>