Merge tag 'wberr-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

[sfrench/cifs-2.6.git] / drivers / infiniband / hw / hfi1 / vnic_main.c

diff --git a/drivers/infiniband/hw/hfi1/vnic_main.c b/drivers/infiniband/hw/hfi1/vnic_main.c
index 89b056489769cf6c076ae079e240b4173d590b3b..f419cbb0592889de1386eb1de364f4436024b41d 100644 (file)
--- a/drivers/infiniband/hw/hfi1/vnic_main.c
+++ b/drivers/infiniband/hw/hfi1/vnic_main.c
@@ -106,22 +106,13 @@ static int allocate_vnic_ctxt(struct hfi1_devdata *dd,
                              struct hfi1_ctxtdata **vnic_ctxt)
 {
        struct hfi1_ctxtdata *uctxt;
-       u16 ctxt;
        int ret;
 
        if (dd->flags & HFI1_FROZEN)
                return -EIO;
 
-       for (ctxt = dd->first_dyn_alloc_ctxt;
-            ctxt < dd->num_rcv_contexts; ctxt++)
-               if (!dd->rcd[ctxt])
-                       break;
-
-       if (ctxt == dd->num_rcv_contexts)
-               return -EBUSY;
-
-       uctxt = hfi1_create_ctxtdata(dd->pport, ctxt, dd->node);
-       if (!uctxt) {
+       ret = hfi1_create_ctxtdata(dd->pport, dd->node, &uctxt);
+       if (ret < 0) {
                dd_dev_err(dd, "Unable to create ctxtdata, failing open\n");
                return -ENOMEM;
        }
@@ -155,12 +146,7 @@ static int allocate_vnic_ctxt(struct hfi1_devdata *dd,
 
        return ret;
 bail:
-       /*
-        * hfi1_rcd_put() will call hfi1_free_ctxtdata(), which will
-        * release send_context structure if uctxt->sc is not null
-        */
-       dd->rcd[uctxt->ctxt] = NULL;
-       hfi1_rcd_put(uctxt);
+       hfi1_free_ctxt(uctxt);
        dd_dev_dbg(dd, "vnic allocation failed. rc %d\n", ret);
        return ret;
 }
@@ -168,15 +154,12 @@ bail:
 static void deallocate_vnic_ctxt(struct hfi1_devdata *dd,
                                 struct hfi1_ctxtdata *uctxt)
 {
-       unsigned long flags;
-
        dd_dev_dbg(dd, "closing vnic context %d\n", uctxt->ctxt);
        flush_wc();
 
        if (dd->num_msix_entries)
                hfi1_reset_vnic_msix_info(uctxt);
 
-       spin_lock_irqsave(&dd->uctxt_lock, flags);
        /*
         * Disable receive context and interrupt available, reset all
         * RcvCtxtCtrl bits to default values.
@@ -199,16 +182,15 @@ static void deallocate_vnic_ctxt(struct hfi1_devdata *dd,
        sc_disable(uctxt->sc);
 
        dd->send_contexts[uctxt->sc->sw_index].type = SC_USER;
-       spin_unlock_irqrestore(&dd->uctxt_lock, flags);
 
-       dd->rcd[uctxt->ctxt] = NULL;
        uctxt->event_flags = 0;
 
        hfi1_clear_tids(uctxt);
        hfi1_clear_ctxt_pkey(dd, uctxt);
 
        hfi1_stats.sps_ctxts--;
-       hfi1_rcd_put(uctxt);
+
+       hfi1_free_ctxt(uctxt);
 }
 
 void hfi1_vnic_setup(struct hfi1_devdata *dd)
@@ -582,8 +564,8 @@ void hfi1_vnic_bypass_rcv(struct hfi1_packet *packet)
        int l4_type, vesw_id = -1;
        u8 q_idx;
 
-       l4_type = HFI1_GET_L4_TYPE(packet->ebuf);
-       if (likely(l4_type == OPA_VNIC_L4_ETHR)) {
+       l4_type = hfi1_16B_get_l4(packet->ebuf);
+       if (likely(l4_type == OPA_16B_L4_ETHR)) {
                vesw_id = HFI1_VNIC_GET_VESWID(packet->ebuf);
                vinfo = idr_find(&dd->vnic.vesw_idr, vesw_id);