1 files changed, 30 insertions, 91 deletions

diff --git a/drivers/s390/cio/io_sch.h b/drivers/s390/cio/io_sch.h
index 469ef93f2302..ba31ad88f4f7 100644
--- a/drivers/s390/cio/io_sch.h
+++ b/drivers/s390/cio/io_sch.h
@@ -5,68 +5,36 @@
 #include <asm/schid.h>
 #include <asm/ccwdev.h>
 #include "css.h"
-
-/*
- * command-mode operation request block
- */
-struct cmd_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)));
-
-/*
- * transport-mode operation request block
- */
-struct tm_orb {
-        u32 intparm;
-        u32 key:4;
-        u32 :9;
-        u32 b:1;
-        u32 :2;
-        u32 lpm:8;
-        u32 :7;
-        u32 x:1;
-        u32 tcw;
-        u32 prio:8;
-        u32 :8;
-        u32 rsvpgm:8;
-        u32 :8;
-        u32 :32;
-        u32 :32;
-        u32 :32;
-        u32 :32;
-}  __attribute__ ((packed, aligned(4)));
-
-union orb {
-        struct cmd_orb cmd;
-        struct tm_orb tm;
-}  __attribute__ ((packed, aligned(4)));
+#include "orb.h"
 
 struct io_subchannel_private {
         union orb orb;          /* operation request block */
         struct ccw1 sense_ccw;  /* static ccw for sense command */
-} __attribute__ ((aligned(8)));
+        struct ccw_device *cdev;/* pointer to the child ccw device */
+        struct {
+                unsigned int suspend:1; /* allow suspend */
+                unsigned int prefetch:1;/* deny prefetch */
+                unsigned int inter:1;   /* suppress intermediate interrupts */
+        } __packed options;
+} __aligned(8);
 
-#define to_io_private(n) ((struct io_subchannel_private *)n->private)
-#define sch_get_cdev(n) (dev_get_drvdata(&n->dev))
-#define sch_set_cdev(n, c) (dev_set_drvdata(&n->dev, c))
+#define to_io_private(n) ((struct io_subchannel_private *) \
+                          dev_get_drvdata(&(n)->dev))
+#define set_io_private(n, p) (dev_set_drvdata(&(n)->dev, p))
+
+static inline struct ccw_device *sch_get_cdev(struct subchannel *sch)
+{
+        struct io_subchannel_private *priv = to_io_private(sch);
+        return priv ? priv->cdev : NULL;
+}
+
+static inline void sch_set_cdev(struct subchannel *sch,
+                                struct ccw_device *cdev)
+{
+        struct io_subchannel_private *priv = to_io_private(sch);
+        if (priv)
+                priv->cdev = cdev;
+}
 
 #define MAX_CIWS 8
 
@@ -151,8 +119,11 @@ struct ccw_device_private {
         struct subchannel_id schid;     /* subchannel number */
         struct ccw_request req;         /* internal I/O request */
         int iretry;
-        u8 pgid_valid_mask;             /* mask of valid PGIDs */
-        u8 pgid_todo_mask;              /* mask of PGIDs to be adjusted */
+        u8 pgid_valid_mask;     /* mask of valid PGIDs */
+        u8 pgid_todo_mask;      /* mask of PGIDs to be adjusted */
+        u8 pgid_reset_mask;     /* mask of PGIDs which were reset */
+        u8 path_gone_mask;      /* mask of paths, that became unavailable */
+        u8 path_new_mask;       /* mask of paths, that became available */
         struct {
                 unsigned int fast:1;    /* post with "channel end" */
                 unsigned int repall:1;  /* report every interrupt status */
@@ -188,23 +159,6 @@ struct ccw_device_private {
         void *cmb_wait;                 /* deferred cmb enable/disable */
 };
 
-static inline int ssch(struct subchannel_id schid, union orb *addr)
-{
-        register struct subchannel_id reg1 asm("1") = schid;
-        int ccode = -EIO;
-
-        asm volatile(
-                "       ssch    0(%2)\n"
-                "0:     ipm     %0\n"
-                "       srl     %0,28\n"
-                "1:\n"
-                EX_TABLE(0b, 1b)
-                : "+d" (ccode)
-                : "d" (reg1), "a" (addr), "m" (*addr)
-                : "cc", "memory");
-        return ccode;
-}
-
 static inline int rsch(struct subchannel_id schid)
 {
         register struct subchannel_id reg1 asm("1") = schid;
@@ -220,21 +174,6 @@ static inline int rsch(struct subchannel_id schid)
         return ccode;
 }
 
-static inline int csch(struct subchannel_id schid)
-{
-        register struct subchannel_id reg1 asm("1") = schid;
-        int ccode;
-
-        asm volatile(
-                "       csch\n"
-                "       ipm     %0\n"
-                "       srl     %0,28"
-                : "=d" (ccode)
-                : "d" (reg1)
-                : "cc");
-        return ccode;
-}
-
 static inline int hsch(struct subchannel_id schid)
 {
         register struct subchannel_id reg1 asm("1") = schid;