From: Janosch Frank <frankja@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, cohuck@redhat.com,
thuth@redhat.com, david@redhat.com
Subject: [PATCH v3 4/9] pc-bios: s390x: Get rid of magic offsets into the lowcore
Date: Wed, 27 May 2020 03:49:15 -0400 [thread overview]
Message-ID: <20200527074920.43669-5-frankja@linux.ibm.com> (raw)
In-Reply-To: <20200527074920.43669-1-frankja@linux.ibm.com>
If we have a lowcore struct that has members for offsets that we want
to touch, why not use it?
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
pc-bios/s390-ccw/cio.h | 17 +++++++++++------
pc-bios/s390-ccw/main.c | 8 +++-----
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/pc-bios/s390-ccw/cio.h b/pc-bios/s390-ccw/cio.h
index aaa432dedd..1e5d4e92e1 100644
--- a/pc-bios/s390-ccw/cio.h
+++ b/pc-bios/s390-ccw/cio.h
@@ -122,12 +122,17 @@ typedef struct schib {
} __attribute__ ((packed, aligned(4))) Schib;
typedef struct subchannel_id {
- __u32 cssid:8;
- __u32:4;
- __u32 m:1;
- __u32 ssid:2;
- __u32 one:1;
- __u32 sch_no:16;
+ union {
+ struct {
+ __u16 cssid:8;
+ __u16 reserved:4;
+ __u16 m:1;
+ __u16 ssid:2;
+ __u16 one:1;
+ };
+ __u16 sch_id;
+ };
+ __u16 sch_no;
} __attribute__ ((packed, aligned(4))) SubChannelId;
struct chsc_header {
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 4e65b411e1..8b912454c9 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -36,11 +36,9 @@ LowCore *lowcore; /* Yes, this *is* a pointer to address 0 */
*/
void write_subsystem_identification(void)
{
- SubChannelId *schid = (SubChannelId *) 184;
- uint32_t *zeroes = (uint32_t *) 188;
-
- *schid = blk_schid;
- *zeroes = 0;
+ lowcore->subchannel_id = blk_schid.sch_id;
+ lowcore->subchannel_nr = blk_schid.sch_no;
+ lowcore->io_int_parm = 0;
}
void write_iplb_location(void)
--
2.25.1
next prev parent reply other threads:[~2020-05-27 7:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 7:49 [PATCH v3 0/9] pc-bios: s390x: Cleanup part 1 Janosch Frank
2020-05-27 7:49 ` [PATCH v3 1/9] pc-bios: s390x: cio.c cleanup and compile fix Janosch Frank
2020-05-27 8:24 ` Christian Borntraeger
2020-05-27 8:34 ` Janosch Frank
2020-05-27 7:49 ` [PATCH v3 2/9] pc-bios: s390x: Consolidate timing functions into time.h Janosch Frank
2020-05-27 8:36 ` Christian Borntraeger
2020-05-27 8:41 ` Janosch Frank
2020-05-27 7:49 ` [PATCH v3 3/9] pc-bios: s390x: Move sleep and yield to helper.h Janosch Frank
2020-05-27 8:34 ` Christian Borntraeger
2020-05-27 8:35 ` Janosch Frank
2020-05-27 7:49 ` Janosch Frank [this message]
2020-05-27 8:50 ` [PATCH v3 4/9] pc-bios: s390x: Get rid of magic offsets into the lowcore Christian Borntraeger
2020-05-27 11:23 ` Janosch Frank
2020-05-27 7:49 ` [PATCH v3 5/9] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant Janosch Frank
2020-05-27 7:49 ` [PATCH v3 6/9] pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR Janosch Frank
2020-05-27 7:49 ` [PATCH v3 7/9] pc-bios: s390x: Move panic() into header and add infinite loop Janosch Frank
2020-05-27 7:49 ` [PATCH v3 8/9] pc-bios: s390x: Use ebcdic2ascii table Janosch Frank
2020-05-27 7:49 ` [PATCH v3 9/9] pc-bios: s390x: Make u32 ptr check explicit Janosch Frank
2020-05-27 10:30 ` [PATCH v3 0/9] pc-bios: s390x: Cleanup part 1 no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200527074920.43669-5-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).