[S390] cio: Introduce subchannel->private.
Introduce a private pointer in struct subchannel to store per-subchannel type data (cannot use dev->priv since this is already used for something else). Create a new header io_sch.h for I/O subchannel specific structures and instructions. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
committed by
Martin Schwidefsky
parent
bc698bcf88
commit
cd6b4f27b9
@@ -11,32 +11,32 @@
|
||||
* path management control word
|
||||
*/
|
||||
struct pmcw {
|
||||
__u32 intparm; /* interruption parameter */
|
||||
__u32 qf : 1; /* qdio facility */
|
||||
__u32 res0 : 1; /* reserved zeros */
|
||||
__u32 isc : 3; /* interruption sublass */
|
||||
__u32 res5 : 3; /* reserved zeros */
|
||||
__u32 ena : 1; /* enabled */
|
||||
__u32 lm : 2; /* limit mode */
|
||||
__u32 mme : 2; /* measurement-mode enable */
|
||||
__u32 mp : 1; /* multipath mode */
|
||||
__u32 tf : 1; /* timing facility */
|
||||
__u32 dnv : 1; /* device number valid */
|
||||
__u32 dev : 16; /* device number */
|
||||
__u8 lpm; /* logical path mask */
|
||||
__u8 pnom; /* path not operational mask */
|
||||
__u8 lpum; /* last path used mask */
|
||||
__u8 pim; /* path installed mask */
|
||||
__u16 mbi; /* measurement-block index */
|
||||
__u8 pom; /* path operational mask */
|
||||
__u8 pam; /* path available mask */
|
||||
__u8 chpid[8]; /* CHPID 0-7 (if available) */
|
||||
__u32 unused1 : 8; /* reserved zeros */
|
||||
__u32 st : 3; /* subchannel type */
|
||||
__u32 unused2 : 18; /* reserved zeros */
|
||||
__u32 mbfc : 1; /* measurement block format control */
|
||||
__u32 xmwme : 1; /* extended measurement word mode enable */
|
||||
__u32 csense : 1; /* concurrent sense; can be enabled ...*/
|
||||
u32 intparm; /* interruption parameter */
|
||||
u32 qf : 1; /* qdio facility */
|
||||
u32 res0 : 1; /* reserved zeros */
|
||||
u32 isc : 3; /* interruption sublass */
|
||||
u32 res5 : 3; /* reserved zeros */
|
||||
u32 ena : 1; /* enabled */
|
||||
u32 lm : 2; /* limit mode */
|
||||
u32 mme : 2; /* measurement-mode enable */
|
||||
u32 mp : 1; /* multipath mode */
|
||||
u32 tf : 1; /* timing facility */
|
||||
u32 dnv : 1; /* device number valid */
|
||||
u32 dev : 16; /* device number */
|
||||
u8 lpm; /* logical path mask */
|
||||
u8 pnom; /* path not operational mask */
|
||||
u8 lpum; /* last path used mask */
|
||||
u8 pim; /* path installed mask */
|
||||
u16 mbi; /* measurement-block index */
|
||||
u8 pom; /* path operational mask */
|
||||
u8 pam; /* path available mask */
|
||||
u8 chpid[8]; /* CHPID 0-7 (if available) */
|
||||
u32 unused1 : 8; /* reserved zeros */
|
||||
u32 st : 3; /* subchannel type */
|
||||
u32 unused2 : 18; /* reserved zeros */
|
||||
u32 mbfc : 1; /* measurement block format control */
|
||||
u32 xmwme : 1; /* extended measurement word mode enable */
|
||||
u32 csense : 1; /* concurrent sense; can be enabled ...*/
|
||||
/* ... per MSCH, however, if facility */
|
||||
/* ... is not installed, this results */
|
||||
/* ... in an operand exception. */
|
||||
@@ -52,31 +52,6 @@ struct schib {
|
||||
__u8 mda[4]; /* model dependent area */
|
||||
} __attribute__ ((packed,aligned(4)));
|
||||
|
||||
/*
|
||||
* operation request block
|
||||
*/
|
||||
struct orb {
|
||||
__u32 intparm; /* interruption parameter */
|
||||
__u32 key : 4; /* flags, like key, suspend control, etc. */
|
||||
__u32 spnd : 1; /* suspend control */
|
||||
__u32 res1 : 1; /* reserved */
|
||||
__u32 mod : 1; /* modification control */
|
||||
__u32 sync : 1; /* synchronize control */
|
||||
__u32 fmt : 1; /* format control */
|
||||
__u32 pfch : 1; /* prefetch control */
|
||||
__u32 isic : 1; /* initial-status-interruption control */
|
||||
__u32 alcc : 1; /* address-limit-checking control */
|
||||
__u32 ssic : 1; /* suppress-suspended-interr. control */
|
||||
__u32 res2 : 1; /* reserved */
|
||||
__u32 c64 : 1; /* IDAW/QDIO 64 bit control */
|
||||
__u32 i2k : 1; /* IDAW 2/4kB block size control */
|
||||
__u32 lpm : 8; /* logical path mask */
|
||||
__u32 ils : 1; /* incorrect length */
|
||||
__u32 zero : 6; /* reserved zeros */
|
||||
__u32 orbx : 1; /* ORB extension control */
|
||||
__u32 cpa; /* channel program address */
|
||||
} __attribute__ ((packed,aligned(4)));
|
||||
|
||||
/* subchannel data structure used by I/O subroutines */
|
||||
struct subchannel {
|
||||
struct subchannel_id schid;
|
||||
@@ -99,11 +74,10 @@ struct subchannel {
|
||||
__u8 lpm; /* logical path mask */
|
||||
__u8 opm; /* operational path mask */
|
||||
struct schib schib; /* subchannel information block */
|
||||
struct orb orb; /* operation request block */
|
||||
struct ccw1 sense_ccw; /* static ccw for sense command */
|
||||
struct chsc_ssd_info ssd_info; /* subchannel description */
|
||||
struct device dev; /* entry in device tree */
|
||||
struct css_driver *driver;
|
||||
void *private; /* private per subchannel type data */
|
||||
} __attribute__ ((aligned(8)));
|
||||
|
||||
#define IO_INTERRUPT_TYPE 0 /* I/O interrupt type */
|
||||
@@ -133,10 +107,12 @@ extern void cio_release_console(void);
|
||||
extern int cio_is_console(struct subchannel_id);
|
||||
extern struct subchannel *cio_get_console_subchannel(void);
|
||||
extern spinlock_t * cio_get_console_lock(void);
|
||||
extern void *cio_get_console_priv(void);
|
||||
#else
|
||||
#define cio_is_console(schid) 0
|
||||
#define cio_get_console_subchannel() NULL
|
||||
#define cio_get_console_lock() NULL;
|
||||
#define cio_get_console_lock() NULL
|
||||
#define cio_get_console_priv() NULL
|
||||
#endif
|
||||
|
||||
extern int cio_show_msg;
|
||||
|
||||
Reference in New Issue
Block a user