IB/core: Add new IB rates

mikijoy · jgunthorpe · commit a5a5d1993696 · 2018-12-11T13:22:45.000-07:00
Add the new rates that were added to Infiniband spec as part of HDR and 2x
support.

Signed-off-by: Michael Guralnik &lt;michaelgur@mellanox.com&gt;
Reviewed-by: Majd Dibbiny &lt;majd@mellanox.com&gt;
Signed-off-by: Leon Romanovsky &lt;leonro@mellanox.com&gt;
Signed-off-by: Jason Gunthorpe &lt;jgg@mellanox.com&gt;
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
@@ -141,6 +141,10 @@ __attribute_const__ int ib_rate_to_mult(enum ib_rate rate)
 	case IB_RATE_100_GBPS: return  40;
 	case IB_RATE_200_GBPS: return  80;
 	case IB_RATE_300_GBPS: return 120;
+	case IB_RATE_28_GBPS:  return  11;
+	case IB_RATE_50_GBPS:  return  20;
+	case IB_RATE_400_GBPS: return 160;
+	case IB_RATE_600_GBPS: return 240;
 	default:	       return  -1;
 	}
 }
@@ -166,6 +170,10 @@ __attribute_const__ enum ib_rate mult_to_ib_rate(int mult)
 	case 40:  return IB_RATE_100_GBPS;
 	case 80:  return IB_RATE_200_GBPS;
 	case 120: return IB_RATE_300_GBPS;
+	case 11:  return IB_RATE_28_GBPS;
+	case 20:  return IB_RATE_50_GBPS;
+	case 160: return IB_RATE_400_GBPS;
+	case 240: return IB_RATE_600_GBPS;
 	default:  return IB_RATE_PORT_CURRENT;
 	}
 }
@@ -191,6 +199,10 @@ __attribute_const__ int ib_rate_to_mbps(enum ib_rate rate)
 	case IB_RATE_100_GBPS: return 103125;
 	case IB_RATE_200_GBPS: return 206250;
 	case IB_RATE_300_GBPS: return 309375;
+	case IB_RATE_28_GBPS:  return 28125;
+	case IB_RATE_50_GBPS:  return 53125;
+	case IB_RATE_400_GBPS: return 425000;
+	case IB_RATE_600_GBPS: return 637500;
 	default:	       return -1;
 	}
 }
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
@@ -2703,7 +2703,7 @@ static int ib_rate_to_mlx5(struct mlx5_ib_dev *dev, u8 rate)
 	if (rate == IB_RATE_PORT_CURRENT)
 		return 0;
 
-	if (rate < IB_RATE_2_5_GBPS || rate > IB_RATE_300_GBPS)
+	if (rate < IB_RATE_2_5_GBPS || rate > IB_RATE_600_GBPS)
 		return -EINVAL;
 
 	while (rate != IB_RATE_PORT_CURRENT &&
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
@@ -732,7 +732,11 @@ enum ib_rate {
 	IB_RATE_25_GBPS  = 15,
 	IB_RATE_100_GBPS = 16,
 	IB_RATE_200_GBPS = 17,
-	IB_RATE_300_GBPS = 18
+	IB_RATE_300_GBPS = 18,
+	IB_RATE_28_GBPS  = 19,
+	IB_RATE_50_GBPS  = 20,
+	IB_RATE_400_GBPS = 21,
+	IB_RATE_600_GBPS = 22,
 };
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,10 @@ __attribute_const__ int ib_rate_to_mult(enum ib_rate rate)`
`141`	`141`	`case IB_RATE_100_GBPS: return 40;`
`142`	`142`	`case IB_RATE_200_GBPS: return 80;`
`143`	`143`	`case IB_RATE_300_GBPS: return 120;`
	`144`	`+ case IB_RATE_28_GBPS: return 11;`
	`145`	`+ case IB_RATE_50_GBPS: return 20;`
	`146`	`+ case IB_RATE_400_GBPS: return 160;`
	`147`	`+ case IB_RATE_600_GBPS: return 240;`
`144`	`148`	`default: return -1;`
`145`	`149`	`}`
`146`	`150`	`}`
`@@ -166,6 +170,10 @@ __attribute_const__ enum ib_rate mult_to_ib_rate(int mult)`
`166`	`170`	`case 40: return IB_RATE_100_GBPS;`
`167`	`171`	`case 80: return IB_RATE_200_GBPS;`
`168`	`172`	`case 120: return IB_RATE_300_GBPS;`
	`173`	`+ case 11: return IB_RATE_28_GBPS;`
	`174`	`+ case 20: return IB_RATE_50_GBPS;`
	`175`	`+ case 160: return IB_RATE_400_GBPS;`
	`176`	`+ case 240: return IB_RATE_600_GBPS;`
`169`	`177`	`default: return IB_RATE_PORT_CURRENT;`
`170`	`178`	`}`
`171`	`179`	`}`
`@@ -191,6 +199,10 @@ __attribute_const__ int ib_rate_to_mbps(enum ib_rate rate)`
`191`	`199`	`case IB_RATE_100_GBPS: return 103125;`
`192`	`200`	`case IB_RATE_200_GBPS: return 206250;`
`193`	`201`	`case IB_RATE_300_GBPS: return 309375;`
	`202`	`+ case IB_RATE_28_GBPS: return 28125;`
	`203`	`+ case IB_RATE_50_GBPS: return 53125;`
	`204`	`+ case IB_RATE_400_GBPS: return 425000;`
	`205`	`+ case IB_RATE_600_GBPS: return 637500;`
`194`	`206`	`default: return -1;`
`195`	`207`	`}`
`196`	`208`	`}`