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 / qdio.c
index bbe9f45..96f5192 100644 (file)
@@ -7,7 +7,7 @@
  *
  * Copyright 2000,2002 IBM Corporation
  * Author(s):             Utz Bacher <utz.bacher@de.ibm.com>
- * 2.6 cio integration by Cornelia Huck <cohuck@de.ibm.com>
+ * 2.6 cio integration by Cornelia Huck <cornelia.huck@de.ibm.com>
  *
  * Restriction: only 63 iqdio subchannels would have its own indicator,
  * after that, subsequent subchannels share one indicator
@@ -38,6 +38,7 @@
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/timer.h>
+#include <linux/mempool.h>
 
 #include <asm/ccwdev.h>
 #include <asm/io.h>
@@ -56,8 +57,6 @@
 #include "ioasm.h"
 #include "chsc.h"
 
-#define VERSION_QDIO_C "$Revision: 1.98 $"
-
 /****************** MODULE PARAMETER VARIABLES ********************/
 MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>");
 MODULE_DESCRIPTION("QDIO base support version 2, " \
@@ -66,8 +65,7 @@ MODULE_LICENSE("GPL");
 
 /******************** HERE WE GO ***********************************/
 
-static const char version[] = "QDIO base support version 2 ("
-       VERSION_QDIO_C "/" VERSION_QDIO_H  "/" VERSION_CIO_QDIO_H ")";
+static const char version[] = "QDIO base support version 2";
 
 #ifdef QDIO_PERFORMANCE_STATS
 static int proc_perf_file_registration;
@@ -76,12 +74,15 @@ static struct qdio_perf_stats perf_stats;
 #endif /* QDIO_PERFORMANCE_STATS */
 
 static int hydra_thinints;
+static int is_passthrough = 0;
 static int omit_svs;
 
 static int indicator_used[INDICATORS_PER_CACHELINE];
 static __u32 * volatile indicators;
 static __u32 volatile spare_indicator;
 static atomic_t spare_indicator_usecount;
+#define QDIO_MEMPOOL_SCSSC_ELEMENTS 2
+static mempool_t *qdio_mempool_scssc;
 
 static debug_info_t *qdio_dbf_setup;
 static debug_info_t *qdio_dbf_sbal;
@@ -112,7 +113,7 @@ qdio_min(int a,int b)
 
 /***************** SCRUBBER HELPER ROUTINES **********************/
 
-static inline volatile __u64 
+static inline __u64 
 qdio_get_micros(void)
 {
         return (get_clock() >> 10); /* time>>12 is microseconds */
@@ -136,12 +137,136 @@ qdio_release_q(struct qdio_q *q)
        atomic_dec(&q->use_count);
 }
 
-static volatile inline void 
-qdio_set_slsb(volatile char *slsb, unsigned char value)
+/*check ccq  */
+static inline int
+qdio_check_ccq(struct qdio_q *q, unsigned int ccq)
+{
+       char dbf_text[15];
+
+       if (ccq == 0 || ccq == 32 || ccq == 96)
+               return 0;
+       if (ccq == 97)
+               return 1;
+       /*notify devices immediately*/
+       sprintf(dbf_text,"%d", ccq);
+       QDIO_DBF_TEXT2(1,trace,dbf_text);
+       return -EIO;
+}
+/* EQBS: extract buffer states */
+static inline int
+qdio_do_eqbs(struct qdio_q *q, unsigned char *state,
+            unsigned int *start, unsigned int *cnt)
+{
+       struct qdio_irq *irq;
+       unsigned int tmp_cnt, q_no, ccq;
+       int rc ;
+       char dbf_text[15];
+
+       ccq = 0;
+       tmp_cnt = *cnt;
+       irq = (struct qdio_irq*)q->irq_ptr;
+       q_no = q->q_no;
+       if(!q->is_input_q)
+               q_no += irq->no_input_qs;
+again:
+       ccq = do_eqbs(irq->sch_token, state, q_no, start, cnt);
+       rc = qdio_check_ccq(q, ccq);
+       if (rc == 1) {
+               QDIO_DBF_TEXT5(1,trace,"eqAGAIN");
+               goto again;
+       }
+       if (rc < 0) {
+                QDIO_DBF_TEXT2(1,trace,"eqberr");
+                sprintf(dbf_text,"%2x,%2x,%d,%d",tmp_cnt, *cnt, ccq, q_no);
+                QDIO_DBF_TEXT2(1,trace,dbf_text);
+               q->handler(q->cdev,QDIO_STATUS_ACTIVATE_CHECK_CONDITION|
+                               QDIO_STATUS_LOOK_FOR_ERROR,
+                               0, 0, 0, -1, -1, q->int_parm);
+               return 0;
+       }
+       return (tmp_cnt - *cnt);
+}
+
+/* SQBS: set buffer states */
+static inline int
+qdio_do_sqbs(struct qdio_q *q, unsigned char state,
+            unsigned int *start, unsigned int *cnt)
+{
+       struct qdio_irq *irq;
+       unsigned int tmp_cnt, q_no, ccq;
+       int rc;
+       char dbf_text[15];
+
+       ccq = 0;
+       tmp_cnt = *cnt;
+       irq = (struct qdio_irq*)q->irq_ptr;
+       q_no = q->q_no;
+       if(!q->is_input_q)
+               q_no += irq->no_input_qs;
+again:
+       ccq = do_sqbs(irq->sch_token, state, q_no, start, cnt);
+       rc = qdio_check_ccq(q, ccq);
+       if (rc == 1) {
+               QDIO_DBF_TEXT5(1,trace,"sqAGAIN");
+               goto again;
+       }
+       if (rc < 0) {
+                QDIO_DBF_TEXT3(1,trace,"sqberr");
+                sprintf(dbf_text,"%2x,%2x,%d,%d",tmp_cnt,*cnt,ccq,q_no);
+                QDIO_DBF_TEXT3(1,trace,dbf_text);
+               q->handler(q->cdev,QDIO_STATUS_ACTIVATE_CHECK_CONDITION|
+                               QDIO_STATUS_LOOK_FOR_ERROR,
+                               0, 0, 0, -1, -1, q->int_parm);
+               return 0;
+       }
+       return (tmp_cnt - *cnt);
+}
+
+static inline int
+qdio_set_slsb(struct qdio_q *q, unsigned int *bufno,
+             unsigned char state, unsigned int *count)
+{
+       volatile char *slsb;
+       struct qdio_irq *irq;
+
+       irq = (struct qdio_irq*)q->irq_ptr;
+       if (!irq->is_qebsm) {
+               slsb = (char *)&q->slsb.acc.val[(*bufno)];
+               xchg(slsb, state);
+               return 1;
+       }
+       return qdio_do_sqbs(q, state, bufno, count);
+}
+
+#ifdef CONFIG_QDIO_DEBUG
+static inline void
+qdio_trace_slsb(struct qdio_q *q)
 {
-       xchg((char*)slsb,value);
+       if (q->queue_type==QDIO_TRACE_QTYPE) {
+               if (q->is_input_q)
+                       QDIO_DBF_HEX2(0,slsb_in,&q->slsb,
+                                     QDIO_MAX_BUFFERS_PER_Q);
+               else
+                       QDIO_DBF_HEX2(0,slsb_out,&q->slsb,
+                                     QDIO_MAX_BUFFERS_PER_Q);
+       }
 }
+#endif
 
+static inline int
+set_slsb(struct qdio_q *q, unsigned int *bufno,
+        unsigned char state, unsigned int *count)
+{
+       int rc;
+#ifdef CONFIG_QDIO_DEBUG
+       qdio_trace_slsb(q);
+#endif
+       rc = qdio_set_slsb(q, bufno, state, count);
+#ifdef CONFIG_QDIO_DEBUG
+       qdio_trace_slsb(q);
+#endif
+       return rc;
+}
 static inline int 
 qdio_siga_sync(struct qdio_q *q, unsigned int gpr2,
               unsigned int gpr3)
@@ -155,7 +280,7 @@ qdio_siga_sync(struct qdio_q *q, unsigned int gpr2,
        perf_stats.siga_syncs++;
 #endif /* QDIO_PERFORMANCE_STATS */
 
-       cc = do_siga_sync(q->irq, gpr2, gpr3);
+       cc = do_siga_sync(q->schid, gpr2, gpr3);
        if (cc)
                QDIO_DBF_HEX3(0,trace,&cc,sizeof(int*));
 
@@ -170,6 +295,23 @@ qdio_siga_sync_q(struct qdio_q *q)
        return qdio_siga_sync(q, q->mask, 0);
 }
 
+static int
+__do_siga_output(struct qdio_q *q, unsigned int *busy_bit)
+{
+       struct qdio_irq *irq;
+       unsigned int fc = 0;
+       unsigned long schid;
+
+       irq = (struct qdio_irq *) q->irq_ptr;
+       if (!irq->is_qebsm)
+              schid = *((u32 *)&q->schid);
+       else {
+              schid = irq->sch_token;
+              fc |= 0x80;
+       }
+       return do_siga_output(schid, q->mask, busy_bit, fc);
+}
+
 /* 
  * returns QDIO_SIGA_ERROR_ACCESS_EXCEPTION as cc, when SIGA returns
  * an access exception 
@@ -189,7 +331,7 @@ qdio_siga_output(struct qdio_q *q)
        QDIO_DBF_HEX4(0,trace,&q,sizeof(void*));
 
        for (;;) {
-               cc = do_siga_output(q->irq, q->mask, &busy_bit);
+               cc = __do_siga_output(q, &busy_bit);
 //QDIO_PRINT_ERR("cc=%x, busy=%x\n",cc,busy_bit);
                if ((cc==2) && (busy_bit) && (q->is_iqdio_q)) {
                        if (!start_time) 
@@ -221,7 +363,7 @@ qdio_siga_input(struct qdio_q *q)
        perf_stats.siga_ins++;
 #endif /* QDIO_PERFORMANCE_STATS */
 
-       cc = do_siga_input(q->irq, q->mask);
+       cc = do_siga_input(q->schid, q->mask);
        
        if (cc)
                QDIO_DBF_HEX3(0,trace,&cc,sizeof(int*));
@@ -230,7 +372,7 @@ qdio_siga_input(struct qdio_q *q)
 }
 
 /* locked by the locks in qdio_activate and qdio_cleanup */
-static __u32 * volatile 
+static __u32 *
 qdio_get_indicator(void)
 {
        int i;
@@ -258,7 +400,7 @@ qdio_put_indicator(__u32 *addr)
                atomic_dec(&spare_indicator_usecount);
 }
 
-static inline volatile void 
+static inline void
 tiqdio_clear_summary_bit(__u32 *location)
 {
        QDIO_DBF_TEXT5(0,trace,"clrsummb");
@@ -267,7 +409,7 @@ tiqdio_clear_summary_bit(__u32 *location)
        xchg(location,0);
 }
 
-static inline volatile void
+static inline  void
 tiqdio_set_summary_bit(__u32 *location)
 {
        QDIO_DBF_TEXT5(0,trace,"setsummb");
@@ -336,7 +478,9 @@ static inline int
 qdio_stop_polling(struct qdio_q *q)
 {
 #ifdef QDIO_USE_PROCESSING_STATE
-       int gsf;
+       unsigned int tmp, gsf, count = 1;
+       unsigned char state = 0;
+       struct qdio_irq *irq = (struct qdio_irq *) q->irq_ptr;
 
        if (!atomic_swap(&q->polling,0)) 
                return 1;
@@ -348,17 +492,22 @@ qdio_stop_polling(struct qdio_q *q)
        if (!q->is_input_q)
                return 1;
 
-       gsf=GET_SAVED_FRONTIER(q);
-       set_slsb(&q->slsb.acc.val[(gsf+QDIO_MAX_BUFFERS_PER_Q-1)&
-                                 (QDIO_MAX_BUFFERS_PER_Q-1)],
-                SLSB_P_INPUT_NOT_INIT);
+       tmp = gsf = GET_SAVED_FRONTIER(q);
+       tmp = ((tmp + QDIO_MAX_BUFFERS_PER_Q-1) & (QDIO_MAX_BUFFERS_PER_Q-1) );
+       set_slsb(q, &tmp, SLSB_P_INPUT_NOT_INIT, &count);
+
        /* 
         * we don't issue this SYNC_MEMORY, as we trust Rick T and
         * moreover will not use the PROCESSING state under VM, so
         * q->polling was 0 anyway
         */
        /*SYNC_MEMORY;*/
-       if (q->slsb.acc.val[gsf]!=SLSB_P_INPUT_PRIMED)
+       if (irq->is_qebsm) {
+               count = 1;
+               qdio_do_eqbs(q, &state, &gsf, &count);
+       } else
+               state = q->slsb.acc.val[gsf];
+       if (state != SLSB_P_INPUT_PRIMED)
                return 1;
        /* 
         * set our summary bit again, as otherwise there is a
@@ -431,18 +580,136 @@ tiqdio_clear_global_summary(void)
 
 
 /************************* OUTBOUND ROUTINES *******************************/
+static int
+qdio_qebsm_get_outbound_buffer_frontier(struct qdio_q *q)
+{
+        struct qdio_irq *irq;
+        unsigned char state;
+        unsigned int cnt, count, ftc;
+
+        irq = (struct qdio_irq *) q->irq_ptr;
+        if ((!q->is_iqdio_q) && (!q->hydra_gives_outbound_pcis))
+                SYNC_MEMORY;
+
+        ftc = q->first_to_check;
+        count = qdio_min(atomic_read(&q->number_of_buffers_used),
+                        (QDIO_MAX_BUFFERS_PER_Q-1));
+        if (count == 0)
+                return q->first_to_check;
+        cnt = qdio_do_eqbs(q, &state, &ftc, &count);
+        if (cnt == 0)
+                return q->first_to_check;
+        switch (state) {
+        case SLSB_P_OUTPUT_ERROR:
+                QDIO_DBF_TEXT3(0,trace,"outperr");
+                atomic_sub(cnt , &q->number_of_buffers_used);
+                if (q->qdio_error)
+                        q->error_status_flags |=
+                                QDIO_STATUS_MORE_THAN_ONE_QDIO_ERROR;
+                q->qdio_error = SLSB_P_OUTPUT_ERROR;
+                q->error_status_flags |= QDIO_STATUS_LOOK_FOR_ERROR;
+                q->first_to_check = ftc;
+                break;
+        case SLSB_P_OUTPUT_EMPTY:
+                QDIO_DBF_TEXT5(0,trace,"outpempt");
+                atomic_sub(cnt, &q->number_of_buffers_used);
+                q->first_to_check = ftc;
+                break;
+        case SLSB_CU_OUTPUT_PRIMED:
+                /* all buffers primed */
+                QDIO_DBF_TEXT5(0,trace,"outpprim");
+                break;
+        default:
+                break;
+        }
+        QDIO_DBF_HEX4(0,trace,&q->first_to_check,sizeof(int));
+        return q->first_to_check;
+}
+
+static int
+qdio_qebsm_get_inbound_buffer_frontier(struct qdio_q *q)
+{
+        struct qdio_irq *irq;
+        unsigned char state;
+        int tmp, ftc, count, cnt;
+        char dbf_text[15];
+
+
+        irq = (struct qdio_irq *) q->irq_ptr;
+        ftc = q->first_to_check;
+        count = qdio_min(atomic_read(&q->number_of_buffers_used),
+                        (QDIO_MAX_BUFFERS_PER_Q-1));
+        if (count == 0)
+                 return q->first_to_check;
+        cnt = qdio_do_eqbs(q, &state, &ftc, &count);
+        if (cnt == 0)
+                 return q->first_to_check;
+        switch (state) {
+        case SLSB_P_INPUT_ERROR :
+#ifdef CONFIG_QDIO_DEBUG
+                QDIO_DBF_TEXT3(1,trace,"inperr");
+                sprintf(dbf_text,"%2x,%2x",ftc,count);
+                QDIO_DBF_TEXT3(1,trace,dbf_text);
+#endif /* CONFIG_QDIO_DEBUG */
+                if (q->qdio_error)
+                        q->error_status_flags |=
+                                QDIO_STATUS_MORE_THAN_ONE_QDIO_ERROR;
+                q->qdio_error = SLSB_P_INPUT_ERROR;
+                q->error_status_flags |= QDIO_STATUS_LOOK_FOR_ERROR;
+                atomic_sub(cnt, &q->number_of_buffers_used);
+                q->first_to_check = ftc;
+                break;
+        case SLSB_P_INPUT_PRIMED :
+                QDIO_DBF_TEXT3(0,trace,"inptprim");
+                sprintf(dbf_text,"%2x,%2x",ftc,count);
+                QDIO_DBF_TEXT3(1,trace,dbf_text);
+                tmp = 0;
+                ftc = q->first_to_check;
+#ifdef QDIO_USE_PROCESSING_STATE
+               if (cnt > 1) {
+                       cnt -= 1;
+                       tmp = set_slsb(q, &ftc, SLSB_P_INPUT_NOT_INIT, &cnt);
+                       if (!tmp)
+                               break;
+               }
+               cnt = 1;
+               tmp += set_slsb(q, &ftc,
+                              SLSB_P_INPUT_PROCESSING, &cnt);
+               atomic_set(&q->polling, 1);
+#else
+                tmp = set_slsb(q, &ftc, SLSB_P_INPUT_NOT_INIT, &cnt);
+#endif
+                atomic_sub(tmp, &q->number_of_buffers_used);
+                q->first_to_check = ftc;
+                break;
+        case SLSB_CU_INPUT_EMPTY:
+        case SLSB_P_INPUT_NOT_INIT:
+        case SLSB_P_INPUT_PROCESSING:
+                QDIO_DBF_TEXT5(0,trace,"inpnipro");
+                break;
+        default:
+                break;
+        }
+        QDIO_DBF_HEX4(0,trace,&q->first_to_check,sizeof(int));
+        return q->first_to_check;
+}
 
-inline static int
+static inline int
 qdio_get_outbound_buffer_frontier(struct qdio_q *q)
 {
-       int f,f_mod_no;
-       volatile char *slsb;
-       int first_not_to_check;
+       struct qdio_irq *irq;
+        volatile char *slsb;
+        unsigned int count = 1;
+        int first_not_to_check, f, f_mod_no;
        char dbf_text[15];
 
        QDIO_DBF_TEXT4(0,trace,"getobfro");
        QDIO_DBF_HEX4(0,trace,&q,sizeof(void*));
 
+       irq = (struct qdio_irq *) q->irq_ptr;
+       if (irq->is_qebsm)
+               return qdio_qebsm_get_outbound_buffer_frontier(q);
+
        slsb=&q->slsb.acc.val[0];
        f_mod_no=f=q->first_to_check;
        /* 
@@ -484,7 +751,7 @@ check_next:
                QDIO_DBF_HEX2(1,sbal,q->sbal[f_mod_no],256);
 
                /* kind of process the buffer */
-               set_slsb(&q->slsb.acc.val[f_mod_no], SLSB_P_OUTPUT_NOT_INIT);
+               set_slsb(q, &f_mod_no, SLSB_P_OUTPUT_NOT_INIT, &count);
 
                /* 
                 * we increment the frontier, as this buffer
@@ -510,7 +777,7 @@ out:
 }
 
 /* all buffers are processed */
-inline static int
+static inline int
 qdio_is_outbound_q_done(struct qdio_q *q)
 {
        int no_used;
@@ -532,7 +799,7 @@ qdio_is_outbound_q_done(struct qdio_q *q)
        return (no_used==0);
 }
 
-inline static int
+static inline int
 qdio_has_outbound_q_moved(struct qdio_q *q)
 {
        int i;
@@ -552,7 +819,7 @@ qdio_has_outbound_q_moved(struct qdio_q *q)
        }
 }
 
-inline static void
+static inline void
 qdio_kick_outbound_q(struct qdio_q *q)
 {
        int result;
@@ -597,51 +864,51 @@ qdio_kick_outbound_q(struct qdio_q *q)
 
        result=qdio_siga_output(q);
 
-               switch (result) {
-               case 0:
-                       /* went smooth this time, reset timestamp */
+       switch (result) {
+       case 0:
+               /* went smooth this time, reset timestamp */
 #ifdef CONFIG_QDIO_DEBUG
-                       QDIO_DBF_TEXT3(0,trace,"cc2reslv");
-                       sprintf(dbf_text,"%4x%2x%2x",q->irq,q->q_no,
-                               atomic_read(&q->busy_siga_counter));
-                       QDIO_DBF_TEXT3(0,trace,dbf_text);
+               QDIO_DBF_TEXT3(0,trace,"cc2reslv");
+               sprintf(dbf_text,"%4x%2x%2x",q->schid.sch_no,q->q_no,
+                       atomic_read(&q->busy_siga_counter));
+               QDIO_DBF_TEXT3(0,trace,dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
-                       q->timing.busy_start=0;
+               q->timing.busy_start=0;
+               break;
+       case (2|QDIO_SIGA_ERROR_B_BIT_SET):
+               /* cc=2 and busy bit: */
+               atomic_inc(&q->busy_siga_counter);
+
+               /* if the last siga was successful, save
+                * timestamp here */
+               if (!q->timing.busy_start)
+                       q->timing.busy_start=NOW;
+
+               /* if we're in time, don't touch error_status_flags
+                * and siga_error */
+               if (NOW-q->timing.busy_start<QDIO_BUSY_BIT_GIVE_UP) {
+                       qdio_mark_q(q);
                        break;
-               case (2|QDIO_SIGA_ERROR_B_BIT_SET):
-                       /* cc=2 and busy bit: */
-                       atomic_inc(&q->busy_siga_counter);
-
-                       /* if the last siga was successful, save
-                        * timestamp here */
-                       if (!q->timing.busy_start)
-                               q->timing.busy_start=NOW;
-
-                       /* if we're in time, don't touch error_status_flags
-                        * and siga_error */
-                       if (NOW-q->timing.busy_start<QDIO_BUSY_BIT_GIVE_UP) {
-                               qdio_mark_q(q);
-                               break;
-                       }
-                       QDIO_DBF_TEXT2(0,trace,"cc2REPRT");
+               }
+               QDIO_DBF_TEXT2(0,trace,"cc2REPRT");
 #ifdef CONFIG_QDIO_DEBUG
-                       sprintf(dbf_text,"%4x%2x%2x",q->irq,q->q_no,
-                               atomic_read(&q->busy_siga_counter));
-                       QDIO_DBF_TEXT3(0,trace,dbf_text);
+               sprintf(dbf_text,"%4x%2x%2x",q->schid.sch_no,q->q_no,
+                       atomic_read(&q->busy_siga_counter));
+               QDIO_DBF_TEXT3(0,trace,dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
-                       /* else fallthrough and report error */
-               default:
-                       /* for plain cc=1, 2 or 3: */
-                       if (q->siga_error)
-                               q->error_status_flags|=
-                                       QDIO_STATUS_MORE_THAN_ONE_SIGA_ERROR;
+               /* else fallthrough and report error */
+       default:
+               /* for plain cc=1, 2 or 3: */
+               if (q->siga_error)
                        q->error_status_flags|=
-                               QDIO_STATUS_LOOK_FOR_ERROR;
-                       q->siga_error=result;
-               }
+                               QDIO_STATUS_MORE_THAN_ONE_SIGA_ERROR;
+               q->error_status_flags|=
+                       QDIO_STATUS_LOOK_FOR_ERROR;
+               q->siga_error=result;
+       }
 }
 
-inline static void
+static inline void
 qdio_kick_outbound_handler(struct qdio_q *q)
 {
        int start, end, real_end, count;
@@ -740,11 +1007,13 @@ qdio_outbound_processing(struct qdio_q *q)
 /************************* INBOUND ROUTINES *******************************/
 
 
-inline static int
+static inline int
 qdio_get_inbound_buffer_frontier(struct qdio_q *q)
 {
+       struct qdio_irq *irq;
        int f,f_mod_no;
        volatile char *slsb;
+       unsigned int count = 1;
        int first_not_to_check;
 #ifdef CONFIG_QDIO_DEBUG
        char dbf_text[15];
@@ -756,6 +1025,10 @@ qdio_get_inbound_buffer_frontier(struct qdio_q *q)
        QDIO_DBF_TEXT4(0,trace,"getibfro");
        QDIO_DBF_HEX4(0,trace,&q,sizeof(void*));
 
+       irq = (struct qdio_irq *) q->irq_ptr;
+       if (irq->is_qebsm)
+               return qdio_qebsm_get_inbound_buffer_frontier(q);
+
        slsb=&q->slsb.acc.val[0];
        f_mod_no=f=q->first_to_check;
        /* 
@@ -792,19 +1065,19 @@ check_next:
                 * kill VM in terms of CP overhead 
                 */
                if (q->siga_sync) {
-                       set_slsb(&slsb[f_mod_no],SLSB_P_INPUT_NOT_INIT);
+                       set_slsb(q, &f_mod_no, SLSB_P_INPUT_NOT_INIT, &count);
                } else {
                        /* set the previous buffer to NOT_INIT. The current
                         * buffer will be set to PROCESSING at the end of
                         * this function to avoid further interrupts. */
                        if (last_position>=0)
-                               set_slsb(&slsb[last_position],
-                                        SLSB_P_INPUT_NOT_INIT);
+                               set_slsb(q, &last_position,
+                                        SLSB_P_INPUT_NOT_INIT, &count);
                        atomic_set(&q->polling,1);
                        last_position=f_mod_no;
                }
 #else /* QDIO_USE_PROCESSING_STATE */
-               set_slsb(&slsb[f_mod_no],SLSB_P_INPUT_NOT_INIT);
+               set_slsb(q, &f_mod_no, SLSB_P_INPUT_NOT_INIT, &count);
 #endif /* QDIO_USE_PROCESSING_STATE */
                /* 
                 * not needed, as the inbound queue will be synced on the next
@@ -829,7 +1102,7 @@ check_next:
                QDIO_DBF_HEX2(1,sbal,q->sbal[f_mod_no],256);
 
                /* kind of process the buffer */
-               set_slsb(&slsb[f_mod_no],SLSB_P_INPUT_NOT_INIT);
+               set_slsb(q, &f_mod_no, SLSB_P_INPUT_NOT_INIT, &count);
 
                if (q->qdio_error)
                        q->error_status_flags|=
@@ -857,7 +1130,7 @@ out:
 
 #ifdef QDIO_USE_PROCESSING_STATE
        if (last_position>=0)
-               set_slsb(&slsb[last_position],SLSB_P_INPUT_PROCESSING);
+               set_slsb(q, &last_position, SLSB_P_INPUT_NOT_INIT, &count);
 #endif /* QDIO_USE_PROCESSING_STATE */
 
        QDIO_DBF_HEX4(0,trace,&q->first_to_check,sizeof(int));
@@ -865,7 +1138,7 @@ out:
        return q->first_to_check;
 }
 
-inline static int
+static inline int
 qdio_has_inbound_q_moved(struct qdio_q *q)
 {
        int i;
@@ -898,10 +1171,14 @@ qdio_has_inbound_q_moved(struct qdio_q *q)
 }
 
 /* means, no more buffers to be filled */
-inline static int
+static inline int
 tiqdio_is_inbound_q_done(struct qdio_q *q)
 {
        int no_used;
+       unsigned int start_buf, count;
+       unsigned char state = 0;
+       struct qdio_irq *irq = (struct qdio_irq *) q->irq_ptr;
+
 #ifdef CONFIG_QDIO_DEBUG
        char dbf_text[15];
 #endif
@@ -923,12 +1200,16 @@ tiqdio_is_inbound_q_done(struct qdio_q *q)
 
        if (!no_used)
                return 1;
-
-       if (!q->siga_sync)
+       if (!q->siga_sync && !irq->is_qebsm)
                /* we'll check for more primed buffers in qeth_stop_polling */
                return 0;
-
-       if (q->slsb.acc.val[q->first_to_check]!=SLSB_P_INPUT_PRIMED)
+       if (irq->is_qebsm) {
+               count = 1;
+               start_buf = q->first_to_check;
+               qdio_do_eqbs(q, &state, &start_buf, &count);
+       } else
+               state = q->slsb.acc.val[q->first_to_check];
+       if (state != SLSB_P_INPUT_PRIMED)
                /* 
                 * nothing more to do, if next buffer is not PRIMED.
                 * note that we did a SYNC_MEMORY before, that there
@@ -951,10 +1232,14 @@ tiqdio_is_inbound_q_done(struct qdio_q *q)
        return 0;
 }
 
-inline static int
+static inline int
 qdio_is_inbound_q_done(struct qdio_q *q)
 {
        int no_used;
+       unsigned int start_buf, count;
+       unsigned char state = 0;
+       struct qdio_irq *irq = (struct qdio_irq *) q->irq_ptr;
+
 #ifdef CONFIG_QDIO_DEBUG
        char dbf_text[15];
 #endif
@@ -973,8 +1258,13 @@ qdio_is_inbound_q_done(struct qdio_q *q)
                QDIO_DBF_TEXT4(0,trace,dbf_text);
                return 1;
        }
-
-       if (q->slsb.acc.val[q->first_to_check]==SLSB_P_INPUT_PRIMED) {
+       if (irq->is_qebsm) {
+               count = 1;
+               start_buf = q->first_to_check;
+               qdio_do_eqbs(q, &state, &start_buf, &count);
+       } else
+               state = q->slsb.acc.val[q->first_to_check];
+       if (state == SLSB_P_INPUT_PRIMED) {
                /* we got something to do */
                QDIO_DBF_TEXT4(0,trace,"inqisntA");
                QDIO_DBF_HEX4(0,trace,&q,sizeof(void*));
@@ -1010,7 +1300,7 @@ qdio_is_inbound_q_done(struct qdio_q *q)
        }
 }
 
-inline static void
+static inline void
 qdio_kick_inbound_handler(struct qdio_q *q)
 {
        int count, start, end, real_end, i;
@@ -1338,21 +1628,19 @@ qdio_release_irq_memory(struct qdio_irq *irq_ptr)
                if (!irq_ptr->input_qs[i])
                        goto next;
 
-               if (irq_ptr->input_qs[i]->slib)
-                       kfree(irq_ptr->input_qs[i]->slib);
+               kfree(irq_ptr->input_qs[i]->slib);
                kfree(irq_ptr->input_qs[i]);
 
 next:
                if (!irq_ptr->output_qs[i])
                        continue;
 
-               if (irq_ptr->output_qs[i]->slib)
-                       kfree(irq_ptr->output_qs[i]->slib);
+               kfree(irq_ptr->output_qs[i]->slib);
                kfree(irq_ptr->output_qs[i]);
 
        }
        kfree(irq_ptr->qdr);
-       kfree(irq_ptr);
+       free_page((unsigned long) irq_ptr);
 }
 
 static void
@@ -1401,16 +1689,14 @@ qdio_alloc_qs(struct qdio_irq *irq_ptr,
        int result=-ENOMEM;
 
        for (i=0;i<no_input_qs;i++) {
-               q=kmalloc(sizeof(struct qdio_q),GFP_KERNEL);
+               q = kzalloc(sizeof(struct qdio_q), GFP_KERNEL);
 
                if (!q) {
                        QDIO_PRINT_ERR("kmalloc of q failed!\n");
                        goto out;
                }
 
-               memset(q,0,sizeof(struct qdio_q));
-
-               q->slib=kmalloc(PAGE_SIZE,GFP_KERNEL);
+               q->slib = kmalloc(PAGE_SIZE, GFP_KERNEL);
                if (!q->slib) {
                        QDIO_PRINT_ERR("kmalloc of slib failed!\n");
                        goto out;
@@ -1420,14 +1706,12 @@ qdio_alloc_qs(struct qdio_irq *irq_ptr,
        }
 
        for (i=0;i<no_output_qs;i++) {
-               q=kmalloc(sizeof(struct qdio_q),GFP_KERNEL);
+               q = kzalloc(sizeof(struct qdio_q), GFP_KERNEL);
 
                if (!q) {
                        goto out;
                }
 
-               memset(q,0,sizeof(struct qdio_q));
-
                q->slib=kmalloc(PAGE_SIZE,GFP_KERNEL);
                if (!q->slib) {
                        QDIO_PRINT_ERR("kmalloc of slib failed!\n");
@@ -1458,7 +1742,7 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, struct ccw_device *cdev,
        void *ptr;
        int available;
 
-       sprintf(dbf_text,"qfqs%4x",cdev->private->irq);
+       sprintf(dbf_text,"qfqs%4x",cdev->private->sch_no);
        QDIO_DBF_TEXT0(0,setup,dbf_text);
        for (i=0;i<no_input_qs;i++) {
                q=irq_ptr->input_qs[i];
@@ -1478,7 +1762,7 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, struct ccw_device *cdev,
 
                 q->queue_type=q_format;
                q->int_parm=int_parm;
-               q->irq=irq_ptr->irq;
+               q->schid = irq_ptr->schid;
                q->irq_ptr = irq_ptr;
                q->cdev = cdev;
                q->mask=1<<(31-i);
@@ -1525,11 +1809,11 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, struct ccw_device *cdev,
                QDIO_DBF_HEX2(0,setup,&ptr,sizeof(void*));
 
                /* fill in slsb */
-               for (j=0;j<QDIO_MAX_BUFFERS_PER_Q;j++) {
-                       set_slsb(&q->slsb.acc.val[j],
-                                SLSB_P_INPUT_NOT_INIT);
-/*                     q->sbal[j]->element[1].sbalf.i1.key=QDIO_STORAGE_KEY;*/
-               }
+               if (!irq_ptr->is_qebsm) {
+                        unsigned int count = 1;
+                        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++)
+                                set_slsb(q, &j, SLSB_P_INPUT_NOT_INIT, &count);
+                }
        }
 
        for (i=0;i<no_output_qs;i++) {
@@ -1551,7 +1835,7 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, struct ccw_device *cdev,
                 q->queue_type=q_format;
                q->int_parm=int_parm;
                q->is_input_q=0;
-               q->irq=irq_ptr->irq;
+               q->schid = irq_ptr->schid;
                q->cdev = cdev;
                q->irq_ptr = irq_ptr;
                q->mask=1<<(31-i);
@@ -1586,11 +1870,11 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, struct ccw_device *cdev,
                QDIO_DBF_HEX2(0,setup,&ptr,sizeof(void*));
 
                /* fill in slsb */
-               for (j=0;j<QDIO_MAX_BUFFERS_PER_Q;j++) {
-                       set_slsb(&q->slsb.acc.val[j],
-                                SLSB_P_OUTPUT_NOT_INIT);
-/*                     q->sbal[j]->element[1].sbalf.i1.key=QDIO_STORAGE_KEY;*/
-               }
+                if (!irq_ptr->is_qebsm) {
+                        unsigned int count = 1;
+                        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++)
+                                set_slsb(q, &j, SLSB_P_OUTPUT_NOT_INIT, &count);
+                }
        }
 }
 
@@ -1658,7 +1942,7 @@ qdio_set_state(struct qdio_irq *irq_ptr, enum qdio_irq_states state)
        char dbf_text[15];
 
        QDIO_DBF_TEXT5(0,trace,"newstate");
-       sprintf(dbf_text,"%4x%4x",irq_ptr->irq,state);
+       sprintf(dbf_text,"%4x%4x",irq_ptr->schid.sch_no,state);
        QDIO_DBF_TEXT5(0,trace,dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
 
@@ -1671,12 +1955,12 @@ qdio_set_state(struct qdio_irq *irq_ptr, enum qdio_irq_states state)
 }
 
 static inline void
-qdio_irq_check_sense(int irq, struct irb *irb)
+qdio_irq_check_sense(struct subchannel_id schid, struct irb *irb)
 {
        char dbf_text[15];
 
        if (irb->esw.esw0.erw.cons) {
-               sprintf(dbf_text,"sens%4x",irq);
+               sprintf(dbf_text,"sens%4x",schid.sch_no);
                QDIO_DBF_TEXT2(1,trace,dbf_text);
                QDIO_DBF_HEX0(0,sense,irb,QDIO_DBF_SENSE_LEN);
 
@@ -1787,21 +2071,22 @@ qdio_timeout_handler(struct ccw_device *cdev)
 
        switch (irq_ptr->state) {
        case QDIO_IRQ_STATE_INACTIVE:
-               QDIO_PRINT_ERR("establish queues on irq %04x: timed out\n",
-                              irq_ptr->irq);
+               QDIO_PRINT_ERR("establish queues on irq 0.%x.%04x: timed out\n",
+                              irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
                QDIO_DBF_TEXT2(1,setup,"eq:timeo");
                qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
                break;
        case QDIO_IRQ_STATE_CLEANUP:
-               QDIO_PRINT_INFO("Did not get interrupt on cleanup, irq=0x%x.\n",
-                               irq_ptr->irq);
+               QDIO_PRINT_INFO("Did not get interrupt on cleanup, "
+                               "irq=0.%x.%x.\n",
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
                qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
                break;
        case QDIO_IRQ_STATE_ESTABLISHED:
        case QDIO_IRQ_STATE_ACTIVE:
                /* I/O has been terminated by common I/O layer. */
-               QDIO_PRINT_INFO("Queues on irq %04x killed by cio.\n",
-                               irq_ptr->irq);
+               QDIO_PRINT_INFO("Queues on irq 0.%x.%04x killed by cio.\n",
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
                QDIO_DBF_TEXT2(1, trace, "cio:term");
                qdio_set_state(irq_ptr, QDIO_IRQ_STATE_STOPPED);
                if (get_device(&cdev->dev)) {
@@ -1864,7 +2149,7 @@ qdio_handler(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                }
        }
 
-       qdio_irq_check_sense(irq_ptr->irq, irb);
+       qdio_irq_check_sense(irq_ptr->schid, irb);
 
 #ifdef CONFIG_QDIO_DEBUG
        sprintf(dbf_text, "state:%d", irq_ptr->state);
@@ -1907,7 +2192,7 @@ int
 qdio_synchronize(struct ccw_device *cdev, unsigned int flags,
                 unsigned int queue_number)
 {
-       int cc;
+       int cc = 0;
        struct qdio_q *q;
        struct qdio_irq *irq_ptr;
        void *ptr;
@@ -1920,7 +2205,7 @@ qdio_synchronize(struct ccw_device *cdev, unsigned int flags,
                return -ENODEV;
 
 #ifdef CONFIG_QDIO_DEBUG
-       *((int*)(&dbf_text[4])) = irq_ptr->irq;
+       *((int*)(&dbf_text[4])) = irq_ptr->schid.sch_no;
        QDIO_DBF_HEX4(0,trace,dbf_text,QDIO_DBF_TRACE_LEN);
        *((int*)(&dbf_text[0]))=flags;
        *((int*)(&dbf_text[4]))=queue_number;
@@ -1931,12 +2216,14 @@ qdio_synchronize(struct ccw_device *cdev, unsigned int flags,
                q=irq_ptr->input_qs[queue_number];
                if (!q)
                        return -EINVAL;
-               cc = do_siga_sync(q->irq, 0, q->mask);
+               if (!(irq_ptr->is_qebsm))
+                       cc = do_siga_sync(q->schid, 0, q->mask);
        } else if (flags&QDIO_FLAG_SYNC_OUTPUT) {
                q=irq_ptr->output_qs[queue_number];
                if (!q)
                        return -EINVAL;
-               cc = do_siga_sync(q->irq, q->mask, 0);
+               if (!(irq_ptr->is_qebsm))
+                       cc = do_siga_sync(q->schid, q->mask, 0);
        } else 
                return -EINVAL;
 
@@ -1947,15 +2234,54 @@ qdio_synchronize(struct ccw_device *cdev, unsigned int flags,
        return cc;
 }
 
-static unsigned char
-qdio_check_siga_needs(int sch)
+static inline void
+qdio_check_subchannel_qebsm(struct qdio_irq *irq_ptr, unsigned char qdioac,
+                           unsigned long token)
+{
+       struct qdio_q *q;
+       int i;
+       unsigned int count, start_buf;
+       char dbf_text[15];
+
+       /*check if QEBSM is disabled */
+       if (!(irq_ptr->is_qebsm) || !(qdioac & 0x01)) {
+               irq_ptr->is_qebsm  = 0;
+               irq_ptr->sch_token = 0;
+               irq_ptr->qib.rflags &= ~QIB_RFLAGS_ENABLE_QEBSM;
+               QDIO_DBF_TEXT0(0,setup,"noV=V");
+               return;
+       }
+       irq_ptr->sch_token = token;
+       /*input queue*/
+       for (i = 0; i < irq_ptr->no_input_qs;i++) {
+               q = irq_ptr->input_qs[i];
+               count = QDIO_MAX_BUFFERS_PER_Q;
+               start_buf = 0;
+               set_slsb(q, &start_buf, SLSB_P_INPUT_NOT_INIT, &count);
+       }
+       sprintf(dbf_text,"V=V:%2x",irq_ptr->is_qebsm);
+       QDIO_DBF_TEXT0(0,setup,dbf_text);
+       sprintf(dbf_text,"%8lx",irq_ptr->sch_token);
+       QDIO_DBF_TEXT0(0,setup,dbf_text);
+       /*output queue*/
+       for (i = 0; i < irq_ptr->no_output_qs; i++) {
+               q = irq_ptr->output_qs[i];
+               count = QDIO_MAX_BUFFERS_PER_Q;
+               start_buf = 0;
+               set_slsb(q, &start_buf, SLSB_P_OUTPUT_NOT_INIT, &count);
+       }
+}
+
+static void
+qdio_get_ssqd_information(struct qdio_irq *irq_ptr)
 {
        int result;
        unsigned char qdioac;
-
        struct {
                struct chsc_header request;
-               u16 reserved1;
+               u16 reserved1:10;
+               u16 ssid:2;
+               u16 fmt:4;
                u16 first_sch;
                u16 reserved2;
                u16 last_sch;
@@ -1966,67 +2292,83 @@ qdio_check_siga_needs(int sch)
                u8  reserved5;
                u16 sch;
                u8  qfmt;
-               u8  reserved6;
-               u8  qdioac;
+               u8  parm;
+               u8  qdioac1;
                u8  sch_class;
                u8  reserved7;
                u8  icnt;
                u8  reserved8;
                u8  ocnt;
+               u8 reserved9;
+               u8 mbccnt;
+               u16 qdioac2;
+               u64 sch_token;
        } *ssqd_area;
 
-       ssqd_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
+       QDIO_DBF_TEXT0(0,setup,"getssqd");
+       qdioac = 0;
+       ssqd_area = mempool_alloc(qdio_mempool_scssc, GFP_ATOMIC);
        if (!ssqd_area) {
                QDIO_PRINT_WARN("Could not get memory for chsc. Using all " \
-                               "SIGAs for sch x%x.\n", sch);
-               return CHSC_FLAG_SIGA_INPUT_NECESSARY ||
-                       CHSC_FLAG_SIGA_OUTPUT_NECESSARY ||
-                       CHSC_FLAG_SIGA_SYNC_NECESSARY; /* all flags set */
+                               "SIGAs for sch x%x.\n", irq_ptr->schid.sch_no);
+               irq_ptr->qdioac = CHSC_FLAG_SIGA_INPUT_NECESSARY ||
+                                 CHSC_FLAG_SIGA_OUTPUT_NECESSARY ||
+                                 CHSC_FLAG_SIGA_SYNC_NECESSARY; /* all flags set */
+               irq_ptr->is_qebsm = 0;
+               irq_ptr->sch_token = 0;
+               irq_ptr->qib.rflags &= ~QIB_RFLAGS_ENABLE_QEBSM;
+               return;
        }
+
        ssqd_area->request = (struct chsc_header) {
                .length = 0x0010,
                .code   = 0x0024,
        };
-
-       ssqd_area->first_sch = sch;
-       ssqd_area->last_sch = sch;
-
-       result=chsc(ssqd_area);
+       ssqd_area->first_sch = irq_ptr->schid.sch_no;
+       ssqd_area->last_sch = irq_ptr->schid.sch_no;
+       ssqd_area->ssid = irq_ptr->schid.ssid;
+       result = chsc(ssqd_area);
 
        if (result) {
                QDIO_PRINT_WARN("CHSC returned cc %i. Using all " \
-                               "SIGAs for sch x%x.\n",
-                               result,sch);
+                               "SIGAs for sch 0.%x.%x.\n", result,
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
                qdioac = CHSC_FLAG_SIGA_INPUT_NECESSARY ||
                        CHSC_FLAG_SIGA_OUTPUT_NECESSARY ||
                        CHSC_FLAG_SIGA_SYNC_NECESSARY; /* all flags set */
+               irq_ptr->is_qebsm  = 0;
                goto out;
        }
 
        if (ssqd_area->response.code != QDIO_CHSC_RESPONSE_CODE_OK) {
                QDIO_PRINT_WARN("response upon checking SIGA needs " \
-                               "is 0x%x. Using all SIGAs for sch x%x.\n",
-                               ssqd_area->response.code, sch);
+                               "is 0x%x. Using all SIGAs for sch 0.%x.%x.\n",
+                               ssqd_area->response.code,
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
                qdioac = CHSC_FLAG_SIGA_INPUT_NECESSARY ||
                        CHSC_FLAG_SIGA_OUTPUT_NECESSARY ||
                        CHSC_FLAG_SIGA_SYNC_NECESSARY; /* all flags set */
+               irq_ptr->is_qebsm  = 0;
                goto out;
        }
        if (!(ssqd_area->flags & CHSC_FLAG_QDIO_CAPABILITY) ||
            !(ssqd_area->flags & CHSC_FLAG_VALIDITY) ||
-           (ssqd_area->sch != sch)) {
-               QDIO_PRINT_WARN("huh? problems checking out sch x%x... " \
-                               "using all SIGAs.\n",sch);
+           (ssqd_area->sch != irq_ptr->schid.sch_no)) {
+               QDIO_PRINT_WARN("huh? problems checking out sch 0.%x.%x... " \
+                               "using all SIGAs.\n",
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
                qdioac = CHSC_FLAG_SIGA_INPUT_NECESSARY |
                        CHSC_FLAG_SIGA_OUTPUT_NECESSARY |
                        CHSC_FLAG_SIGA_SYNC_NECESSARY; /* worst case */
+               irq_ptr->is_qebsm  = 0;
                goto out;
        }
-
-       qdioac = ssqd_area->qdioac;
+       qdioac = ssqd_area->qdioac1;
 out:
-       free_page ((unsigned long) ssqd_area);
-       return qdioac;
+       qdio_check_subchannel_qebsm(irq_ptr, qdioac,
+                                   ssqd_area->sch_token);
+       mempool_free(ssqd_area, qdio_mempool_scssc);
+       irq_ptr->qdioac = qdioac;
 }
 
 static unsigned int
@@ -2057,6 +2399,13 @@ tiqdio_check_chsc_availability(void)
        sprintf(dbf_text,"hydrati%1x", hydra_thinints);
        QDIO_DBF_TEXT0(0,setup,dbf_text);
 
+#ifdef CONFIG_64BIT
+       /* Check for QEBSM support in general (bit 58). */
+       is_passthrough = css_general_characteristics.qebsm;
+#endif
+       sprintf(dbf_text,"cssQBS:%1x", is_passthrough);
+       QDIO_DBF_TEXT0(0,setup,dbf_text);
+
        /* Check for aif time delay disablement fac (bit 56). If installed,
         * omit svs even under lpar (good point by rick again) */
        omit_svs = css_general_characteristics.aif_tdd;
@@ -2093,7 +2442,7 @@ tiqdio_set_subchannel_ind(struct qdio_irq *irq_ptr, int reset_to_zero)
                /* set to 0x10000000 to enable
                 * time delay disablement facility */
                u32 reserved5;
-               u32 subsystem_id;
+               struct subchannel_id schid;
                u32 reserved6[1004];
                struct chsc_header response;
                u32 reserved7;
@@ -2112,10 +2461,11 @@ tiqdio_set_subchannel_ind(struct qdio_irq *irq_ptr, int reset_to_zero)
                        virt_to_phys((volatile void *)irq_ptr->dev_st_chg_ind);
        }
 
-       scssc_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
+       scssc_area = mempool_alloc(qdio_mempool_scssc, GFP_ATOMIC);
        if (!scssc_area) {
                QDIO_PRINT_WARN("No memory for setting indicators on " \
-                               "subchannel x%x.\n", irq_ptr->irq);
+                               "subchannel 0.%x.%x.\n",
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
                return -ENOMEM;
        }
        scssc_area->request = (struct chsc_header) {
@@ -2129,7 +2479,7 @@ tiqdio_set_subchannel_ind(struct qdio_irq *irq_ptr, int reset_to_zero)
        scssc_area->ks = QDIO_STORAGE_KEY;
        scssc_area->kc = QDIO_STORAGE_KEY;
        scssc_area->isc = TIQDIO_THININT_ISC;
-       scssc_area->subsystem_id = (1<<16) + irq_ptr->irq;
+       scssc_area->schid = irq_ptr->schid;
        /* enables the time delay disablement facility. Don't care
         * whether it is really there (i.e. we haven't checked for
         * it) */
@@ -2139,12 +2489,11 @@ tiqdio_set_subchannel_ind(struct qdio_irq *irq_ptr, int reset_to_zero)
                QDIO_PRINT_WARN("Time delay disablement facility " \
                                "not available\n");
 
-
-
        result = chsc(scssc_area);
        if (result) {
-               QDIO_PRINT_WARN("could not set indicators on irq x%x, " \
-                               "cc=%i.\n",irq_ptr->irq,result);
+               QDIO_PRINT_WARN("could not set indicators on irq 0.%x.%x, " \
+                               "cc=%i.\n",
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no,result);
                result = -EIO;
                goto out;
        }
@@ -2168,7 +2517,7 @@ tiqdio_set_subchannel_ind(struct qdio_irq *irq_ptr, int reset_to_zero)
        QDIO_DBF_HEX2(0,setup,&real_addr_dev_st_chg_ind,sizeof(unsigned long));
        result = 0;
 out:
-       free_page ((unsigned long) scssc_area);
+       mempool_free(scssc_area, qdio_mempool_scssc);
        return result;
 
 }
@@ -2197,10 +2546,11 @@ tiqdio_set_delay_target(struct qdio_irq *irq_ptr, unsigned long delay_target)
        if (!irq_ptr->is_thinint_irq)
                return -ENODEV;
 
-       scsscf_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
+       scsscf_area = mempool_alloc(qdio_mempool_scssc, GFP_ATOMIC);
        if (!scsscf_area) {
                QDIO_PRINT_WARN("No memory for setting delay target on " \
-                               "subchannel x%x.\n", irq_ptr->irq);
+                               "subchannel 0.%x.%x.\n",
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
                return -ENOMEM;
        }
        scsscf_area->request = (struct chsc_header) {
@@ -2212,8 +2562,10 @@ tiqdio_set_delay_target(struct qdio_irq *irq_ptr, unsigned long delay_target)
 
        result=chsc(scsscf_area);
        if (result) {
-               QDIO_PRINT_WARN("could not set delay target on irq x%x, " \
-                               "cc=%i. Continuing.\n",irq_ptr->irq,result);
+               QDIO_PRINT_WARN("could not set delay target on irq 0.%x.%x, " \
+                               "cc=%i. Continuing.\n",
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no,
+                               result);
                result = -EIO;
                goto out;
        }
@@ -2232,7 +2584,7 @@ tiqdio_set_delay_target(struct qdio_irq *irq_ptr, unsigned long delay_target)
        QDIO_DBF_HEX2(0,trace,&delay_target,sizeof(unsigned long));
        result = 0; /* not critical */
 out:
-       free_page ((unsigned long) scsscf_area);
+       mempool_free(scsscf_area, qdio_mempool_scssc);
        return result;
 }
 
@@ -2247,7 +2599,7 @@ qdio_cleanup(struct ccw_device *cdev, int how)
        if (!irq_ptr)
                return -ENODEV;
 
-       sprintf(dbf_text,"qcln%4x",irq_ptr->irq);
+       sprintf(dbf_text,"qcln%4x",irq_ptr->schid.sch_no);
        QDIO_DBF_TEXT1(0,trace,dbf_text);
        QDIO_DBF_TEXT0(0,setup,dbf_text);
 
@@ -2274,7 +2626,7 @@ qdio_shutdown(struct ccw_device *cdev, int how)
 
        down(&irq_ptr->setting_up_sema);
 
-       sprintf(dbf_text,"qsqs%4x",irq_ptr->irq);
+       sprintf(dbf_text,"qsqs%4x",irq_ptr->schid.sch_no);
        QDIO_DBF_TEXT1(0,trace,dbf_text);
        QDIO_DBF_TEXT0(0,setup,dbf_text);
 
@@ -2380,7 +2732,7 @@ qdio_free(struct ccw_device *cdev)
 
        down(&irq_ptr->setting_up_sema);
 
-       sprintf(dbf_text,"qfqs%4x",irq_ptr->irq);
+       sprintf(dbf_text,"qfqs%4x",irq_ptr->schid.sch_no);
        QDIO_DBF_TEXT1(0,trace,dbf_text);
        QDIO_DBF_TEXT0(0,setup,dbf_text);
 
@@ -2528,13 +2880,14 @@ qdio_establish_irq_check_for_errors(struct ccw_device *cdev, int cstat,
        irq_ptr = cdev->private->qdio_data;
 
        if (cstat || (dstat & ~(DEV_STAT_CHN_END|DEV_STAT_DEV_END))) {
-               sprintf(dbf_text,"ick1%4x",irq_ptr->irq);
+               sprintf(dbf_text,"ick1%4x",irq_ptr->schid.sch_no);
                QDIO_DBF_TEXT2(1,trace,dbf_text);
                QDIO_DBF_HEX2(0,trace,&dstat,sizeof(int));
                QDIO_DBF_HEX2(0,trace,&cstat,sizeof(int));
                QDIO_PRINT_ERR("received check condition on establish " \
-                              "queues on irq 0x%x (cs=x%x, ds=x%x).\n",
-                              irq_ptr->irq,cstat,dstat);
+                              "queues on irq 0.%x.%x (cs=x%x, ds=x%x).\n",
+                              irq_ptr->schid.ssid, irq_ptr->schid.sch_no,
+                              cstat,dstat);
                qdio_set_state(irq_ptr,QDIO_IRQ_STATE_ERR);
        }
        
@@ -2542,9 +2895,10 @@ qdio_establish_irq_check_for_errors(struct ccw_device *cdev, int cstat,
                QDIO_DBF_TEXT2(1,setup,"eq:no de");
                QDIO_DBF_HEX2(0,setup,&dstat, sizeof(dstat));
                QDIO_DBF_HEX2(0,setup,&cstat, sizeof(cstat));
-               QDIO_PRINT_ERR("establish queues on irq %04x: didn't get "
+               QDIO_PRINT_ERR("establish queues on irq 0.%x.%04x: didn't get "
                               "device end: dstat=%02x, cstat=%02x\n",
-                              irq_ptr->irq, dstat, cstat);
+                              irq_ptr->schid.ssid, irq_ptr->schid.sch_no,
+                              dstat, cstat);
                qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
                return 1;
        }
@@ -2553,10 +2907,10 @@ qdio_establish_irq_check_for_errors(struct ccw_device *cdev, int cstat,
                QDIO_DBF_TEXT2(1,setup,"eq:badio");
                QDIO_DBF_HEX2(0,setup,&dstat, sizeof(dstat));
                QDIO_DBF_HEX2(0,setup,&cstat, sizeof(cstat));
-               QDIO_PRINT_ERR("establish queues on irq %04x: got "
+               QDIO_PRINT_ERR("establish queues on irq 0.%x.%04x: got "
                               "the following devstat: dstat=%02x, "
-                              "cstat=%02x\n",
-                              irq_ptr->irq, dstat, cstat);
+                              "cstat=%02x\n", irq_ptr->schid.ssid,
+                              irq_ptr->schid.sch_no, dstat, cstat);
                qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
                return 1;
        }
@@ -2571,7 +2925,7 @@ qdio_establish_handle_irq(struct ccw_device *cdev, int cstat, int dstat)
 
        irq_ptr = cdev->private->qdio_data;
 
-       sprintf(dbf_text,"qehi%4x",cdev->private->irq);
+       sprintf(dbf_text,"qehi%4x",cdev->private->sch_no);
        QDIO_DBF_TEXT0(0,setup,dbf_text);
        QDIO_DBF_TEXT0(0,trace,dbf_text);
 
@@ -2590,7 +2944,7 @@ qdio_initialize(struct qdio_initialize *init_data)
        int rc;
        char dbf_text[15];
 
-       sprintf(dbf_text,"qini%4x",init_data->cdev->private->irq);
+       sprintf(dbf_text,"qini%4x",init_data->cdev->private->sch_no);
        QDIO_DBF_TEXT0(0,setup,dbf_text);
        QDIO_DBF_TEXT0(0,trace,dbf_text);
 
@@ -2611,7 +2965,7 @@ qdio_allocate(struct qdio_initialize *init_data)
        struct qdio_irq *irq_ptr;
        char dbf_text[15];
 
-       sprintf(dbf_text,"qalc%4x",init_data->cdev->private->irq);
+       sprintf(dbf_text,"qalc%4x",init_data->cdev->private->sch_no);
        QDIO_DBF_TEXT0(0,setup,dbf_text);
        QDIO_DBF_TEXT0(0,trace,dbf_text);
        if ( (init_data->no_input_qs>QDIO_MAX_QUEUES_PER_IRQ) ||
@@ -2629,7 +2983,7 @@ qdio_allocate(struct qdio_initialize *init_data)
        qdio_allocate_do_dbf(init_data);
 
        /* create irq */
-       irq_ptr=kmalloc(sizeof(struct qdio_irq), GFP_KERNEL | GFP_DMA);
+       irq_ptr = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
 
        QDIO_DBF_TEXT0(0,setup,"irq_ptr:");
        QDIO_DBF_HEX0(0,setup,&irq_ptr,sizeof(void*));
@@ -2639,14 +2993,12 @@ qdio_allocate(struct qdio_initialize *init_data)
                return -ENOMEM;
        }
 
-       memset(irq_ptr,0,sizeof(struct qdio_irq));
-
        init_MUTEX(&irq_ptr->setting_up_sema);
 
        /* QDR must be in DMA area since CCW data address is only 32 bit */
        irq_ptr->qdr=kmalloc(sizeof(struct qdr), GFP_KERNEL | GFP_DMA);
        if (!(irq_ptr->qdr)) {
-               kfree(irq_ptr);
+               free_page((unsigned long) irq_ptr);
                QDIO_PRINT_ERR("kmalloc of irq_ptr->qdr failed!\n");
                return -ENOMEM;
                }
@@ -2684,7 +3036,7 @@ int qdio_fill_irq(struct qdio_initialize *init_data)
 
        irq_ptr->int_parm=init_data->int_parm;
 
-       irq_ptr->irq = init_data->cdev->private->irq;
+       irq_ptr->schid = ccw_device_get_subchannel_id(init_data->cdev);
        irq_ptr->no_input_qs=init_data->no_input_qs;
        irq_ptr->no_output_qs=init_data->no_output_qs;
 
@@ -2700,11 +3052,12 @@ int qdio_fill_irq(struct qdio_initialize *init_data)
        QDIO_DBF_TEXT2(0,setup,dbf_text);
 
        if (irq_ptr->is_thinint_irq) {
-               irq_ptr->dev_st_chg_ind=qdio_get_indicator();
+               irq_ptr->dev_st_chg_ind = qdio_get_indicator();
                QDIO_DBF_HEX1(0,setup,&irq_ptr->dev_st_chg_ind,sizeof(void*));
                if (!irq_ptr->dev_st_chg_ind) {
                        QDIO_PRINT_WARN("no indicator location available " \
-                                       "for irq 0x%x\n",irq_ptr->irq);
+                                       "for irq 0.%x.%x\n",
+                                       irq_ptr->schid.ssid, irq_ptr->schid.sch_no);
                        qdio_release_irq_memory(irq_ptr);
                        return -ENOBUFS;
                }
@@ -2749,6 +3102,10 @@ int qdio_fill_irq(struct qdio_initialize *init_data)
        irq_ptr->qdr->qkey=QDIO_STORAGE_KEY;
 
        /* fill in qib */
+       irq_ptr->is_qebsm = is_passthrough;
+       if (irq_ptr->is_qebsm)
+               irq_ptr->qib.rflags |= QIB_RFLAGS_ENABLE_QEBSM;
+
        irq_ptr->qib.qfmt=init_data->q_format;
        if (init_data->no_input_qs)
                irq_ptr->qib.isliba=(unsigned long)(irq_ptr->input_qs[0]->slib);
@@ -2831,7 +3188,7 @@ qdio_establish(struct qdio_initialize *init_data)
                tiqdio_set_delay_target(irq_ptr,TIQDIO_DELAY_TARGET);
        }
 
-       sprintf(dbf_text,"qest%4x",cdev->private->irq);
+       sprintf(dbf_text,"qest%4x",cdev->private->sch_no);
        QDIO_DBF_TEXT0(0,setup,dbf_text);
        QDIO_DBF_TEXT0(0,trace,dbf_text);
 
@@ -2857,9 +3214,10 @@ qdio_establish(struct qdio_initialize *init_data)
                        sprintf(dbf_text,"eq:io%4x",result);
                        QDIO_DBF_TEXT2(1,setup,dbf_text);
                }
-               QDIO_PRINT_WARN("establish queues on irq %04x: do_IO " \
-                           "returned %i, next try returned %i\n",
-                           irq_ptr->irq,result,result2);
+               QDIO_PRINT_WARN("establish queues on irq 0.%x.%04x: do_IO " \
+                               "returned %i, next try returned %i\n",
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no,
+                               result, result2);
                result=result2;
                if (result)
                        ccw_device_set_timeout(cdev, 0);
@@ -2873,10 +3231,10 @@ qdio_establish(struct qdio_initialize *init_data)
                return result;
        }
        
-       wait_event_interruptible_timeout(cdev->private->wait_q,
+       /* Timeout is cared for already by using ccw_device_start_timeout(). */
+       wait_event_interruptible(cdev->private->wait_q,
                 irq_ptr->state == QDIO_IRQ_STATE_ESTABLISHED ||
-                irq_ptr->state == QDIO_IRQ_STATE_ERR,
-                QDIO_ESTABLISH_TIMEOUT);
+                irq_ptr->state == QDIO_IRQ_STATE_ERR);
 
        if (irq_ptr->state == QDIO_IRQ_STATE_ESTABLISHED)
                result = 0;
@@ -2886,7 +3244,7 @@ qdio_establish(struct qdio_initialize *init_data)
                return -EIO;
        }
 
-       irq_ptr->qdioac=qdio_check_siga_needs(irq_ptr->irq);
+       qdio_get_ssqd_information(irq_ptr);
        /* if this gets set once, we're running under VM and can omit SVSes */
        if (irq_ptr->qdioac&CHSC_FLAG_SIGA_SYNC_NECESSARY)
                omit_svs=1;
@@ -2932,7 +3290,7 @@ qdio_activate(struct ccw_device *cdev, int flags)
                goto out;
        }
 
-       sprintf(dbf_text,"qact%4x", irq_ptr->irq);
+       sprintf(dbf_text,"qact%4x", irq_ptr->schid.sch_no);
        QDIO_DBF_TEXT2(0,setup,dbf_text);
        QDIO_DBF_TEXT2(0,trace,dbf_text);
 
@@ -2957,9 +3315,10 @@ qdio_activate(struct ccw_device *cdev, int flags)
                        sprintf(dbf_text,"aq:io%4x",result);
                        QDIO_DBF_TEXT2(1,setup,dbf_text);
                }
-               QDIO_PRINT_WARN("activate queues on irq %04x: do_IO " \
-                           "returned %i, next try returned %i\n",
-                           irq_ptr->irq,result,result2);
+               QDIO_PRINT_WARN("activate queues on irq 0.%x.%04x: do_IO " \
+                               "returned %i, next try returned %i\n",
+                               irq_ptr->schid.ssid, irq_ptr->schid.sch_no,
+                               result, result2);
                result=result2;
        }
 
@@ -3017,30 +3376,40 @@ static inline void
 qdio_do_qdio_fill_input(struct qdio_q *q, unsigned int qidx,
                        unsigned int count, struct qdio_buffer *buffers)
 {
+       struct qdio_irq *irq = (struct qdio_irq *) q->irq_ptr;
+       qidx &= (QDIO_MAX_BUFFERS_PER_Q - 1);
+       if (irq->is_qebsm) {
+               while (count)
+                       set_slsb(q, &qidx, SLSB_CU_INPUT_EMPTY, &count);
+               return;
+       }
        for (;;) {
-               set_slsb(&q->slsb.acc.val[qidx],SLSB_CU_INPUT_EMPTY);
+               set_slsb(q, &qidx, SLSB_CU_INPUT_EMPTY, &count);
                count--;
                if (!count) break;
-               qidx=(qidx+1)&(QDIO_MAX_BUFFERS_PER_Q-1);
+               qidx = (qidx + 1) & (QDIO_MAX_BUFFERS_PER_Q - 1);
        }
-
-       /* not necessary, as the queues are synced during the SIGA read */
-       /*SYNC_MEMORY;*/
 }
 
 static inline void
 qdio_do_qdio_fill_output(struct qdio_q *q, unsigned int qidx,
                         unsigned int count, struct qdio_buffer *buffers)
 {
+       struct qdio_irq *irq = (struct qdio_irq *) q->irq_ptr;
+
+       qidx &= (QDIO_MAX_BUFFERS_PER_Q - 1);
+       if (irq->is_qebsm) {
+               while (count)
+                       set_slsb(q, &qidx, SLSB_CU_OUTPUT_PRIMED, &count);
+               return;
+       }
+
        for (;;) {
-               set_slsb(&q->slsb.acc.val[qidx],SLSB_CU_OUTPUT_PRIMED);
+               set_slsb(q, &qidx, SLSB_CU_OUTPUT_PRIMED, &count);
                count--;
                if (!count) break;
-               qidx=(qidx+1)&(QDIO_MAX_BUFFERS_PER_Q-1);
+               qidx = (qidx + 1) & (QDIO_MAX_BUFFERS_PER_Q - 1);
        }
-
-       /* SIGA write will sync the queues */
-       /*SYNC_MEMORY;*/
 }
 
 static inline void
@@ -3085,6 +3454,9 @@ do_qdio_handle_outbound(struct qdio_q *q, unsigned int callflags,
                        struct qdio_buffer *buffers)
 {
        int used_elements;
+       unsigned int cnt, start_buf;
+       unsigned char state = 0;
+       struct qdio_irq *irq = (struct qdio_irq *) q->irq_ptr;
 
        /* This is the outbound handling of queues */
 #ifdef QDIO_PERFORMANCE_STATS
@@ -3117,9 +3489,15 @@ do_qdio_handle_outbound(struct qdio_q *q, unsigned int callflags,
                         * SYNC_MEMORY :-/ ), we try to
                         * fast-requeue buffers 
                         */
-                       if (q->slsb.acc.val[(qidx+QDIO_MAX_BUFFERS_PER_Q-1)
-                                           &(QDIO_MAX_BUFFERS_PER_Q-1)]!=
-                           SLSB_CU_OUTPUT_PRIMED) {
+                       if (irq->is_qebsm) {
+                               cnt = 1;
+                               start_buf = ((qidx+QDIO_MAX_BUFFERS_PER_Q-1) &
+                                            (QDIO_MAX_BUFFERS_PER_Q-1));
+                               qdio_do_eqbs(q, &state, &start_buf, &cnt);
+                       } else
+                               state = q->slsb.acc.val[(qidx+QDIO_MAX_BUFFERS_PER_Q-1)
+                                       &(QDIO_MAX_BUFFERS_PER_Q-1) ];
+                        if (state != SLSB_CU_OUTPUT_PRIMED) {
                                qdio_kick_outbound_q(q);
                        } else {
                                QDIO_DBF_TEXT3(0,trace, "fast-req");
@@ -3152,7 +3530,7 @@ do_QDIO(struct ccw_device *cdev,unsigned int callflags,
 #ifdef CONFIG_QDIO_DEBUG
        char dbf_text[20];
 
-       sprintf(dbf_text,"doQD%04x",cdev->private->irq);
+       sprintf(dbf_text,"doQD%04x",cdev->private->sch_no);
        QDIO_DBF_TEXT3(0,trace,dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
 
@@ -3305,18 +3683,17 @@ qdio_get_qdio_memory(void)
 
        for (i=1;i<INDICATORS_PER_CACHELINE;i++)
                indicator_used[i]=0;
-       indicators=(__u32*)kmalloc(sizeof(__u32)*(INDICATORS_PER_CACHELINE),
+       indicators = kzalloc(sizeof(__u32)*(INDICATORS_PER_CACHELINE),
                                   GFP_KERNEL);
-               if (!indicators) return -ENOMEM;
-       memset(indicators,0,sizeof(__u32)*(INDICATORS_PER_CACHELINE));
+               if (!indicators)
+               return -ENOMEM;
        return 0;
 }
 
 static void
 qdio_release_qdio_memory(void)
 {
-       if (indicators)
-               kfree(indicators);
+       kfree(indicators);
 }
 
 static void
@@ -3342,7 +3719,7 @@ static int
 qdio_register_dbf_views(void)
 {
        qdio_dbf_setup=debug_register(QDIO_DBF_SETUP_NAME,
-                                     QDIO_DBF_SETUP_INDEX,
+                                     QDIO_DBF_SETUP_PAGES,
                                      QDIO_DBF_SETUP_NR_AREAS,
                                      QDIO_DBF_SETUP_LEN);
        if (!qdio_dbf_setup)
@@ -3351,7 +3728,7 @@ qdio_register_dbf_views(void)
        debug_set_level(qdio_dbf_setup,QDIO_DBF_SETUP_LEVEL);
 
        qdio_dbf_sbal=debug_register(QDIO_DBF_SBAL_NAME,
-                                    QDIO_DBF_SBAL_INDEX,
+                                    QDIO_DBF_SBAL_PAGES,
                                     QDIO_DBF_SBAL_NR_AREAS,
                                     QDIO_DBF_SBAL_LEN);
        if (!qdio_dbf_sbal)
@@ -3361,7 +3738,7 @@ qdio_register_dbf_views(void)
        debug_set_level(qdio_dbf_sbal,QDIO_DBF_SBAL_LEVEL);
 
        qdio_dbf_sense=debug_register(QDIO_DBF_SENSE_NAME,
-                                     QDIO_DBF_SENSE_INDEX,
+                                     QDIO_DBF_SENSE_PAGES,
                                      QDIO_DBF_SENSE_NR_AREAS,
                                      QDIO_DBF_SENSE_LEN);
        if (!qdio_dbf_sense)
@@ -3371,7 +3748,7 @@ qdio_register_dbf_views(void)
        debug_set_level(qdio_dbf_sense,QDIO_DBF_SENSE_LEVEL);
 
        qdio_dbf_trace=debug_register(QDIO_DBF_TRACE_NAME,
-                                     QDIO_DBF_TRACE_INDEX,
+                                     QDIO_DBF_TRACE_PAGES,
                                      QDIO_DBF_TRACE_NR_AREAS,
                                      QDIO_DBF_TRACE_LEN);
        if (!qdio_dbf_trace)
@@ -3382,7 +3759,7 @@ qdio_register_dbf_views(void)
 
 #ifdef CONFIG_QDIO_DEBUG
         qdio_dbf_slsb_out=debug_register(QDIO_DBF_SLSB_OUT_NAME,
-                                         QDIO_DBF_SLSB_OUT_INDEX,
+                                         QDIO_DBF_SLSB_OUT_PAGES,
                                          QDIO_DBF_SLSB_OUT_NR_AREAS,
                                          QDIO_DBF_SLSB_OUT_LEN);
         if (!qdio_dbf_slsb_out)
@@ -3391,7 +3768,7 @@ qdio_register_dbf_views(void)
         debug_set_level(qdio_dbf_slsb_out,QDIO_DBF_SLSB_OUT_LEVEL);
 
         qdio_dbf_slsb_in=debug_register(QDIO_DBF_SLSB_IN_NAME,
-                                        QDIO_DBF_SLSB_IN_INDEX,
+                                        QDIO_DBF_SLSB_IN_PAGES,
                                         QDIO_DBF_SLSB_IN_NR_AREAS,
                                         QDIO_DBF_SLSB_IN_LEN);
         if (!qdio_dbf_slsb_in)
@@ -3406,6 +3783,16 @@ oom:
        return -ENOMEM;
 }
 
+static void *qdio_mempool_alloc(gfp_t gfp_mask, void *size)
+{
+       return (void *) get_zeroed_page(gfp_mask|GFP_DMA);
+}
+
+static void qdio_mempool_free(void *element, void *size)
+{
+       free_page((unsigned long) element);
+}
+
 static int __init
 init_QDIO(void)
 {
@@ -3435,6 +3822,10 @@ init_QDIO(void)
 
        qdio_add_procfs_entry();
 
+       qdio_mempool_scssc = mempool_create(QDIO_MEMPOOL_SCSSC_ELEMENTS,
+                                           qdio_mempool_alloc,
+                                           qdio_mempool_free, NULL);
+
        if (tiqdio_check_chsc_availability())
                QDIO_PRINT_ERR("Not all CHSCs supported. Continuing.\n");
 
@@ -3450,6 +3841,7 @@ cleanup_QDIO(void)
        qdio_remove_procfs_entry();
        qdio_release_qdio_memory();
        qdio_unregister_dbf_views();
+       mempool_destroy(qdio_mempool_scssc);
 
        printk("qdio: %s: module removed\n",version);
 }