Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6-omap-h63xx.git] / drivers / infiniband / core / verbs.c

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index cae0845f472ac60fd41b4f9684b8111924540484..468999c388033e83f4668f4f43e187f911f7a3ec 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -45,6 +45,40 @@
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_cache.h>
 
+int ib_rate_to_mult(enum ib_rate rate)
+{
+       switch (rate) {
+       case IB_RATE_2_5_GBPS: return  1;
+       case IB_RATE_5_GBPS:   return  2;
+       case IB_RATE_10_GBPS:  return  4;
+       case IB_RATE_20_GBPS:  return  8;
+       case IB_RATE_30_GBPS:  return 12;
+       case IB_RATE_40_GBPS:  return 16;
+       case IB_RATE_60_GBPS:  return 24;
+       case IB_RATE_80_GBPS:  return 32;
+       case IB_RATE_120_GBPS: return 48;
+       default:               return -1;
+       }
+}
+EXPORT_SYMBOL(ib_rate_to_mult);
+
+enum ib_rate mult_to_ib_rate(int mult)
+{
+       switch (mult) {
+       case 1:  return IB_RATE_2_5_GBPS;
+       case 2:  return IB_RATE_5_GBPS;
+       case 4:  return IB_RATE_10_GBPS;
+       case 8:  return IB_RATE_20_GBPS;
+       case 12: return IB_RATE_30_GBPS;
+       case 16: return IB_RATE_40_GBPS;
+       case 24: return IB_RATE_60_GBPS;
+       case 32: return IB_RATE_80_GBPS;
+       case 48: return IB_RATE_120_GBPS;
+       default: return IB_RATE_PORT_CURRENT;
+       }
+}
+EXPORT_SYMBOL(mult_to_ib_rate);
+
 /* Protection domains */
 
 struct ib_pd *ib_alloc_pd(struct ib_device *device)
@@ -91,35 +125,47 @@ struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr)
 }
 EXPORT_SYMBOL(ib_create_ah);
 
-struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, struct ib_wc *wc,
-                                  struct ib_grh *grh, u8 port_num)
+int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc,
+                      struct ib_grh *grh, struct ib_ah_attr *ah_attr)
 {
-       struct ib_ah_attr ah_attr;
        u32 flow_class;
        u16 gid_index;
        int ret;
 
-       memset(&ah_attr, 0, sizeof ah_attr);
-       ah_attr.dlid = wc->slid;
-       ah_attr.sl = wc->sl;
-       ah_attr.src_path_bits = wc->dlid_path_bits;
-       ah_attr.port_num = port_num;
+       memset(ah_attr, 0, sizeof *ah_attr);
+       ah_attr->dlid = wc->slid;
+       ah_attr->sl = wc->sl;
+       ah_attr->src_path_bits = wc->dlid_path_bits;
+       ah_attr->port_num = port_num;
 
        if (wc->wc_flags & IB_WC_GRH) {
-               ah_attr.ah_flags = IB_AH_GRH;
-               ah_attr.grh.dgid = grh->sgid;
+               ah_attr->ah_flags = IB_AH_GRH;
+               ah_attr->grh.dgid = grh->sgid;
 
-               ret = ib_find_cached_gid(pd->device, &grh->dgid, &port_num,
+               ret = ib_find_cached_gid(device, &grh->dgid, &port_num,
                                         &gid_index);
                if (ret)
-                       return ERR_PTR(ret);
+                       return ret;
 
-               ah_attr.grh.sgid_index = (u8) gid_index;
+               ah_attr->grh.sgid_index = (u8) gid_index;
                flow_class = be32_to_cpu(grh->version_tclass_flow);
-               ah_attr.grh.flow_label = flow_class & 0xFFFFF;
-               ah_attr.grh.traffic_class = (flow_class >> 20) & 0xFF;
-               ah_attr.grh.hop_limit = grh->hop_limit;
+               ah_attr->grh.flow_label = flow_class & 0xFFFFF;
+               ah_attr->grh.hop_limit = grh->hop_limit;
+               ah_attr->grh.traffic_class = (flow_class >> 20) & 0xFF;
        }
+       return 0;
+}
+EXPORT_SYMBOL(ib_init_ah_from_wc);
+
+struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, struct ib_wc *wc,
+                                  struct ib_grh *grh, u8 port_num)
+{
+       struct ib_ah_attr ah_attr;
+       int ret;
+
+       ret = ib_init_ah_from_wc(pd->device, port_num, wc, grh, &ah_attr);
+       if (ret)
+               return ERR_PTR(ret);
 
        return ib_create_ah(pd, &ah_attr);
 }