[S390] cio: Introduce struct chp_id.

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

diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h
index 44e4b4bb1c5abf86c7f069fc2759209f4c556ea8..2949c85b6d9205ae84a8b16723966d462c3e9e2c 100644 (file)
--- a/drivers/s390/cio/chsc.h
+++ b/drivers/s390/cio/chsc.h
@@ -1,6 +1,10 @@
 #ifndef S390_CHSC_H
 #define S390_CHSC_H
 
+#include <linux/types.h>
+#include <linux/device.h>
+#include "chpid.h"
+
 #define CHSC_SEI_ACC_CHPID        1
 #define CHSC_SEI_ACC_LINKADDR     2
 #define CHSC_SEI_ACC_FULLLINKADDR 3
@@ -10,7 +14,17 @@
 struct chsc_header {
        u16 length;
        u16 code;
-};
+} __attribute__ ((packed));
+
+#define NR_MEASUREMENT_CHARS 5
+struct cmg_chars {
+       u32 values[NR_MEASUREMENT_CHARS];
+} __attribute__ ((packed));
+
+#define NR_MEASUREMENT_ENTRIES 8
+struct cmg_entry {
+       u32 values[NR_MEASUREMENT_ENTRIES];
+} __attribute__ ((packed));
 
 struct channel_path_desc {
        u8 flags;
@@ -21,18 +35,25 @@ struct channel_path_desc {
        u8 zeroes;
        u8 chla;
        u8 chpp;
-};
+} __attribute__ ((packed));
 
 struct channel_path {
-       int id;
+       struct chp_id chpid;
        int state;
        struct channel_path_desc desc;
+       /* Channel-measurement related stuff: */
+       int cmg;
+       int shared;
+       void *cmg_chars;
        struct device dev;
 };
 
 extern void s390_process_css( void );
 extern void chsc_validate_chpids(struct subchannel *);
-extern void chpid_is_actually_online(int);
+extern void chpid_is_actually_online(struct chp_id);
+extern int css_get_ssd_info(struct subchannel *);
+extern int chsc_process_crw(void);
+extern int chp_process_crw(int, int);
 
 struct css_general_char {
        u64 : 41;
@@ -52,7 +73,11 @@ struct css_general_char {
 
 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;
@@ -67,7 +92,9 @@ 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(dev) container_of(dev, struct channel_path, dev)
+#define to_channelpath(device) container_of(device, struct channel_path, dev)
 
 #endif