Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / s390 / cio / chsc.h

diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h
index be20da4..a259245 100644 (file)
--- a/drivers/s390/cio/chsc.h
+++ b/drivers/s390/cio/chsc.h
@@ -1,17 +1,27 @@
 #ifndef S390_CHSC_H
 #define S390_CHSC_H
 
-#define NR_CHPIDS 256
-
 #define CHSC_SEI_ACC_CHPID        1
 #define CHSC_SEI_ACC_LINKADDR     2
 #define CHSC_SEI_ACC_FULLLINKADDR 3
 
+#define CHSC_SDA_OC_MSS   0x2
+
 struct chsc_header {
        u16 length;
        u16 code;
 };
 
+#define NR_MEASUREMENT_CHARS 5
+struct cmg_chars {
+       u32 values[NR_MEASUREMENT_CHARS];
+};
+
+#define NR_MEASUREMENT_ENTRIES 8
+struct cmg_entry {
+       u32 values[NR_MEASUREMENT_ENTRIES];
+};
+
 struct channel_path_desc {
        u8 flags;
        u8 lsn;
@@ -27,6 +37,10 @@ struct channel_path {
        int id;
        int state;
        struct channel_path_desc desc;
+       /* Channel-measurement related stuff: */
+       int cmg;
+       int shared;
+       void *cmg_chars;
        struct device dev;
 };
 
@@ -43,14 +57,20 @@ struct css_general_char {
        u32 ext_mb : 1;  /* bit 48 */
        u32 : 7;
        u32 aif_tdd : 1; /* bit 56 */
-       u32 : 10;
+       u32 : 1;
+       u32 qebsm : 1;   /* bit 58 */
+       u32 : 8;
        u32 aif_osa : 1; /* bit 67 */
        u32 : 28;
 }__attribute__((packed));
 
 struct css_chsc_char {
        u64 res;
-       u64 : 43;
+       u64 : 20;
+       u32 secm : 1; /* bit 84 */
+       u32 : 1;
+       u32 scmc : 1; /* bit 86 */
+       u32 : 20;
        u32 scssc : 1;  /* bit 107 */
        u32 scsscf : 1; /* bit 108 */
        u32 : 19;
@@ -63,4 +83,11 @@ extern int chsc_determine_css_characteristics(void);
 extern int css_characteristics_avail;
 
 extern void *chsc_get_chp_desc(struct subchannel*, int);
+
+extern int chsc_enable_facility(int);
+struct channel_subsystem;
+extern int chsc_secm(struct channel_subsystem *, int);
+
+#define to_channelpath(device) container_of(device, struct channel_path, dev)
+
 #endif