1 files changed, 15 insertions, 84 deletions

diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 16ecd35b8e5..89107d0938c 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -1,12 +1,13 @@
 /*
+ * driver/s390/cio/qdio_setup.c
+ *
  * qdio queue initialization
  *
- * Copyright IBM Corp. 2008
+ * Copyright (C) IBM Corp. 2008
  * Author(s): Jan Glauber <jang@linux.vnet.ibm.com>
  */
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/export.h>
 #include <asm/qdio.h>
 
 #include "cio.h"
@@ -18,19 +19,6 @@
 #include "qdio_debug.h"
 
 static struct kmem_cache *qdio_q_cache;
-static struct kmem_cache *qdio_aob_cache;
-
-struct qaob *qdio_allocate_aob(void)
-{
-        return kmem_cache_zalloc(qdio_aob_cache, GFP_ATOMIC);
-}
-EXPORT_SYMBOL_GPL(qdio_allocate_aob);
-
-void qdio_release_aob(struct qaob *aob)
-{
-        kmem_cache_free(qdio_aob_cache, aob);
-}
-EXPORT_SYMBOL_GPL(qdio_release_aob);
 
 /*
  * qebsm is only available under 64bit but the adapter sets the feature
@@ -140,8 +128,10 @@ static void setup_storage_lists(struct qdio_q *q, struct qdio_irq *irq_ptr,
         q->sl = (struct sl *)((char *)q->slib + PAGE_SIZE / 2);
 
         /* fill in sbal */
-        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++)
+        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++) {
                 q->sbal[j] = *sbals_array++;
+                BUG_ON((unsigned long)q->sbal[j] & 0xff);
+        }
 
         /* fill in slib */
         if (i > 0) {
@@ -164,37 +154,29 @@ static void setup_queues(struct qdio_irq *irq_ptr,
         struct qdio_q *q;
         void **input_sbal_array = qdio_init->input_sbal_addr_array;
         void **output_sbal_array = qdio_init->output_sbal_addr_array;
-        struct qdio_outbuf_state *output_sbal_state_array =
-                                  qdio_init->output_sbal_state_array;
         int i;
 
         for_each_input_queue(irq_ptr, q, i) {
-                DBF_EVENT("inq:%1d", i);
+                DBF_EVENT("in-q:%1d", i);
                 setup_queues_misc(q, irq_ptr, qdio_init->input_handler, i);
 
                 q->is_input_q = 1;
-                q->u.in.queue_start_poll = qdio_init->queue_start_poll_array ?
-                                qdio_init->queue_start_poll_array[i] : NULL;
-
+                q->u.in.queue_start_poll = qdio_init->queue_start_poll;
                 setup_storage_lists(q, irq_ptr, input_sbal_array, i);
                 input_sbal_array += QDIO_MAX_BUFFERS_PER_Q;
 
-                if (is_thinint_irq(irq_ptr)) {
+                if (is_thinint_irq(irq_ptr))
                         tasklet_init(&q->tasklet, tiqdio_inbound_processing,
                                      (unsigned long) q);
-                } else {
+                else
                         tasklet_init(&q->tasklet, qdio_inbound_processing,
                                      (unsigned long) q);
-                }
         }
 
         for_each_output_queue(irq_ptr, q, i) {
                 DBF_EVENT("outq:%1d", i);
                 setup_queues_misc(q, irq_ptr, qdio_init->output_handler, i);
 
-                q->u.out.sbal_state = output_sbal_state_array;
-                output_sbal_state_array += QDIO_MAX_BUFFERS_PER_Q;
-
                 q->is_input_q = 0;
                 q->u.out.scan_threshold = qdio_init->scan_threshold;
                 setup_storage_lists(q, irq_ptr, output_sbal_array, i);
@@ -307,8 +289,7 @@ void qdio_setup_ssqd_info(struct qdio_irq *irq_ptr)
 
         check_and_setup_qebsm(irq_ptr, qdioac, irq_ptr->ssqd_desc.sch_token);
         process_ac_flags(irq_ptr, qdioac);
-        DBF_EVENT("ac 1:%2x 2:%4x", qdioac, irq_ptr->ssqd_desc.qdioac2);
-        DBF_EVENT("3:%4x qib:%4x", irq_ptr->ssqd_desc.qdioac3, irq_ptr->qib.ac);
+        DBF_EVENT("qdioac:%4x", qdioac);
 }
 
 void qdio_release_memory(struct qdio_irq *irq_ptr)
@@ -330,19 +311,6 @@ void qdio_release_memory(struct qdio_irq *irq_ptr)
         for (i = 0; i < QDIO_MAX_QUEUES_PER_IRQ; i++) {
                 q = irq_ptr->output_qs[i];
                 if (q) {
-                        if (q->u.out.use_cq) {
-                                int n;
-
-                                for (n = 0; n < QDIO_MAX_BUFFERS_PER_Q; ++n) {
-                                        struct qaob *aob = q->u.out.aobs[n];
-                                        if (aob) {
-                                                qdio_release_aob(aob);
-                                                q->u.out.aobs[n] = NULL;
-                                        }
-                                }
-
-                                qdio_disable_async_operation(&q->u.out);
-                        }
                         free_page((unsigned long) q->slib);
                         kmem_cache_free(qdio_q_cache, q);
                 }
@@ -377,7 +345,6 @@ static void setup_qdr(struct qdio_irq *irq_ptr,
         int i;
 
         irq_ptr->qdr->qfmt = qdio_init->q_format;
-        irq_ptr->qdr->ac = qdio_init->qdr_ac;
         irq_ptr->qdr->iqdcnt = qdio_init->no_input_qs;
         irq_ptr->qdr->oqdcnt = qdio_init->no_output_qs;
         irq_ptr->qdr->iqdsz = sizeof(struct qdesfmt0) / 4; /* size in words */
@@ -432,8 +399,9 @@ int qdio_setup_irq(struct qdio_initialize *init_data)
         irq_ptr->int_parm = init_data->int_parm;
         irq_ptr->nr_input_qs = init_data->no_input_qs;
         irq_ptr->nr_output_qs = init_data->no_output_qs;
+
+        irq_ptr->schid = ccw_device_get_subchannel_id(init_data->cdev);
         irq_ptr->cdev = init_data->cdev;
-        ccw_device_get_schid(irq_ptr->cdev, &irq_ptr->schid);
         setup_queues(irq_ptr, init_data);
 
         setup_qib(irq_ptr, init_data);
@@ -480,7 +448,7 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
         char s[80];
 
         snprintf(s, 80, "qdio: %s %s on SC %x using "
-                 "AI:%d QEBSM:%d PRI:%d TDD:%d SIGA:%s%s%s%s%s\n",
+                 "AI:%d QEBSM:%d PCI:%d TDD:%d SIGA:%s%s%s%s%s\n",
                  dev_name(&cdev->dev),
                  (irq_ptr->qib.qfmt == QDIO_QETH_QFMT) ? "OSA" :
                         ((irq_ptr->qib.qfmt == QDIO_ZFCP_QFMT) ? "ZFCP" : "HS"),
@@ -497,60 +465,23 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
         printk(KERN_INFO "%s", s);
 }
 
-int qdio_enable_async_operation(struct qdio_output_q *outq)
-{
-        outq->aobs = kzalloc(sizeof(struct qaob *) * QDIO_MAX_BUFFERS_PER_Q,
-                             GFP_ATOMIC);
-        if (!outq->aobs) {
-                outq->use_cq = 0;
-                return -ENOMEM;
-        }
-        outq->use_cq = 1;
-        return 0;
-}
-
-void qdio_disable_async_operation(struct qdio_output_q *q)
-{
-        kfree(q->aobs);
-        q->aobs = NULL;
-        q->use_cq = 0;
-}
-
 int __init qdio_setup_init(void)
 {
-        int rc;
-
         qdio_q_cache = kmem_cache_create("qdio_q", sizeof(struct qdio_q),
                                          256, 0, NULL);
         if (!qdio_q_cache)
                 return -ENOMEM;
 
-        qdio_aob_cache = kmem_cache_create("qdio_aob",
-                                        sizeof(struct qaob),
-                                        sizeof(struct qaob),
-                                        0,
-                                        NULL);
-        if (!qdio_aob_cache) {
-                rc = -ENOMEM;
-                goto free_qdio_q_cache;
-        }
-
         /* Check for OSA/FCP thin interrupts (bit 67). */
         DBF_EVENT("thinint:%1d",
                   (css_general_characteristics.aif_osa) ? 1 : 0);
 
         /* Check for QEBSM support in general (bit 58). */
         DBF_EVENT("cssQEBSM:%1d", (qebsm_possible()) ? 1 : 0);
-        rc = 0;
-out:
-        return rc;
-free_qdio_q_cache:
-        kmem_cache_destroy(qdio_q_cache);
-        goto out;
+        return 0;
 }
 
 void qdio_setup_exit(void)
 {
-        kmem_cache_destroy(qdio_aob_cache);
         kmem_cache_destroy(qdio_q_cache);
 }