Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Nov 2018 07:09:01 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r341315 - head/sys/dev/sfxge/common
Message-ID:  <201811300709.wAU791Wq083500@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arybchik
Date: Fri Nov 30 07:09:00 2018
New Revision: 341315
URL: https://svnweb.freebsd.org/changeset/base/341315

Log:
  sfxge(4): 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.
  
  Submitted by:   Richard Houldsworth <rhouldsworth at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D18277

Modified:
  head/sys/dev/sfxge/common/ef10_nic.c

Modified: head/sys/dev/sfxge/common/ef10_nic.c
==============================================================================
--- head/sys/dev/sfxge/common/ef10_nic.c	Fri Nov 30 07:08:50 2018	(r341314)
+++ head/sys/dev/sfxge/common/ef10_nic.c	Fri Nov 30 07:09:00 2018	(r341315)
@@ -158,34 +158,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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811300709.wAU791Wq083500>