Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / s390 / block / dasd_eckd.h

diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index 12097c24f2f50c2826f8913e43f1a8cb7c0cda15..4a688a873a77bac88b6e2bbd26619653d1796d7b 100644 (file)
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -37,14 +37,17 @@
 #define DASD_ECKD_CCW_WRITE_KD_MT       0x8d
 #define DASD_ECKD_CCW_READ_KD_MT        0x8e
 #define DASD_ECKD_CCW_RELEASE           0x94
+#define DASD_ECKD_CCW_WRITE_FULL_TRACK  0x95
 #define DASD_ECKD_CCW_READ_CKD_MT       0x9e
 #define DASD_ECKD_CCW_WRITE_CKD_MT      0x9d
 #define DASD_ECKD_CCW_WRITE_TRACK_DATA  0xA5
 #define DASD_ECKD_CCW_READ_TRACK_DATA   0xA6
 #define DASD_ECKD_CCW_RESERVE           0xB4
+#define DASD_ECKD_CCW_READ_TRACK        0xDE
 #define DASD_ECKD_CCW_PFX               0xE7
 #define DASD_ECKD_CCW_PFX_READ          0xEA
 #define DASD_ECKD_CCW_RSCK              0xF9
+#define DASD_ECKD_CCW_RCD               0xFA
 
 /*
  * Perform Subsystem Function / Sub-Orders
@@ -57,6 +60,11 @@
  */
 #define LV_COMPAT_CYL 0xFFFE
 
+
+#define FCX_MAX_DATA_FACTOR 65536
+#define DASD_ECKD_RCD_DATA_SIZE 256
+
+
 /*****************************************************************************
  * SECTION: Type Definitions
  ****************************************************************************/
@@ -331,12 +339,6 @@ struct dasd_gneq {
        __u8 reserved2[22];
 } __attribute__ ((packed));
 
-struct dasd_eckd_path {
-       __u8 opm;
-       __u8 ppm;
-       __u8 npm;
-};
-
 struct dasd_rssd_features {
        char feature[256];
 } __attribute__((packed));
@@ -442,7 +444,6 @@ struct dasd_eckd_private {
        struct vd_sneq *vdsneq;
        struct dasd_gneq *gneq;
 
-       struct dasd_eckd_path path_data;
        struct eckd_count count_area[5];
        int init_cqr_status;
        int uses_cdl;
@@ -455,6 +456,8 @@ struct dasd_eckd_private {
        struct alias_pav_group *pavgroup;
        struct alias_lcu *lcu;
        int count;
+
+       u32 fcx_max_data;
 };