[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/9] pc-bios: s390x: Get rid of magic offsets into the lowcore
From: |
Janosch Frank |
Subject: |
[PATCH v2 3/9] pc-bios: s390x: Get rid of magic offsets into the lowcore |
Date: |
Thu, 14 May 2020 08:37:23 -0400 |
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 <address@hidden>
---
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..1ce5344b85 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
- [PATCH v2 0/9] pc-bios: s390x: Cleanup part 1, Janosch Frank, 2020/05/14
- [PATCH v2 1/9] pc-bios: s390x: cio.c cleanup and compile fix, Janosch Frank, 2020/05/14
- [PATCH v2 3/9] pc-bios: s390x: Get rid of magic offsets into the lowcore,
Janosch Frank <=
- [PATCH v2 5/9] pc-bios: s390x: Use PSW masks where possible, Janosch Frank, 2020/05/14
- [PATCH v2 6/9] pc-bios: s390x: Move panic() into header and add infinite loop, Janosch Frank, 2020/05/14
- [PATCH v2 7/9] pc-bios: s390x: Use ebcdic2ascii table, Janosch Frank, 2020/05/14
- [PATCH v2 8/9] pc-bios: s390x: Replace 0x00 with 0x0 or 0, Janosch Frank, 2020/05/14