Merge branch 'master' into upstream

[pandora-kernel.git] / drivers / infiniband / hw / ehca / ehca_irq.c

diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index 2a65b5b..6c4f9f9 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -45,6 +45,7 @@
 #include "ehca_tools.h"
 #include "hcp_if.h"
 #include "hipz_fns.h"
+#include "ipz_pt_fn.h"
 
 #define EQE_COMPLETION_EVENT   EHCA_BMASK_IBM(1,1)
 #define EQE_CQ_QP_NUMBER       EHCA_BMASK_IBM(8,31)
@@ -137,38 +138,36 @@ int ehca_error_data(struct ehca_shca *shca, void *data,
        u64 *rblock;
        unsigned long block_count;
 
-       rblock = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL);
+       rblock = ehca_alloc_fw_ctrlblock(GFP_ATOMIC);
        if (!rblock) {
                ehca_err(&shca->ib_device, "Cannot allocate rblock memory.");
                ret = -ENOMEM;
                goto error_data1;
        }
 
+       /* rblock must be 4K aligned and should be 4K large */
        ret = hipz_h_error_data(shca->ipz_hca_handle,
                                resource,
                                rblock,
                                &block_count);
 
-       if (ret == H_R_STATE) {
+       if (ret == H_R_STATE)
                ehca_err(&shca->ib_device,
                         "No error data is available: %lx.", resource);
-       }
        else if (ret == H_SUCCESS) {
                int length;
 
                length = EHCA_BMASK_GET(ERROR_DATA_LENGTH, rblock[0]);
 
-               if (length > PAGE_SIZE)
-                       length = PAGE_SIZE;
+               if (length > EHCA_PAGESIZE)
+                       length = EHCA_PAGESIZE;
 
                print_error_data(shca, data, rblock, length);
-       }
-       else {
+       } else
                ehca_err(&shca->ib_device,
                         "Error data could not be fetched: %lx", resource);
-       }
 
-       kfree(rblock);
+       ehca_free_fw_ctrlblock(rblock);
 
 error_data1:
        return ret;
@@ -360,7 +359,7 @@ static inline void reset_eq_pending(struct ehca_cq *cq)
        return;
 }
 
-irqreturn_t ehca_interrupt_neq(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t ehca_interrupt_neq(int irq, void *dev_id)
 {
        struct ehca_shca *shca = (struct ehca_shca*)dev_id;
 
@@ -393,7 +392,7 @@ void ehca_tasklet_neq(unsigned long data)
        return;
 }
 
-irqreturn_t ehca_interrupt_eq(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t ehca_interrupt_eq(int irq, void *dev_id)
 {
        struct ehca_shca *shca = (struct ehca_shca*)dev_id;
 
@@ -441,7 +440,8 @@ void ehca_tasklet_eq(unsigned long data)
                                        cq = idr_find(&ehca_cq_idr, token);
 
                                        if (cq == NULL) {
-                                               spin_unlock(&ehca_cq_idr_lock);
+                                               spin_unlock_irqrestore(&ehca_cq_idr_lock,
+                                                                      flags);
                                                break;
                                        }
 
@@ -756,6 +756,8 @@ void ehca_destroy_comp_pool(void)
                if (cpu_online(i))
                        destroy_comp_task(pool, i);
        }
+       free_percpu(pool->cpu_comp_tasks);
+       kfree(pool);
 #endif
 
        return;