pc-bios: s390x: Cleanup part 1
v4 cover pc-bios: s390x: Cleanup part 1
The bios is in dire need for a cleanup as there are still a lot of magic constants being used throughout as well as duplicated code.
In the first part of this series we consolidate constants and functions, as well as doing some minor cleanups and fixes.
The patches are available here:
https://github.com/frankjaa/qemu/pull/new/cleanup_bios
v4:
* Renamed time.h to s390-time.h
* Fixed function names in sleep()
* Changed order of sense_id_ccw initialization
* Added missing include before sleep()
v3:
* Dropped 0x00 to 0x0/0 patch
* Moved some timing functions into helper.h instead of time.h
* Fixed IPL psw manipulation in dasd-ipl.c
* Minor cosmetic fixes found by review
v2:
* Included cio fixup to get rid of compile errors...
* Minor cosmetic fixes found by review
Janosch Frank (9):
pc-bios: s390x: cio.c cleanup and compile fix
pc-bios: s390x: Consolidate timing functions into time.h
pc-bios: s390x: Move sleep and yield to helper.h
pc-bios: s390x: Get rid of magic offsets into the lowcore
pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant
pc-bios: s390x: Use PSW masks where possible and introduce
PSW_MASK_SHORT_ADDR
pc-bios: s390x: Move panic() into header and add infinite loop
pc-bios: s390x: Use ebcdic2ascii table
pc-bios: s390x: Make u32 ptr check explicit
pc-bios/s390-ccw/bootmap.c | 4 +--- pc-bios/s390-ccw/cio.c | 40 +++++++++++++++++++--------------- pc-bios/s390-ccw/cio.h | 17 ++++++++++----- pc-bios/s390-ccw/dasd-ipl.c | 5 ++--- pc-bios/s390-ccw/helper.h | 19 +++++++++++++++- pc-bios/s390-ccw/jump2ipl.c | 10 ++++----- pc-bios/s390-ccw/main.c | 15 +++---------- pc-bios/s390-ccw/menu.c | 1 + pc-bios/s390-ccw/netmain.c | 23 +++---------------- pc-bios/s390-ccw/s390-arch.h | 4 +++- pc-bios/s390-ccw/s390-ccw.h | 27 ++++++----------------- pc-bios/s390-ccw/s390-time.h | 23 +++++++++++++++++++ pc-bios/s390-ccw/start.S | 5 +++-- pc-bios/s390-ccw/virtio-net.c | 2 ++ pc-bios/s390-ccw/virtio-scsi.c | 2 ++ pc-bios/s390-ccw/virtio.c | 18 +++------------ 16 files changed, 108 insertions(+), 107 deletions(-) create mode 100644 pc-bios/s390-ccw/s390-time.h
Signature · 1 line
2.25.1
PATCH v4 1/9 pc-bios: s390x: cio.c cleanup and compile fix
Let's initialize the structs at the beginning to ease reading and also zeroing all other fields. This also makes the compiler stop complaining about sense_id_ccw.flags being ored into when it's not initialized.
--- pc-bios/s390-ccw/cio.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-)
pc-bios/s390-ccw/cio.c +22 -18
@@ -49,13 +49,13 @@ void enable_subchannel(SubChannelId schid)uint16_t cu_type (SubChannelId schid) { -Ccw1 sense_id_ccw;SenseId sense_data; - - sense_id_ccw.cmd_code =CCW_CMD_SENSE_ID ; - sense_id_ccw.cda =ptr2u32 (&sense_data); - sense_id_ccw.count =sizeof (sense_data); - sense_id_ccw.flags |=CCW_FLAG_SLI ; +Ccw1 sense_id_ccw = { + .cmd_code =CCW_CMD_SENSE_ID , + .flags =CCW_FLAG_SLI , + .count =sizeof (sense_data), + .cda =ptr2u32 (&sense_data), + };if (do_cio (schid,CU_TYPE_UNKNOWN ,ptr2u32 (&sense_id_ccw),CCW_FMT1 )) {panic ("Failed to run SenseID CCw\n" );
@@ -67,13 +67,13 @@ uint16_t cu_type(SubChannelId schid)int basic_sense (SubChannelId schid,uint16_t cutype,void *sense_data,uint16_t data_size) { -Ccw1 senseCcw; +Ccw1 senseCcw = { + .cmd_code =CCW_CMD_BASIC_SENSE , + .count = data_size, + .cda =ptr2u32 (sense_data), + };Irb irb; - senseCcw.cmd_code =CCW_CMD_BASIC_SENSE ; - senseCcw.cda =ptr2u32 (sense_data); - senseCcw.count = data_size; -return __do_cio (schid,ptr2u32 (&senseCcw),CCW_FMT1 , &irb); }
@@ -314,7 +314,17 @@ static void print_irb_err(Irb *irb)*/ static int __do_cio (SubChannelId schid,uint32_t ccw_addr,int fmt,Irb *irb) { -CmdOrb orb = {}; +/* +* QEMU's CIO implementation requires prefetch and 64-bit idaws. We +* allow all paths. +*/ +CmdOrb orb = { + .fmt = fmt, + .pfch =1 , + .c64 =1 , + .lpm =0xFF , + .cpa = ccw_addr, + };int rc;IPL_assert (fmt ==0 || fmt ==1 ,"Invalid ccw format" );
@@ -324,12 +334,6 @@ static int __do_cio(SubChannelId schid, uint32_t ccw_addr, int fmt, Irb *irb)IPL_assert (ccw_addr <=0xFFFFFF -8 ,"Invalid ccw address" ); } - orb.fmt = fmt; - orb.pfch =1 ;/* QEMU's cio implementation requires prefetch */ - orb.c64 =1 ;/* QEMU's cio implementation requires 64-bit idaws */ - orb.lpm =0xFF ;/* All paths allowed */ - orb.cpa = ccw_addr; - rc =ssch (schid, &orb);if (rc ==1 || rc ==2 ) {/* Subchannel status pending or busy. Eat status and ask for retry. */
Signature · 1 line
2.25.1
PATCH v4 2/9 pc-bios: s390x: Consolidate timing functions into time.h
In reply to Janosch FrankLet's consolidate timing related functions into one header.
--- pc-bios/s390-ccw/menu.c | 1 + pc-bios/s390-ccw/netmain.c | 15 +++------------ pc-bios/s390-ccw/s390-ccw.h | 8 ++++---- pc-bios/s390-ccw/s390-time.h | 23 +++++++++++++++++++++++ pc-bios/s390-ccw/virtio-net.c | 1 + pc-bios/s390-ccw/virtio-scsi.c | 1 + pc-bios/s390-ccw/virtio.c | 18 +++--------------- 7 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 pc-bios/s390-ccw/s390-time.h
pc-bios/s390-ccw/menu.c +1 -0
@@ -12,6 +12,7 @@#include "libc.h" #include "s390-ccw.h" #include "sclp.h" +#include "s390-time.h" #define KEYCODE_NO_INP '\0'#define KEYCODE_ESCAPE '\033'
pc-bios/s390-ccw/netmain.c +3 -12
@@ -35,6 +35,7 @@#include "s390-ccw.h" #include "cio.h" #include "virtio.h" +#include "s390-time.h" #define DEFAULT_BOOT_RETRIES 10#define DEFAULT_TFTP_RETRIES 20
@@ -57,24 +58,14 @@ static SubChannelId net_schid = { .one = 1 };static uint8_t mac[6 ];static uint64_t dest_timer; -static uint64_t get_timer_ms (void ) -{ -uint64_t clk; - - asmvolatile (" stck %0 " : :"Q" (clk) :"memory" ); - -/* Bit 51 is incremented each microsecond */ -return (clk >> (63 -51 )) /1000 ; -} -void set_timer (int val) { - dest_timer =get_timer_ms () + val; + dest_timer =get_time_ms () + val; }int get_timer (void ) { -return dest_timer -get_timer_ms (); +return dest_timer -get_time_ms (); }int get_sec_ticks (void )
pc-bios/s390-ccw/s390-ccw.h +4 -4
@@ -74,8 +74,6 @@ unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,bool virtio_is_supported (SubChannelId schid);void virtio_blk_setup_device (SubChannelId schid);int virtio_read (ulong sector,void *load_addr); -u64 get_clock (void ); -ulong get_second (void );/* bootmap.c */ void zipl_load (void );
@@ -153,11 +151,13 @@ static inline void yield(void)#define MAX_SECTOR_SIZE 4096 +#include "s390-time.h" +static inline void sleep (unsigned int seconds) { -ulong target =get_second () + seconds; +ulong target =get_time_seconds () + seconds; -while (get_second () < target) { +while (get_time_seconds () < target) {yield (); } }
pc-bios/s390-ccw/s390-time.h new file +23 -0
@@ -0,0 +1,23 @@ +#ifndef TIME_H +#define TIME_H + +static inline u64 get_clock (void ) +{ +u64 r; + + asmvolatile ("stck %0" :"=Q" (r) : :"cc" ); +return r; +} + +static inline u64 get_time_ms (void ) +{ +/* Bit 51 is incremented each microsecond */ +return (get_clock () >>12 ) /1000 ; +} + +static inline u64 get_time_seconds (void ) +{ +return get_time_ms () /1000 ; +} + +#endif
pc-bios/s390-ccw/virtio-net.c +1 -0
@@ -19,6 +19,7 @@#include <ethernet.h> #include "s390-ccw.h" #include "virtio.h" +#include "s390-time.h" #ifndef DEBUG_VIRTIO_NET #define DEBUG_VIRTIO_NET 0
pc-bios/s390-ccw/virtio-scsi.c +1 -0
@@ -14,6 +14,7 @@#include "virtio.h" #include "scsi.h" #include "virtio-scsi.h" +#include "s390-time.h" static ScsiDevice default_scsi_device;static VirtioScsiCmdReq req;
pc-bios/s390-ccw/virtio.c +3 -15
@@ -15,6 +15,7 @@#include "virtio-scsi.h" #include "bswap.h" #include "helper.h" +#include "s390-time.h" #define VRING_WAIT_REPLY_TIMEOUT 30
@@ -157,19 +158,6 @@ void vring_send_buf(VRing *vr, void *p, int len, int flags) } } -u64 get_clock (void ) -{ -u64 r; - - asmvolatile ("stck %0" :"=Q" (r) : :"cc" ); -return r; -} - -ulong get_second (void ) -{ -return (get_clock () >>12 ) /1000000 ; -} -int vr_poll (VRing *vr) {if (vr->used->idx == vr->used_idx) {
@@ -194,7 +182,7 @@ int vr_poll(VRing *vr)*/ int vring_wait_reply (void ) { -ulong target_second =get_second () + vdev.wait_reply_timeout; +ulong target_second =get_time_seconds () + vdev.wait_reply_timeout;/* Wait for any queue to be updated by the host */ do {
@@ -207,7 +195,7 @@ int vring_wait_reply(void)if (r) {return 0 ; } - }while (!vdev.wait_reply_timeout || (get_second () < target_second)); + }while (!vdev.wait_reply_timeout || (get_time_seconds () < target_second));return 1 ; }
Signature · 1 line
2.25.1
Re: [PATCH v4 2/9] pc-bios: s390x: Consolidate timing functions into time.h
Quoted 19 lines · Janosch Frank
Let's consolidate timing related functions into one header.
Signed-off-by Janosch Frank <[email protected]>--- pc-bios/s390-ccw/menu.c | 1 + pc-bios/s390-ccw/netmain.c | 15 +++------------ pc-bios/s390-ccw/s390-ccw.h | 8 ++++---- pc-bios/s390-ccw/s390-time.h | 23 +++++++++++++++++++++++ pc-bios/s390-ccw/virtio-net.c | 1 + pc-bios/s390-ccw/virtio-scsi.c | 1 + pc-bios/s390-ccw/virtio.c | 18 +++--------------- 7 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 pc-bios/s390-ccw/s390-time.hpc-bios/s390-ccw/menu.c +0
-0
pc-bios/s390-ccw/menu.c line 15
Quoted 4 lines
pc-bios/s390-ccw/menu.c +1
-0@@ -12,6 +12,7 @@#include "libc.h" #include "s390-ccw.h" #include "sclp.h" +#include "s390-time.h"
You could maybe drop these additional includes...
Quoted 14 lines
pc-bios/s390-ccw/s390-ccw.h +0
-2@@ -74,8 +74,6 @@ unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,bool virtio_is_supported (SubChannelId schid);void virtio_blk_setup_device (SubChannelId schid);int virtio_read (ulong sector,void *load_addr); -u64 get_clock (void ); -ulong get_second (void );/* bootmap.c */ void zipl_load (void );
pc-bios/s390-ccw/s390-ccw.h static inline void yield(void) · line 154
Quoted 4 lines
pc-bios/s390-ccw/s390-ccw.h +1
-0@@ -153,11 +151,13 @@ static inline void yield(void)#define MAX_SECTOR_SIZE 4096 +#include "s390-time.h"
... since you already include s390-time.h here in this central header file...
pc-bios/s390-ccw/s390-ccw.h static inline void yield(void) · line 163
Quoted 10 lines
pc-bios/s390-ccw/s390-ccw.h +2
-2static inline void sleep (unsigned int seconds) { -ulong target =get_second () + seconds; +ulong target =get_time_seconds () + seconds; -while (get_second () < target) { +while (get_time_seconds () < target) {yield (); } }
... or you could move the sleep() function into s390-time.h, too?
Anyway, both ways are fine for me, so:
Re: [PATCH v4 2/9] pc-bios: s390x: Consolidate timing functions into time.h
Quoted 54 lines · Thomas Huth
Quoted 19 lines · Janosch Frank
Let's consolidate timing related functions into one header.
Signed-off-by Janosch Frank <[email protected]>--- pc-bios/s390-ccw/menu.c | 1 + pc-bios/s390-ccw/netmain.c | 15 +++------------ pc-bios/s390-ccw/s390-ccw.h | 8 ++++---- pc-bios/s390-ccw/s390-time.h | 23 +++++++++++++++++++++++ pc-bios/s390-ccw/virtio-net.c | 1 + pc-bios/s390-ccw/virtio-scsi.c | 1 + pc-bios/s390-ccw/virtio.c | 18 +++--------------- 7 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 pc-bios/s390-ccw/s390-time.hpc-bios/s390-ccw/menu.c +0
-0pc-bios/s390-ccw/menu.c line 15
Quoted 4 lines
pc-bios/s390-ccw/menu.c +1
-0@@ -12,6 +12,7 @@#include "libc.h" #include "s390-ccw.h" #include "sclp.h" +#include "s390-time.h" You could maybe drop these additional includes...
Quoted 14 lines
pc-bios/s390-ccw/s390-ccw.h +0
-2@@ -74,8 +74,6 @@ unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,bool virtio_is_supported (SubChannelId schid);void virtio_blk_setup_device (SubChannelId schid);int virtio_read (ulong sector,void *load_addr); -u64 get_clock (void ); -ulong get_second (void );/* bootmap.c */ void zipl_load (void );pc-bios/s390-ccw/s390-ccw.h static inline void yield(void) · line 154
Quoted 4 lines
pc-bios/s390-ccw/s390-ccw.h +1
-0@@ -153,11 +151,13 @@ static inline void yield(void)#define MAX_SECTOR_SIZE 4096 +#include "s390-time.h" ... since you already include
s390-time.hhere in this central header file...Quoted 5 lines
pc-bios/s390-ccw/s390-ccw.h +1
-1static inline void sleep (unsigned int seconds) { -ulong target =get_second () + seconds; +ulong target =get_time_seconds () + seconds;
Quoted 7 lines
pc-bios/s390-ccw/s390-ccw.h static inline void yield(void) · line 163
Quoted 5 lines
pc-bios/s390-ccw/s390-ccw.h +1
-1-while (get_second () < target) { +while (get_time_seconds () < target) {yield (); } }... or you could move the
sleep()function intos390-time.h, too?
Never mind, I just saw that you move it in the next patch to a different header. That's fine.
Thomas
PATCH v4 3/9 pc-bios: s390x: Move sleep and yield to helper.h
In reply to Janosch FrankThey are definitely helper functions.
--- pc-bios/s390-ccw/helper.h | 17 +++++++++++++++++ pc-bios/s390-ccw/s390-ccw.h | 18 ------------------ pc-bios/s390-ccw/virtio-net.c | 1 + pc-bios/s390-ccw/virtio-scsi.c | 1 + 4 files changed, 19 insertions(+), 18 deletions(-)
pc-bios/s390-ccw/helper.h +17 -0
@@ -14,6 +14,7 @@#define S390_CCW_HELPER_H #include "s390-ccw.h" +#include "s390-time.h" /* Avoids compiler warnings when casting a pointer to a u32 */ static inline uint32_t ptr2u32 (void *ptr)
@@ -28,4 +29,20 @@ static inline void *u32toptr(uint32_t n) return (void *)(uint64_t)n; } +static inline void yield (void ) +{ + asmvolatile ("diag 0,0,0x44" + : : + :"memory" ,"cc" ); +} + +static inline void sleep (unsigned int seconds) +{ +ulong target =get_time_seconds () + seconds; + +while (get_time_seconds () < target) { +yield (); + } +} +#endif
pc-bios/s390-ccw/s390-ccw.h +0 -18
@@ -142,26 +142,8 @@ static inline void debug_print_addr(const char *desc, void *p)#define KVM_S390_VIRTIO_SET_STATUS 2#define KVM_S390_VIRTIO_CCW_NOTIFY 3 -static inline void yield (void ) -{ - asmvolatile ("diag 0,0,0x44" - : : - :"memory" ,"cc" ); -} -#define MAX_SECTOR_SIZE 4096 -#include "s390-time.h" - -static inline void sleep (unsigned int seconds) -{ -ulong target =get_time_seconds () + seconds; - -while (get_time_seconds () < target) { -yield (); - } -} -static inline void IPL_assert (bool term,const char *message) {if (!term) {
pc-bios/s390-ccw/virtio-net.c +1 -0
@@ -20,6 +20,7 @@#include "s390-ccw.h" #include "virtio.h" #include "s390-time.h" +#include "helper.h" #ifndef DEBUG_VIRTIO_NET #define DEBUG_VIRTIO_NET 0
pc-bios/s390-ccw/virtio-scsi.c +1 -0
@@ -15,6 +15,7 @@#include "scsi.h" #include "virtio-scsi.h" #include "s390-time.h" +#include "helper.h" static ScsiDevice default_scsi_device;static VirtioScsiCmdReq req;
Signature · 1 line
2.25.1
Re: [PATCH v4 3/9] pc-bios: s390x: Move sleep and yield to helper.h
Quoted 10 lines · Janosch Frank
They are definitely helper functions.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Christian Borntraeger <[email protected]>--- pc-bios/s390-ccw/helper.h | 17 +++++++++++++++++ pc-bios/s390-ccw/s390-ccw.h | 18 ------------------ pc-bios/s390-ccw/virtio-net.c | 1 + pc-bios/s390-ccw/virtio-scsi.c | 1 + 4 files changed, 19 insertions(+), 18 deletions(-)
Re: [PATCH v4 3/9] pc-bios: s390x: Move sleep and yield to helper.h
In reply to Janosch FrankQuoted 93 lines · Janosch Frank
They are definitely helper functions.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Christian Borntraeger <[email protected]>--- pc-bios/s390-ccw/helper.h | 17 +++++++++++++++++ pc-bios/s390-ccw/s390-ccw.h | 18 ------------------ pc-bios/s390-ccw/virtio-net.c | 1 + pc-bios/s390-ccw/virtio-scsi.c | 1 + 4 files changed, 19 insertions(+), 18 deletions(-)pc-bios/s390-ccw/helper.h +17
-0@@ -14,6 +14,7 @@#define S390_CCW_HELPER_H #include "s390-ccw.h" +#include "s390-time.h" /* Avoids compiler warnings when casting a pointer to a u32 */ static inline uint32_t ptr2u32 (void *ptr)@@ -28,4 +29,20 @@ static inline void *u32toptr(uint32_t n) return (void *)(uint64_t)n; } +static inline void yield (void ) +{ + asmvolatile ("diag 0,0,0x44" + : : + :"memory" ,"cc" ); +} + +static inline void sleep (unsigned int seconds) +{ +ulong target =get_time_seconds () + seconds; + +while (get_time_seconds () < target) { +yield (); + } +} +#endif pc-bios/s390-ccw/s390-ccw.h +0
-18@@ -142,26 +142,8 @@ static inline void debug_print_addr(const char *desc, void *p)#define KVM_S390_VIRTIO_SET_STATUS 2#define KVM_S390_VIRTIO_CCW_NOTIFY 3 -static inline void yield (void ) -{ - asmvolatile ("diag 0,0,0x44" - : : - :"memory" ,"cc" ); -} -#define MAX_SECTOR_SIZE 4096 -#include "s390-time.h" - -static inline void sleep (unsigned int seconds) -{ -ulong target =get_time_seconds () + seconds; - -while (get_time_seconds () < target) { -yield (); - } -} -static inline void IPL_assert (bool term,const char *message) {if (!term) {pc-bios/s390-ccw/virtio-net.c +1
-0@@ -20,6 +20,7 @@#include "s390-ccw.h" #include "virtio.h" #include "s390-time.h" +#include "helper.h" #ifndef DEBUG_VIRTIO_NET #define DEBUG_VIRTIO_NET 0pc-bios/s390-ccw/virtio-scsi.c +0
-0
pc-bios/s390-ccw/virtio-scsi.c line 21
Quoted 7 lines
pc-bios/s390-ccw/virtio-scsi.c +1
-0@@ -15,6 +15,7 @@#include "scsi.h" #include "virtio-scsi.h" #include "s390-time.h" +#include "helper.h" static ScsiDevice default_scsi_device;static VirtioScsiCmdReq req;
Signature · 3 lines
Thanks, David / dhildenb
PATCH v4 4/9 pc-bios: s390x: Get rid of magic offsets into the lowcore
In reply to Janosch FrankIf we have a lowcore struct that has members for offsets that we want to touch, why not use it?
--- pc-bios/s390-ccw/cio.h | 17 +++++++++++------ pc-bios/s390-ccw/main.c | 8 +++----- 2 files changed, 14 insertions(+), 11 deletions(-)
pc-bios/s390-ccw/cio.h +11 -6
@@ -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 {
pc-bios/s390-ccw/main.c +3 -5
@@ -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 )
Signature · 1 line
2.25.1
PATCH v4 5/9 pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant
In reply to Janosch FrankZMODE has a lot of ambiguity with the ESAME architecture mode, but is actually 64 bit addressing.
As PSW_MASK_64 is now effectively 33 bit long and the PSWLegacy struct has 2 32 bit members, let's also use a unsigned long pointer in dasd-ipl.c instead when oring the constant into a 8 byte PSW.
--- pc-bios/s390-ccw/dasd-ipl.c | 5 ++--- pc-bios/s390-ccw/s390-arch.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
pc-bios/s390-ccw/dasd-ipl.c +2 -3
@@ -206,7 +206,7 @@ static void run_ipl2(SubChannelId schid, uint16_t cutype, uint32_t addr)*/ void dasd_ipl (SubChannelId schid,uint16_t cutype) { -PSWLegacy *pswl = (PSWLegacy *)0x00 ; +unsigned long *pswl =0x0 ;uint32_t ipl2_addr;/* Construct Read IPL CCW and run it to read IPL1 from boot disk */
@@ -229,7 +229,6 @@ void dasd_ipl(SubChannelId schid, uint16_t cutype)run_ipl2 (schid, cutype, ipl2_addr);/* Transfer control to the guest operating system */ - pswl->mask |=PSW_MASK_EAMODE ;/* Force z-mode */ - pswl->addr |=PSW_MASK_BAMODE ;/* ... */ + *pswl |=PSW_MASK_64 ;/* Force 64 bit addressing */ jump_to_low_kernel (); }
pc-bios/s390-ccw/s390-arch.h +1 -1
@@ -29,7 +29,7 @@ _Static_assert(sizeof(struct PSWLegacy) == 8, "PSWLegacy size incorrect");#define PSW_MASK_WAIT 0x0002000000000000ULL#define PSW_MASK_EAMODE 0x0000000100000000ULL#define PSW_MASK_BAMODE 0x0000000080000000ULL -#define PSW_MASK_ZMODE (PSW_MASK_EAMODE | PSW_MASK_BAMODE) +#define PSW_MASK_64 (PSW_MASK_EAMODE | PSW_MASK_BAMODE)/* Low core mapping */ typedef struct LowCore {
Signature · 1 line
2.25.1
Re: [PATCH v4 5/9] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant
Quoted 20 lines · Janosch Frank
ZMODE has a lot of ambiguity with the ESAME architecture mode, but is actually 64 bit addressing.
As
PSW_MASK_64is now effectively 33 bit long and the PSWLegacy struct has 2 32 bit members, let's also use a unsigned long pointer indasd-ipl.cinstead when oring the constant into a 8 byte PSW.Signed-off-by Janosch Frank <[email protected]>Reviewed-by Pierre Morel <[email protected]>Reviewed-by David Hildenbrand <[email protected]>--- pc-bios/s390-ccw/dasd-ipl.c | 5 ++--- pc-bios/s390-ccw/s390-arch.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)pc-bios/s390-ccw/dasd-ipl.c +0
-0
pc-bios/s390-ccw/dasd-ipl.c static void run_ipl2(SubChannelId schid, uint16_t cutype, uint32_t addr) · line 209
Quoted 5 lines
pc-bios/s390-ccw/dasd-ipl.c +1
-1@@ -206,7 +206,7 @@ static void run_ipl2(SubChannelId schid, uint16_t cutype, uint32_t addr)*/ void dasd_ipl (SubChannelId schid,uint16_t cutype) { -PSWLegacy *pswl = (PSWLegacy *)0x00 ; +unsigned long *pswl =0x0 ;
... or we could use the "lowcore" pointer from s390-arch.h ... though that's PSWLegacy again...
pc-bios/s390-ccw/dasd-ipl.c void dasd_ipl(SubChannelId schid, uint16_t cutype) · line 232
Quoted 8 lines
pc-bios/s390-ccw/dasd-ipl.c +0
-1uint32_t ipl2_addr;/* Construct Read IPL CCW and run it to read IPL1 from boot disk */ @@ -229,7 +229,6 @@ void dasd_ipl(SubChannelId schid, uint16_t cutype)run_ipl2 (schid, cutype, ipl2_addr);/* Transfer control to the guest operating system */ - pswl->mask |=PSW_MASK_EAMODE ;/* Force z-mode */
Wait, PSW_MASK_EAMODE was 0x0000000100000000 and ->mask was only a 32-bit value ... how was that ever supposed to work correctly?
pc-bios/s390-ccw/dasd-ipl.c void dasd_ipl(SubChannelId schid, uint16_t cutype) · line 232
Quoted 2 lines
pc-bios/s390-ccw/dasd-ipl.c +1
-1- pswl->addr |=PSW_MASK_BAMODE ;/* ... */ + *pswl |=PSW_MASK_64 ;/* Force 64 bit addressing */
So is this even a bug fix and not only a cosmetic change?
... the whole logic here looks fishy to me ... do we need this PSW modification at all? Shouldn't the guest decide which mode it wants to use in its startup code?
Thomas
Quoted 16 lines
pc-bios/s390-ccw/dasd-ipl.c +0
-0jump_to_low_kernel (); }pc-bios/s390-ccw/s390-arch.h +1
-1@@ -29,7 +29,7 @@ _Static_assert(sizeof(struct PSWLegacy) == 8, "PSWLegacy size incorrect");#define PSW_MASK_WAIT 0x0002000000000000ULL#define PSW_MASK_EAMODE 0x0000000100000000ULL#define PSW_MASK_BAMODE 0x0000000080000000ULL -#define PSW_MASK_ZMODE (PSW_MASK_EAMODE | PSW_MASK_BAMODE) +#define PSW_MASK_64 (PSW_MASK_EAMODE | PSW_MASK_BAMODE)/* Low core mapping */ typedef struct LowCore {
Re: [PATCH v4 5/9] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant
Quoted 45 lines · Thomas Huth
Quoted 20 lines · Janosch Frank
ZMODE has a lot of ambiguity with the ESAME architecture mode, but is actually 64 bit addressing.
As
PSW_MASK_64is now effectively 33 bit long and the PSWLegacy struct has 2 32 bit members, let's also use a unsigned long pointer indasd-ipl.cinstead when oring the constant into a 8 byte PSW.Signed-off-by Janosch Frank <[email protected]>Reviewed-by Pierre Morel <[email protected]>Reviewed-by David Hildenbrand <[email protected]>--- pc-bios/s390-ccw/dasd-ipl.c | 5 ++--- pc-bios/s390-ccw/s390-arch.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)pc-bios/s390-ccw/dasd-ipl.c +0
-0pc-bios/s390-ccw/dasd-ipl.c static void run_ipl2(SubChannelId schid, uint16_t cutype, uint32_t addr) · line 209
Quoted 5 lines
pc-bios/s390-ccw/dasd-ipl.c +1
-1@@ -206,7 +206,7 @@ static void run_ipl2(SubChannelId schid, uint16_t cutype, uint32_t addr)*/ void dasd_ipl (SubChannelId schid,uint16_t cutype) { -PSWLegacy *pswl = (PSWLegacy *)0x00 ; +unsigned long *pswl =0x0 ;... or we could use the "lowcore" pointer from
s390-arch.h... though that's PSWLegacy again...pc-bios/s390-ccw/dasd-ipl.c void dasd_ipl(SubChannelId schid, uint16_t cutype) · line 232
Quoted 8 lines
pc-bios/s390-ccw/dasd-ipl.c +0
-1uint32_t ipl2_addr;/* Construct Read IPL CCW and run it to read IPL1 from boot disk */ @@ -229,7 +229,6 @@ void dasd_ipl(SubChannelId schid, uint16_t cutype)run_ipl2 (schid, cutype, ipl2_addr);/* Transfer control to the guest operating system */ - pswl->mask |=PSW_MASK_EAMODE ;/* Force z-mode */ Wait,
PSW_MASK_EAMODEwas0x0000000100000000and ->mask was only a 32-bit value ... how was that ever supposed to work correctly?pc-bios/s390-ccw/dasd-ipl.c void dasd_ipl(SubChannelId schid, uint16_t cutype) · line 232
Quoted 2 lines
pc-bios/s390-ccw/dasd-ipl.c +1
-1- pswl->addr |=PSW_MASK_BAMODE ;/* ... */ + *pswl |=PSW_MASK_64 ;/* Force 64 bit addressing */
Quoted 7 lines
So is this even a bug fix and not only a cosmetic change?
... the whole logic here looks fishy to me ... do we need this PSW modification at all? Shouldn't the guest decide which mode it wants to use in its startup code?
Thomas
Looking at jump_to_low_kernel(), jump_to_IPL_code and jump_to_IPL_2 I think we can remove this line completely.
jump_to_IPL_code() prepares its own PSW and jumps to jump_to_IPL_2() via diag308 subcode 1.
jump_to_IPL_2() fetches the saved PSW and does a br to the PSW address so the mask completely goes to waste anyway.
DASD passthrough is rarely used so nobody looks at that code anymore. I need to ask Jason about the intention behind those lines.
Quoted 19 lines
Quoted 18 lines
pc-bios/s390-ccw/dasd-ipl.c +0
-0jump_to_low_kernel (); }pc-bios/s390-ccw/s390-arch.h +1
-1@@ -29,7 +29,7 @@ _Static_assert(sizeof(struct PSWLegacy) == 8, "PSWLegacy size incorrect");#define PSW_MASK_WAIT 0x0002000000000000ULL#define PSW_MASK_EAMODE 0x0000000100000000ULL#define PSW_MASK_BAMODE 0x0000000080000000ULL -#define PSW_MASK_ZMODE (PSW_MASK_EAMODE | PSW_MASK_BAMODE) +#define PSW_MASK_64 (PSW_MASK_EAMODE | PSW_MASK_BAMODE)/* Low core mapping */ typedef struct LowCore {
PATCH v4 6/9 pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR
In reply to Janosch FrankLet's move some of the PSW mask defines into s390-arch.h and use them in jump2ipl.c. Also let's introduce a new constant for the address mask of 8 byte (short) PSWs.
--- pc-bios/s390-ccw/jump2ipl.c | 10 ++++------ pc-bios/s390-ccw/s390-arch.h | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-)
pc-bios/s390-ccw/jump2ipl.c +4 -6
@@ -8,12 +8,10 @@#include "libc.h" #include "s390-ccw.h" +#include "s390-arch.h" #define KERN_IMAGE_START 0x010000UL -#define PSW_MASK_64 0x0000000100000000ULL -#define PSW_MASK_32 0x0000000080000000ULL -#define PSW_MASK_SHORTPSW 0x0008000000000000ULL -#define RESET_PSW_MASK (PSW_MASK_SHORTPSW | PSW_MASK_32 | PSW_MASK_64) +#define RESET_PSW_MASK (PSW_MASK_SHORTPSW | PSW_MASK_64) typedef struct ResetInfo { uint64_t ipl_psw;
@@ -54,7 +52,7 @@ void jump_to_IPL_code(uint64_t address) current->ipl_psw = (uint64_t ) &jump_to_IPL_2; current->ipl_psw |=RESET_PSW_MASK ; - current->ipl_continue = address &0x7fffffff ; + current->ipl_continue = address &PSW_MASK_SHORT_ADDR ;debug_print_int ("set IPL addr to" , current->ipl_continue);
@@ -86,7 +84,7 @@ void jump_to_low_kernel(void)/* Trying to get PSW at zero address */ if (*((uint64_t *)0 ) &RESET_PSW_MASK ) { -jump_to_IPL_code ((*((uint64_t *)0 )) &0x7fffffff ); +jump_to_IPL_code ((*((uint64_t *)0 )) &PSW_MASK_SHORT_ADDR ); }/* No other option left, so use the Linux kernel start address */
pc-bios/s390-ccw/s390-arch.h +2 -0
@@ -26,9 +26,11 @@ _Static_assert(sizeof(struct PSWLegacy) == 8, "PSWLegacy size incorrect");/* s390 psw bit masks */ #define PSW_MASK_IOINT 0x0200000000000000ULL +#define PSW_MASK_SHORTPSW 0x0008000000000000ULL#define PSW_MASK_WAIT 0x0002000000000000ULL#define PSW_MASK_EAMODE 0x0000000100000000ULL#define PSW_MASK_BAMODE 0x0000000080000000ULL +#define PSW_MASK_SHORT_ADDR 0x000000007fffffffULL#define PSW_MASK_64 (PSW_MASK_EAMODE | PSW_MASK_BAMODE)/* Low core mapping */
Signature · 1 line
2.25.1
PATCH v4 7/9 pc-bios: s390x: Move panic() into header and add infinite loop
In reply to Janosch Frankpanic() was defined for the ccw and net bios, i.e. twice, so it's cleaner to rather put it into the header.
Also let's add an infinite loop into the assembly of disabled_wait() so the caller doesn't need to take care of it.
--- pc-bios/s390-ccw/main.c | 7 ------- pc-bios/s390-ccw/netmain.c | 8 -------- pc-bios/s390-ccw/s390-ccw.h | 9 +++++++-- pc-bios/s390-ccw/start.S | 5 +++-- 4 files changed, 10 insertions(+), 19 deletions(-)
pc-bios/s390-ccw/main.c +0 -7
@@ -46,13 +46,6 @@ void write_iplb_location(void) lowcore->ptr_iplb =ptr2u32 (&iplb); } -void panic (const char *string) -{ -sclp_print (string); -disabled_wait (); -while (1 ) { } -} -unsigned int get_loadparm_index (void ) {return atoui (loadparm_str);
pc-bios/s390-ccw/netmain.c +0 -8
@@ -439,14 +439,6 @@ static int net_try_direct_tftp_load(filename_ip_t *fn_ip)return rc; } -void panic (const char *string) -{ -sclp_print (string); -for (;;) { -disabled_wait (); - } -} -void write_subsystem_identification (void ) {SubChannelId *schid = (SubChannelId *)184 ;
pc-bios/s390-ccw/s390-ccw.h +7 -2
@@ -50,12 +50,11 @@ typedef unsigned long long __u64;#include "iplb.h" /* start.s */ -void disabled_wait (void ); +void disabled_wait (void ) __attribute__ ((__noreturn__));void consume_sclp_int (void );void consume_io_int (void );/* main.c */ -void panic (const char *string);void write_subsystem_identification (void );void write_iplb_location (void ); extern char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));
@@ -91,6 +90,12 @@ bool menu_is_enabled_enum(void);#define MAX_BOOT_ENTRIES 31 +static inline void panic (const char *string) +{ +sclp_print (string); +disabled_wait (); +} +static inline void fill_hex (char *out,unsigned char val) {const char hex[] ="0123456789abcdef" ;
pc-bios/s390-ccw/start.S +3 -2
@@ -47,8 +47,9 @@ memsetxc: */ .globl disabled_wait disabled_wait: - larl %r1,disabled_wait_psw - lpswe 0(%r1) + larl %r1,disabled_wait_psw + lpswe 0(%r1) +1: j 1b /*
Signature · 1 line
2.25.1
Re: [PATCH v4 7/9] pc-bios: s390x: Move panic() into header and add infinite loop
Quoted 16 lines · Janosch Frank
panic()was defined for the ccw and net bios, i.e. twice, so it's cleaner to rather put it into the header.Also let's add an infinite loop into the assembly of
disabled_wait()so the caller doesn't need to take care of it.Signed-off-by Janosch Frank <[email protected]>Reviewed-by Pierre Morel <[email protected]>Reviewed-by David Hildenbrand <[email protected]>Reviewed-by Thomas Huth <[email protected]>--- pc-bios/s390-ccw/main.c | 7 ------- pc-bios/s390-ccw/netmain.c | 8 -------- pc-bios/s390-ccw/s390-ccw.h | 9 +++++++-- pc-bios/s390-ccw/start.S | 5 +++-- 4 files changed, 10 insertions(+), 19 deletions(-)
[...]
pc-bios/s390-ccw/start.S memsetxc: · line 52
Quoted 13 lines
pc-bios/s390-ccw/start.S +3
-2@@ -47,8 +47,9 @@ memsetxc: */ .globl disabled_wait disabled_wait: - larl %r1,disabled_wait_psw - lpswe 0(%r1) + larl %r1,disabled_wait_psw + lpswe 0(%r1) +1: j 1b
Could you please fix the white spaces here while you're at it (TABs vs. spaces).
Thanks,
Thomas
PATCH v4 8/9 pc-bios: s390x: Use ebcdic2ascii table
In reply to Janosch FrankWhy should we do conversion of a ebcdic value if we have a handy table where we could look up the ascii value instead?
--- pc-bios/s390-ccw/bootmap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
pc-bios/s390-ccw/bootmap.c +1 -3
@@ -328,9 +328,7 @@ static void print_eckd_ldl_msg(ECKD_IPL_mode_t mode) msg[0 ] ='2' ;break ;default : - msg[0 ] = vlbl->LDL_version; - msg[0 ] &=0x0f ;/* convert EBCDIC */ - msg[0 ] |=0x30 ;/* to ASCII (digit) */ + msg[0 ] = ebc2asc[vlbl->LDL_version]; msg[1 ] ='?' ;break ; }
Signature · 1 line
2.25.1
PATCH v4 9/9 pc-bios: s390x: Make u32 ptr check explicit
In reply to Janosch FrankLet's make it a bit more clear that we check the full 64 bits to fit into the 32 we return.
--- pc-bios/s390-ccw/helper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
pc-bios/s390-ccw/helper.h +1 -1
@@ -19,7 +19,7 @@/* Avoids compiler warnings when casting a pointer to a u32 */ static inline uint32_t ptr2u32 (void *ptr) { -IPL_assert ((uint64_t )ptr <=0xffffffff ,"ptr2u32: ptr too large" ); +IPL_assert ((uint64_t )ptr <=0xffffffffull ,"ptr2u32: ptr too large" );return (uint32_t )(uint64_t )ptr; }
Signature · 1 line
2.25.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH v4 0/9] pc-bios: s390x: Cleanup part 1
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Switched to a new branch 'test'
1e3716e pc-bios: s390x: Make u32 ptr check explicit
e1bae54 pc-bios: s390x: Use ebcdic2ascii table
7452b5e pc-bios: s390x: Move panic() into header and add infinite loop 6cdcbc6 pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR 6c39b23 pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant
91817a3 pc-bios: s390x: Get rid of magic offsets into the lowcore a6afbef pc-bios: s390x: Move sleep and yield to helper.h
aa61b56 pc-bios: s390x: Consolidate timing functions into time.h
103f588 pc-bios: s390x: cio.c cleanup and compile fix
=== OUTPUT BEGIN ===
1/9 Checking commit 103f588d1ee8 (pc-bios: s390x: cio.c cleanup and compile fix) 2/9 Checking commit aa61b56a0eea (pc-bios: s390x: Consolidate timing functions into time.h)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #93:
new file mode 100644
total: 0 errors, 1 warnings, 142 lines checked
Patch 2/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
3/9 Checking commit a6afbefa38ab (pc-bios: s390x: Move sleep and yield to helper.h) 4/9 Checking commit 91817a34ed26 (pc-bios: s390x: Get rid of magic offsets into the lowcore)
ERROR: spaces required around that ':' (ctx:VxV)
#30: FILE: pc-bios/s390-ccw/cio.h:127:
+ __u16 cssid:8;
^ERROR: spaces required around that ':' (ctx:VxV)
#31: FILE: pc-bios/s390-ccw/cio.h:128:
+ __u16 reserved:4;
^ERROR: spaces required around that ':' (ctx:VxV)
#32: FILE: pc-bios/s390-ccw/cio.h:129:
+ __u16 m:1;
^ERROR: spaces required around that ':' (ctx:VxV)
#33: FILE: pc-bios/s390-ccw/cio.h:130:
+ __u16 ssid:2;
^ERROR: spaces required around that ':' (ctx:VxV)
#34: FILE: pc-bios/s390-ccw/cio.h:131:
+ __u16 one:1;
^total: 5 errors, 0 warnings, 37 lines checked
Patch 4/9 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
5/9 Checking commit 6c39b233de50 (pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant)
6/9 Checking commit 6cdcbc6075b0 (pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR) 7/9 Checking commit 7452b5e64c9a (pc-bios: s390x: Move panic() into header and add infinite loop) 8/9 Checking commit e1bae544390e (pc-bios: s390x: Use ebcdic2ascii table)
9/9 Checking commit 1e3716e19075 (pc-bios: s390x: Make u32 ptr check explicit)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]