1 files changed, 38 insertions, 16 deletions

diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
index 02c96d57f0cf..4a1126d8439a 100644
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
@@ -68,39 +68,59 @@ extern unsigned int console_irq;
 #define SET_CONSOLE_3215        do { console_mode = 2; } while (0)
 #define SET_CONSOLE_3270        do { console_mode = 3; } while (0)
 
-struct ipl_list_header {
-        u32 length;
-        u8  reserved[3];
+
+struct ipl_list_hdr {
+        u32 len;
+        u8  reserved1[3];
         u8  version;
+        u32 blk0_len;
+        u8  pbt;
+        u8  flags;
+        u16 reserved2;
 } __attribute__((packed));
 
 struct ipl_block_fcp {
-        u32 length;
-        u8  pbt;
-        u8  reserved1[322-1];
+        u8  reserved1[313-1];
+        u8  opt;
+        u8  reserved2[3];
+        u16 reserved3;
         u16 devno;
-        u8  reserved2[4];
+        u8  reserved4[4];
         u64 wwpn;
         u64 lun;
         u32 bootprog;
-        u8  reserved3[12];
+        u8  reserved5[12];
         u64 br_lba;
         u32 scp_data_len;
-        u8  reserved4[260];
+        u8  reserved6[260];
         u8  scp_data[];
 } __attribute__((packed));
 
+struct ipl_block_ccw {
+        u8  load_param[8];
+        u8  reserved1[84];
+        u8  reserved2[2];
+        u16 devno;
+        u8  vm_flags;
+        u8  reserved3[3];
+        u32 vm_parm_len;
+} __attribute__((packed));
+
 struct ipl_parameter_block {
+        struct ipl_list_hdr hdr;
         union {
-                u32 length;
-                struct ipl_list_header header;
-        } hdr;
-        struct ipl_block_fcp fcp;
+                struct ipl_block_fcp fcp;
+                struct ipl_block_ccw ccw;
+        } ipl_info;
 } __attribute__((packed));
 
-#define IPL_MAX_SUPPORTED_VERSION (0)
+#define IPL_PARM_BLK_FCP_LEN (sizeof(struct ipl_list_hdr) + \
+                              sizeof(struct ipl_block_fcp))
 
-#define IPL_TYPE_FCP (0)
+#define IPL_PARM_BLK_CCW_LEN (sizeof(struct ipl_list_hdr) + \
+                              sizeof(struct ipl_block_ccw))
+
+#define IPL_MAX_SUPPORTED_VERSION (0)
 
 /*
  * IPL validity flags and parameters as detected in head.S
@@ -108,12 +128,14 @@ struct ipl_parameter_block {
 extern u32 ipl_parameter_flags;
 extern u16 ipl_devno;
 
+void do_reipl(void);
+
 #define IPL_DEVNO_VALID         (ipl_parameter_flags & 1)
 #define IPL_PARMBLOCK_VALID     (ipl_parameter_flags & 2)
 
 #define IPL_PARMBLOCK_START     ((struct ipl_parameter_block *) \
                                  IPL_PARMBLOCK_ORIGIN)
-#define IPL_PARMBLOCK_SIZE      (IPL_PARMBLOCK_START->hdr.length)
+#define IPL_PARMBLOCK_SIZE      (IPL_PARMBLOCK_START->hdr.len)
 
 #else /* __ASSEMBLY__ */