d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfxge(4): update to current port mode terminology

Browse Source 
>From Medford onwards, the newer constants enumerating
port modes should be used.

Submitted by:   Richard Houldsworth <rhouldsworth at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.
Differential Revision:  https://reviews.freebsd.org/D18276
This commit is contained in:
Andrew Rybchenko 2018-11-30 07:08:50 +00:00
parent 3c3b954225
commit e12a751b0d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=341314
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/dev/sfxge/common/ef10_nic.c
View File

@ -162,26 +162,29 @@ ef10_nic_get_port_mode_bandwidth(
efx_rc_t rc;
switch (port_mode) {
case TLV_PORT_MODE_10G:
case TLV_PORT_MODE_1x1_NA: /* mode 0 */
bandwidth = 10000;
break;
case TLV_PORT_MODE_10G_10G:
case TLV_PORT_MODE_1x1_1x1: /* mode 2 */
bandwidth = 10000 * 2;
break;
case TLV_PORT_MODE_10G_10G_10G_10G:
case TLV_PORT_MODE_10G_10G_10G_10G_Q:
case TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2:
case TLV_PORT_MODE_10G_10G_10G_10G_Q2:
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;
break;
case TLV_PORT_MODE_40G:
/* Legacy Medford-only mode. Do not use (see bug63270) */
case TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2: /* mode 9 */
bandwidth = 10000 * 4;
break;
case TLV_PORT_MODE_1x4_NA: /* mode 1 */
bandwidth = 40000;
break;
case TLV_PORT_MODE_40G_40G:
case TLV_PORT_MODE_1x4_1x4: /* mode 3 */
bandwidth = 40000 * 2;
break;
case TLV_PORT_MODE_40G_10G_10G:
case TLV_PORT_MODE_10G_10G_40G:
case TLV_PORT_MODE_1x4_2x1: /* mode 6 */
case TLV_PORT_MODE_2x1_1x4: /* mode 7 */
bandwidth = 40000 + (10000 * 2);
break;
default:
@ -1495,8 +1498,8 @@ static struct ef10_external_port_map_s {
*/
{
EFX_FAMILY_MEDFORD,
(1U << TLV_PORT_MODE_10G) | /* mode 0 */
(1U << TLV_PORT_MODE_10G_10G), /* mode 2 */
(1U << TLV_PORT_MODE_1x1_NA) | /* mode 0 */
(1U << TLV_PORT_MODE_1x1_1x1), /* mode 2 */
1, /* ports per cage */
1 /* first cage */
},
@ -1510,10 +1513,10 @@ static struct ef10_external_port_map_s {
*/
{
EFX_FAMILY_MEDFORD,
(1U << TLV_PORT_MODE_40G) | /* mode 1 */
(1U << TLV_PORT_MODE_40G_40G) | /* mode 3 */
(1U << TLV_PORT_MODE_40G_10G_10G) | /* mode 6 */
(1U << TLV_PORT_MODE_10G_10G_40G) | /* mode 7 */
(1U << TLV_PORT_MODE_1x4_NA) | /* mode 1 */
(1U << TLV_PORT_MODE_1x4_1x4) | /* mode 3 */
(1U << TLV_PORT_MODE_1x4_2x1) | /* mode 6 */
(1U << TLV_PORT_MODE_2x1_1x4) | /* mode 7 */
/* Do not use 10G_10G_10G_10G_Q1_Q2 (see bug63270) */
(1U << TLV_PORT_MODE_10G_10G_10G_10G_Q1_Q2), /* mode 9 */
2, /* ports per cage */
@ -1529,9 +1532,9 @@ static struct ef10_external_port_map_s {
*/
{
EFX_FAMILY_MEDFORD,
(1U << TLV_PORT_MODE_10G_10G_10G_10G_Q) | /* mode 5 */
(1U << TLV_PORT_MODE_2x1_2x1) | /* mode 5 */
/* Do not use 10G_10G_10G_10G_Q1 (see bug63270) */
(1U << TLV_PORT_MODE_10G_10G_10G_10G_Q1), /* mode 4 */
(1U << TLV_PORT_MODE_4x1_NA), /* mode 4 */
4, /* ports per cage */
1 /* first cage */
},
@ -1545,7 +1548,7 @@ static struct ef10_external_port_map_s {
*/
{
EFX_FAMILY_MEDFORD,
(1U << TLV_PORT_MODE_10G_10G_10G_10G_Q2), /* mode 8 */
(1U << TLV_PORT_MODE_NA_4x1), /* mode 8 */
4, /* ports per cage */
2 /* first cage */
},