From: Richard Houldsworth <rhouldsworth@solarflare.com>
Date: Mon, 24 Sep 2018 13:50:24 +0000 (+0100)
Subject: net/sfc/base: add X2 port modes to bandwidth calculator
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=cd7dc6c8128bc708ac40d0c3d2af84e16a9e9c56;p=dpdk.git

net/sfc/base: add X2 port modes to bandwidth calculator

Add cases for the new port modes supported by X2 NICs.
Lane bandwidth is calculated for pre-X2 cards so is an
underestimate for X2 in 25G/100G modes.

Signed-off-by: Richard Houldsworth <rhouldsworth@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---

diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c
index c3634e351d..1eea7c673f 100644
--- a/drivers/net/sfc/base/ef10_nic.c
+++ b/drivers/net/sfc/base/ef10_nic.c
@@ -131,34 +131,59 @@ ef10_nic_get_port_mode_bandwidth(
 	__in		uint32_t port_mode,
 	__out		uint32_t *bandwidth_mbpsp)
 {
+	uint32_t single_lane = 10000;
+	uint32_t dual_lane   = 50000;
+	uint32_t quad_lane   = 40000;
 	uint32_t bandwidth;
 	efx_rc_t rc;
 
 	switch (port_mode) {
 	case TLV_PORT_MODE_1x1_NA:			/* mode 0 */
-		bandwidth = 10000;
+		bandwidth = single_lane;
+		break;
+	case TLV_PORT_MODE_1x2_NA:			/* mode 10 */
+	case TLV_PORT_MODE_NA_1x2:			/* mode 11 */
+		bandwidth = dual_lane;
 		break;
 	case TLV_PORT_MODE_1x1_1x1:			/* mode 2 */
-		bandwidth = 10000 * 2;
+		bandwidth = single_lane + single_lane;
 		break;
 	case TLV_PORT_MODE_4x1_NA:			/* mode 4 */
-	case TLV_PORT_MODE_2x1_2x1:			/* mode 5 */
 	case TLV_PORT_MODE_NA_4x1:			/* mode 8 */
-		bandwidth = 10000 * 4;
+		bandwidth = 4 * single_lane;
+		break;
+	case TLV_PORT_MODE_2x1_2x1:			/* mode 5 */
+		bandwidth = (2 * single_lane) + (2 * single_lane);
+		break;
+	case TLV_PORT_MODE_1x2_1x2:			/* mode 12 */
+		bandwidth = dual_lane + dual_lane;
+		break;
+	case TLV_PORT_MODE_1x2_2x1:			/* mode 17 */
+	case TLV_PORT_MODE_2x1_1x2:			/* mode 18 */
+		bandwidth = dual_lane + (2 * single_lane);
 		break;
 	/* Legacy Medford-only mode. Do not use (see bug63270) */
 	case TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2:	/* mode 9 */
-		bandwidth = 10000 * 4;
+		bandwidth = 4 * single_lane;
 		break;
 	case TLV_PORT_MODE_1x4_NA:			/* mode 1 */
-		bandwidth = 40000;
+	case TLV_PORT_MODE_NA_1x4:			/* mode 22 */
+		bandwidth = quad_lane;
 		break;
-	case TLV_PORT_MODE_1x4_1x4:			/* mode 3 */
-		bandwidth = 40000 * 2;
+	case TLV_PORT_MODE_2x2_NA:			/* mode 13 */
+	case TLV_PORT_MODE_NA_2x2:			/* mode 14 */
+		bandwidth = 2 * dual_lane;
 		break;
 	case TLV_PORT_MODE_1x4_2x1:			/* mode 6 */
 	case TLV_PORT_MODE_2x1_1x4:			/* mode 7 */
-		bandwidth = 40000 + (10000 * 2);
+		bandwidth = quad_lane + (2 * single_lane);
+		break;
+	case TLV_PORT_MODE_1x4_1x2:			/* mode 15 */
+	case TLV_PORT_MODE_1x2_1x4:			/* mode 16 */
+		bandwidth = quad_lane + dual_lane;
+		break;
+	case TLV_PORT_MODE_1x4_1x4:			/* mode 3 */
+		bandwidth = quad_lane + quad_lane;
 		break;
 	default:
 		rc = EINVAL;