Date: Thu, 14 Jan 2016 14:08:13 +0000 (UTC) From: Andrew Rybchenko <arybchik@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r293919 - stable/10/sys/dev/sfxge/common Message-ID: <201601141408.u0EE8Dos016049@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Thu Jan 14 14:08:13 2016 New Revision: 293919 URL: https://svnweb.freebsd.org/changeset/base/293919 Log: MFC r291393 sfxge: infer external port numbering for Pavia Adjust external port mapping table to distinguish Pavia from Monza. Now the presence of any 40G mode implies at least 2 outputs per external port. So Pavia 4x10G ports are now mapped to 1,2,3,4; Monza 4x10G ports map to 1,1,2,2 as before. Submitted by: Richard Houldsworth <rhouldsworth at solarflare.com> Sponsored by: Solarflare Communications, Inc. Modified: stable/10/sys/dev/sfxge/common/hunt_nic.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/sfxge/common/hunt_nic.c ============================================================================== --- stable/10/sys/dev/sfxge/common/hunt_nic.c Thu Jan 14 14:05:00 2016 (r293918) +++ stable/10/sys/dev/sfxge/common/hunt_nic.c Thu Jan 14 14:08:13 2016 (r293919) @@ -948,19 +948,27 @@ static struct { { EFX_FAMILY_HUNTINGTON, (1 << TLV_PORT_MODE_10G) | - (1 << TLV_PORT_MODE_40G) | (1 << TLV_PORT_MODE_10G_10G) | - (1 << TLV_PORT_MODE_40G_40G), + (1 << TLV_PORT_MODE_10G_10G_10G_10G), 1 }, /* Supported modes requiring 2 outputs per port */ { EFX_FAMILY_HUNTINGTON, - (1 << TLV_PORT_MODE_10G_10G_10G_10G) | + (1 << TLV_PORT_MODE_40G) | + (1 << TLV_PORT_MODE_40G_40G) | (1 << TLV_PORT_MODE_40G_10G_10G) | (1 << TLV_PORT_MODE_10G_10G_40G), 2 } + /* + * NOTE: Medford modes will require 4 outputs per port: + * TLV_PORT_MODE_10G_10G_10G_10G_Q + * TLV_PORT_MODE_10G_10G_10G_10G_Q2 + * The Q2 mode routes outputs to external port 2. Support for this + * will require a new field specifying the number to add after + * scaling by stride. This is fixed at 1 currently. + */ }; static __checkReturn int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601141408.u0EE8Dos016049>