motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

s390-bios: Clean up cio.h

Browse source 
Add proper typedefs to all structs and modify all bit fields to use consistent
formatting.

Signed-off-by: Jason J. Herne <jjherne@linux.ibm.com>
Reviewed-by: Collin Walling <walling@linux.ibm.com>
Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1554388475-18329-5-git-send-email-jjherne@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Jason J. Herne 2019-04-04 10:34:23 -04:00 • committed by Thomas Huth
parent a5f6e0975b
commit d96c5db77f
2 changed files with 56 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

86
pc-bios/s390-ccw/cio.h
View file

@ -18,17 +18,17 @@
*/ */
struct pmcw { struct pmcw {
__u32 intparm; /* interruption parameter */ __u32 intparm; /* interruption parameter */
__u32 qf : 1; /* qdio facility */ __u32 qf:1; /* qdio facility */
__u32 w : 1; __u32 w:1;
__u32 isc : 3; /* interruption sublass */ __u32 isc:3; /* interruption sublass */
__u32 res5 : 3; /* reserved zeros */ __u32 res5:3; /* reserved zeros */
__u32 ena : 1; /* enabled */ __u32 ena:1; /* enabled */
__u32 lm : 2; /* limit mode */ __u32 lm:2; /* limit mode */
__u32 mme : 2; /* measurement-mode enable */ __u32 mme:2; /* measurement-mode enable */
__u32 mp : 1; /* multipath mode */ __u32 mp:1; /* multipath mode */
__u32 tf : 1; /* timing facility */ __u32 tf:1; /* timing facility */
__u32 dnv : 1; /* device number valid */ __u32 dnv:1; /* device number valid */
__u32 dev : 16; /* device number */ __u32 dev:16; /* device number */
__u8 lpm; /* logical path mask */ __u8 lpm; /* logical path mask */
__u8 pnom; /* path not operational mask */ __u8 pnom; /* path not operational mask */
__u8 lpum; /* last path used mask */ __u8 lpum; /* last path used mask */
@ -37,12 +37,12 @@ struct pmcw {
__u8 pom; /* path operational mask */ __u8 pom; /* path operational mask */
__u8 pam; /* path available mask */ __u8 pam; /* path available mask */
__u8 chpid[8]; /* CHPID 0-7 (if available) */ __u8 chpid[8]; /* CHPID 0-7 (if available) */
__u32 unused1 : 8; /* reserved zeros */ __u32 unused1:8; /* reserved zeros */
__u32 st : 3; /* subchannel type */ __u32 st:3; /* subchannel type */
__u32 unused2 : 18; /* reserved zeros */ __u32 unused2:18; /* reserved zeros */
__u32 mbfc : 1; /* measurement block format control */ __u32 mbfc:1; /* measurement block format control */
__u32 xmwme : 1; /* extended measurement word mode enable */ __u32 xmwme:1; /* extended measurement word mode enable */
__u32 csense : 1; /* concurrent sense; can be enabled ...*/ __u32 csense:1; /* concurrent sense; can be enabled ...*/
/* ... per MSCH, however, if facility */ /* ... per MSCH, however, if facility */
/* ... is not installed, this results */ /* ... is not installed, this results */
/* ... in an operand exception. */ /* ... in an operand exception. */
@ -77,28 +77,28 @@ struct scsw {
/* /*
* subchannel information block * subchannel information block
*/ */
struct schib { typedef struct schib {
struct pmcw pmcw; /* path management control word */ struct pmcw pmcw; /* path management control word */
struct scsw scsw; /* subchannel status word */ struct scsw scsw; /* subchannel status word */
__u64 mba; /* measurement block address */ __u64 mba; /* measurement block address */
__u8 mda[4]; /* model dependent area */ __u8 mda[4]; /* model dependent area */
} __attribute__ ((packed,aligned(4))); } __attribute__ ((packed, aligned(4))) Schib;
struct subchannel_id { typedef struct subchannel_id {
__u32 cssid : 8; __u32 cssid:8;
__u32 : 4; __u32:4;
__u32 m : 1; __u32 m:1;
__u32 ssid : 2; __u32 ssid:2;
__u32 one : 1; __u32 one:1;
__u32 sch_no : 16; __u32 sch_no:16;
} __attribute__ ((packed, aligned(4))); } __attribute__ ((packed, aligned(4))) SubChannelId;
struct chsc_header { struct chsc_header {
__u16 length; __u16 length;
__u16 code; __u16 code;
} __attribute__((packed)); } __attribute__((packed));
struct chsc_area_sda { typedef struct chsc_area_sda {
struct chsc_header request; struct chsc_header request;
__u8 reserved1:4; __u8 reserved1:4;
__u8 format:4; __u8 format:4;
@ -111,7 +111,7 @@ struct chsc_area_sda {
__u32 reserved5:4; __u32 reserved5:4;
__u32 format2:4; __u32 format2:4;
__u32 reserved6:24; __u32 reserved6:24;
} __attribute__((packed)); } __attribute__((packed)) ChscAreaSda;
/* /*
* TPI info structure * TPI info structure
@ -119,21 +119,21 @@ struct chsc_area_sda {
struct tpi_info { struct tpi_info {
struct subchannel_id schid; struct subchannel_id schid;
__u32 intparm; /* interruption parameter */ __u32 intparm; /* interruption parameter */
__u32 adapter_IO : 1; __u32 adapter_IO:1;
__u32 reserved2 : 1; __u32 reserved2:1;
__u32 isc : 3; __u32 isc:3;
__u32 reserved3 : 12; __u32 reserved3:12;
__u32 int_type : 3; __u32 int_type:3;
__u32 reserved4 : 12; __u32 reserved4:12;
} __attribute__ ((packed, aligned(4))); } __attribute__ ((packed, aligned(4)));
/* channel command word (type 1) */ /* channel command word (type 1) */
struct ccw1 { typedef struct ccw1 {
__u8 cmd_code; __u8 cmd_code;
__u8 flags; __u8 flags;
__u16 count; __u16 count;
__u32 cda; __u32 cda;
} __attribute__ ((packed, aligned(8))); } __attribute__ ((packed, aligned(8))) Ccw1;
#define CCW_FLAG_DC 0x80 #define CCW_FLAG_DC 0x80
#define CCW_FLAG_CC 0x40 #define CCW_FLAG_CC 0x40
@ -162,7 +162,7 @@ struct ccw1 {
/* /*
* Command-mode operation request block * Command-mode operation request block
*/ */
struct cmd_orb { typedef struct cmd_orb {
__u32 intparm; /* interruption parameter */ __u32 intparm; /* interruption parameter */
__u32 key:4; /* flags, like key, suspend control, etc. */ __u32 key:4; /* flags, like key, suspend control, etc. */
__u32 spnd:1; /* suspend control */ __u32 spnd:1; /* suspend control */
@ -182,7 +182,7 @@ struct cmd_orb {
__u32 zero:6; /* reserved zeros */ __u32 zero:6; /* reserved zeros */
__u32 orbx:1; /* ORB extension control */ __u32 orbx:1; /* ORB extension control */
__u32 cpa; /* channel program address */ __u32 cpa; /* channel program address */
} __attribute__ ((packed, aligned(4))); } __attribute__ ((packed, aligned(4))) CmdOrb;
struct ciw { struct ciw {
__u8 type; __u8 type;
@ -193,7 +193,7 @@ struct ciw {
/* /*
* sense-id response buffer layout * sense-id response buffer layout
*/ */
struct senseid { typedef struct senseid {
/* common part */ /* common part */
__u8 reserved; /* always 0x'FF' */ __u8 reserved; /* always 0x'FF' */
__u16 cu_type; /* control unit type */ __u16 cu_type; /* control unit type */
@ -203,15 +203,15 @@ struct senseid {
__u8 unused; /* padding byte */ __u8 unused; /* padding byte */
/* extended part */ /* extended part */
struct ciw ciw[62]; struct ciw ciw[62];
} __attribute__ ((packed, aligned(4))); } __attribute__ ((packed, aligned(4))) SenseId;
/* interruption response block */ /* interruption response block */
struct irb { typedef struct irb {
struct scsw scsw; struct scsw scsw;
__u32 esw[5]; __u32 esw[5];
__u32 ecw[8]; __u32 ecw[8];
__u32 emw[8]; __u32 emw[8];
} __attribute__ ((packed, aligned(4))); } __attribute__ ((packed, aligned(4))) Irb;
/* /*
* Some S390 specific IO instructions as inline * Some S390 specific IO instructions as inline

8
pc-bios/s390-ccw/s390-ccw.h
View file

@ -49,14 +49,6 @@ typedef unsigned long long __u64;
#include "cio.h" #include "cio.h"
#include "iplb.h" #include "iplb.h"
typedef struct irb Irb;
typedef struct ccw1 Ccw1;
typedef struct cmd_orb CmdOrb;
typedef struct schib Schib;
typedef struct chsc_area_sda ChscAreaSda;
typedef struct senseid SenseId;
typedef struct subchannel_id SubChannelId;
/* start.s */ /* start.s */
void disabled_wait(void); void disabled_wait(void);
void consume_sclp_int(void); void consume_sclp_int(void);