Skip to content

Commit

Permalink
s390/cio: move struct node_descriptor to cio.h
Browse files Browse the repository at this point in the history
This allows device drivers (eg. qeth) to use the struct when processing
information retrieved via RCD.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Acked-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
  • Loading branch information
Julian Wiedmann authored and Vasily Gorbik committed Jun 19, 2019
1 parent 4f18d86 commit 96e5aaf
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
30 changes: 30 additions & 0 deletions arch/s390/include/asm/cio.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,36 @@ struct ciw {
#define CIW_TYPE_SII 0x1 /* set interface identifier */
#define CIW_TYPE_RNI 0x2 /* read node identifier */

/*
* Node Descriptor as defined in SA22-7204, "Common I/O-Device Commands"
*/

#define ND_VALIDITY_VALID 0
#define ND_VALIDITY_OUTDATED 1
#define ND_VALIDITY_INVALID 2

struct node_descriptor {
/* Flags. */
union {
struct {
u32 validity:3;
u32 reserved:5;
} __packed;
u8 byte0;
} __packed;

/* Node parameters. */
u32 params:24;

/* Node ID. */
char type[6];
char model[3];
char manufacturer[3];
char plant[2];
char seq[12];
u16 tag;
} __packed;

/*
* Flags used as input parameters for do_IO()
*/
Expand Down
30 changes: 0 additions & 30 deletions drivers/s390/cio/chsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -322,36 +322,6 @@ struct chsc_sei {
} u;
} __packed __aligned(PAGE_SIZE);

/*
* Node Descriptor as defined in SA22-7204, "Common I/O-Device Commands"
*/

#define ND_VALIDITY_VALID 0
#define ND_VALIDITY_OUTDATED 1
#define ND_VALIDITY_INVALID 2

struct node_descriptor {
/* Flags. */
union {
struct {
u32 validity:3;
u32 reserved:5;
} __packed;
u8 byte0;
} __packed;

/* Node parameters. */
u32 params:24;

/* Node ID. */
char type[6];
char model[3];
char manufacturer[3];
char plant[2];
char seq[12];
u16 tag;
} __packed;

/*
* Link Incident Record as defined in SA22-7202, "ESCON I/O Interface"
*/
Expand Down

0 comments on commit 96e5aaf

Please sign in to comment.