IB/hfi1: Remove unused user context data members

Several data members of the user context have become unused over time.
Cleaning them up.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
index d36e17722e6d100fdb3dc1aee253ec04d8d0a1f2..e10f526d2dc1ffe3e9a5590b70be6edc1fa9e40c 100644 (file)
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -809,10 +809,6 @@ static int hfi1_file_close(struct inode *inode, struct file *fp)
        hfi1_free_ctxt_rcv_groups(uctxt);
        hfi1_clear_ctxt_pkey(dd, uctxt);
 
-       uctxt->rcvwait_to = 0;
-       uctxt->piowait_to = 0;
-       uctxt->rcvnowait = 0;
-       uctxt->pionowait = 0;
        uctxt->event_flags = 0;
        mutex_unlock(&hfi1_mutex);
 
@@ -1067,8 +1063,6 @@ static int allocate_ctxt(struct hfi1_filedata *fd, struct hfi1_devdata *dd,
        strlcpy(uctxt->comm, current->comm, sizeof(uctxt->comm));
        memcpy(uctxt->uuid, uinfo->uuid, sizeof(uctxt->uuid));
        uctxt->jkey = generate_jkey(current_uid());
-       INIT_LIST_HEAD(&uctxt->sdma_queues);
-       spin_lock_init(&uctxt->sdma_qlock);
        hfi1_stats.sps_ctxts++;
        /*
         * Disable ASPM when there are open user/PSM contexts to avoid

diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
index 2e5137b336ced28dbdbaa0581f44a790704aaf7d..7877ebc0b7ae6f2c2a55a5bf5f323136d3dcc23d 100644 (file)
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@ -243,24 +243,10 @@ struct hfi1_ctxtdata {
 
        /* lock protecting all Expected TID data */
        struct mutex exp_lock;
-       /* number of pio bufs for this ctxt (all procs, if shared) */
-       u32 piocnt;
-       /* first pio buffer for this ctxt */
-       u32 pio_base;
-       /* chip offset of PIO buffers for this ctxt */
-       u32 piobufs;
        /* per-context configuration flags */
        unsigned long flags;
        /* per-context event flags for fileops/intr communication */
        unsigned long event_flags;
-       /* WAIT_RCV that timed out, no interrupt */
-       u32 rcvwait_to;
-       /* WAIT_PIO that timed out, no interrupt */
-       u32 piowait_to;
-       /* WAIT_RCV already happened, no wait */
-       u32 rcvnowait;
-       /* WAIT_PIO already happened, no wait */
-       u32 pionowait;
        /* total number of polled urgent packets */
        u32 urgent;
        /* saved total number of polled urgent packets for poll edge trigger */
@@ -290,7 +276,6 @@ struct hfi1_ctxtdata {
        u8 redirect_seq_cnt;
        /* ctxt rcvhdrq head offset */
        u32 head;
-       u32 pkt_count;
        /* QPs waiting for context processing */
        struct list_head qp_wait_list;
        /* interrupt handling */
@@ -299,15 +284,6 @@ struct hfi1_ctxtdata {
        unsigned numa_id; /* numa node of this context */
        /* verbs stats per CTX */
        struct hfi1_opcode_stats_perctx *opstats;
-       /*
-        * This is the kernel thread that will keep making
-        * progress on the user sdma requests behind the scenes.
-        * There is one per context (shared contexts use the master's).
-        */
-       struct task_struct *progress;
-       struct list_head sdma_queues;
-       /* protect sdma queues */
-       spinlock_t sdma_qlock;
 
        /* Is ASPM interrupt supported for this context */
        bool aspm_intr_supported;

diff --git a/drivers/infiniband/hw/hfi1/user_sdma.c b/drivers/infiniband/hw/hfi1/user_sdma.c
index ea2993f93647d5aa491f66b20aa087adbe5e8de4..64d31eb9bd824673e8c613efc127548c20e1fe5c 100644 (file)
--- a/drivers/infiniband/hw/hfi1/user_sdma.c
+++ b/drivers/infiniband/hw/hfi1/user_sdma.c
@@ -346,7 +346,6 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt,
        struct hfi1_devdata *dd;
        struct hfi1_user_sdma_comp_q *cq;
        struct hfi1_user_sdma_pkt_q *pq;
-       unsigned long flags;
 
        if (!uctxt || !fd)
                return -EBADF;
@@ -360,7 +359,6 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt,
        if (!pq)
                return -ENOMEM;
 
-       INIT_LIST_HEAD(&pq->list);
        pq->dd = dd;
        pq->ctxt = uctxt->ctxt;
        pq->subctxt = fd->subctxt;
@@ -421,10 +419,6 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt,
        fd->pq = pq;
        fd->cq = cq;
 
-       spin_lock_irqsave(&uctxt->sdma_qlock, flags);
-       list_add(&pq->list, &uctxt->sdma_queues);
-       spin_unlock_irqrestore(&uctxt->sdma_qlock, flags);
-
        return 0;
 
 pq_mmu_fail:
@@ -447,7 +441,6 @@ int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd)
 {
        struct hfi1_ctxtdata *uctxt = fd->uctxt;
        struct hfi1_user_sdma_pkt_q *pq;
-       unsigned long flags;
 
        hfi1_cdbg(SDMA, "[%u:%u:%u] Freeing user SDMA queues", uctxt->dd->unit,
                  uctxt->ctxt, fd->subctxt);
@@ -455,10 +448,6 @@ int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd)
        if (pq) {
                if (pq->handler)
                        hfi1_mmu_rb_unregister(pq->handler);
-               spin_lock_irqsave(&uctxt->sdma_qlock, flags);
-               if (!list_empty(&pq->list))
-                       list_del_init(&pq->list);
-               spin_unlock_irqrestore(&uctxt->sdma_qlock, flags);
                iowait_sdma_drain(&pq->busy);
                /* Wait until all requests have been freed. */
                wait_event_interruptible(

diff --git a/drivers/infiniband/hw/hfi1/user_sdma.h b/drivers/infiniband/hw/hfi1/user_sdma.h
index e5b10aefe212ae08113854ea4dce4180189b524e..161fdfddbb302ae09cd2a975fe08bf2413867cdc 100644 (file)
--- a/drivers/infiniband/hw/hfi1/user_sdma.h
+++ b/drivers/infiniband/hw/hfi1/user_sdma.h
@@ -56,7 +56,6 @@
 extern uint extended_psn;
 
 struct hfi1_user_sdma_pkt_q {
-       struct list_head list;
        unsigned ctxt;
        u16 subctxt;
        u16 n_max_reqs;