Date: Wed, 28 Nov 2018 09:23:19 +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: r341125 - head/sys/dev/sfxge/common Message-ID: <201811280923.wAS9NJqq061989@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Wed Nov 28 09:23:19 2018 New Revision: 341125 URL: https://svnweb.freebsd.org/changeset/base/341125 Log: sfxge(4): group Medford external port mapping entries Submitted by: Andy Moreton <amoreton at solarflare.com> Sponsored by: Solarflare Communications, Inc. Differential Revision: https://reviews.freebsd.org/D18200 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 Wed Nov 28 09:23:05 2018 (r341124) +++ head/sys/dev/sfxge/common/ef10_nic.c Wed Nov 28 09:23:19 2018 (r341125) @@ -1379,21 +1379,6 @@ static struct ef10_external_port_map_s { 1 /* first cage */ }, /* - * Modes that on Medford allocate each port number to a separate - * cage. - * port 0 -> cage 1 - * port 1 -> cage 2 - * port 2 -> cage 3 - * port 3 -> cage 4 - */ - { - EFX_FAMILY_MEDFORD, - (1U << TLV_PORT_MODE_10G) | /* mode 0 */ - (1U << TLV_PORT_MODE_10G_10G), /* mode 2 */ - 1, /* ports per cage */ - 1 /* first cage */ - }, - /* * Modes which for Huntington identify a chip variant where 2 * adjacent port numbers map to each cage. * SFN7x42Q (Monza): @@ -1409,6 +1394,21 @@ static struct ef10_external_port_map_s { (1U << TLV_PORT_MODE_40G_10G_10G) | /* mode 6 */ (1U << TLV_PORT_MODE_10G_10G_40G), /* mode 7 */ 2, /* ports per cage */ + 1 /* first cage */ + }, + /* + * Modes that on Medford allocate each port number to a separate + * cage. + * port 0 -> cage 1 + * port 1 -> cage 2 + * port 2 -> cage 3 + * port 3 -> cage 4 + */ + { + EFX_FAMILY_MEDFORD, + (1U << TLV_PORT_MODE_10G) | /* mode 0 */ + (1U << TLV_PORT_MODE_10G_10G), /* mode 2 */ + 1, /* ports per cage */ 1 /* first cage */ }, /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811280923.wAS9NJqq061989>