Author: hselasky
Date: Thu May 16 16:29:12 2019
New Revision: 347767
URL: https://svnweb.freebsd.org/changeset/base/347767

Log:
  MFC r347302:
  Add support for 200Gbit speeds to libibverbs.
  
  Submitted by: slavash@
  Sponsored by: Mellanox Technologies

Modified:
  stable/12/contrib/ofed/libibverbs/examples/devinfo.c
  stable/12/contrib/ofed/libibverbs/verbs.c
  stable/12/contrib/ofed/libibverbs/verbs.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/contrib/ofed/libibverbs/examples/devinfo.c
==============================================================================
--- stable/12/contrib/ofed/libibverbs/examples/devinfo.c        Thu May 16 
16:27:21 2019        (r347766)
+++ stable/12/contrib/ofed/libibverbs/examples/devinfo.c        Thu May 16 
16:29:12 2019        (r347767)
@@ -128,6 +128,7 @@ static const char *width_str(uint8_t width)
        case 2:  return "4";
        case 4:  return "8";
        case 8:  return "12";
+       case 16:  return "2";
        default: return "invalid width";
        }
 }
@@ -143,6 +144,7 @@ static const char *speed_str(uint8_t speed)
 
        case 16: return "14.0 Gbps";
        case 32: return "25.0 Gbps";
+       case 64: return "50.0 Gbps";
        default: return "invalid speed";
        }
 }

Modified: stable/12/contrib/ofed/libibverbs/verbs.c
==============================================================================
--- stable/12/contrib/ofed/libibverbs/verbs.c   Thu May 16 16:27:21 2019        
(r347766)
+++ stable/12/contrib/ofed/libibverbs/verbs.c   Thu May 16 16:29:12 2019        
(r347767)
@@ -111,6 +111,10 @@ int __attribute__((const)) ibv_rate_to_mult(enum ibv_r
        case IBV_RATE_60_GBPS:  return 24;
        case IBV_RATE_80_GBPS:  return 32;
        case IBV_RATE_120_GBPS: return 48;
+       case IBV_RATE_28_GBPS:  return 11;
+       case IBV_RATE_50_GBPS:  return 20;
+       case IBV_RATE_400_GBPS: return 160;
+       case IBV_RATE_600_GBPS: return 240;
        default:           return -1;
        }
 }
@@ -127,6 +131,10 @@ enum ibv_rate __attribute__((const)) mult_to_ibv_rate(
        case 24: return IBV_RATE_60_GBPS;
        case 32: return IBV_RATE_80_GBPS;
        case 48: return IBV_RATE_120_GBPS;
+       case 11: return IBV_RATE_28_GBPS;
+       case 20: return IBV_RATE_50_GBPS;
+       case 160: return IBV_RATE_400_GBPS;
+       case 240: return IBV_RATE_600_GBPS;
        default: return IBV_RATE_MAX;
        }
 }
@@ -151,6 +159,10 @@ int  __attribute__((const)) ibv_rate_to_mbps(enum ibv_
        case IBV_RATE_100_GBPS: return 103125;
        case IBV_RATE_200_GBPS: return 206250;
        case IBV_RATE_300_GBPS: return 309375;
+       case IBV_RATE_28_GBPS:  return 28125;
+       case IBV_RATE_50_GBPS:  return 53125;
+       case IBV_RATE_400_GBPS: return 425000;
+       case IBV_RATE_600_GBPS: return 637500;
        default:               return -1;
        }
 }
@@ -175,6 +187,10 @@ enum ibv_rate __attribute__((const)) mbps_to_ibv_rate(
        case 103125: return IBV_RATE_100_GBPS;
        case 206250: return IBV_RATE_200_GBPS;
        case 309375: return IBV_RATE_300_GBPS;
+       case 28125:  return IBV_RATE_28_GBPS;
+       case 53125:  return IBV_RATE_50_GBPS;
+       case 425000: return IBV_RATE_400_GBPS;
+       case 637500: return IBV_RATE_600_GBPS;
        default:     return IBV_RATE_MAX;
        }
 }

Modified: stable/12/contrib/ofed/libibverbs/verbs.h
==============================================================================
--- stable/12/contrib/ofed/libibverbs/verbs.h   Thu May 16 16:27:21 2019        
(r347766)
+++ stable/12/contrib/ofed/libibverbs/verbs.h   Thu May 16 16:29:12 2019        
(r347767)
@@ -590,7 +590,11 @@ enum ibv_rate {
        IBV_RATE_25_GBPS  = 15,
        IBV_RATE_100_GBPS = 16,
        IBV_RATE_200_GBPS = 17,
-       IBV_RATE_300_GBPS = 18
+       IBV_RATE_300_GBPS = 18,
+       IBV_RATE_28_GBPS  = 19,
+       IBV_RATE_50_GBPS  = 20,
+       IBV_RATE_400_GBPS = 21,
+       IBV_RATE_600_GBPS = 22,
 };
 
 /**
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to