--- a/usr/src/man/man7d/igb.7d	Mon Sep 28 11:50:59 2020 +0000
+++ b/usr/src/man/man7d/igb.7d	Tue Sep 29 11:36:29 2020 +0000
@@ -1,215 +1,126 @@
-'\" te
-.\"  Copyright (c) 2007, Sun Microsystems, Inc.  All Rights Reserved
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
-.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH IGB 7D "Jul 20, 2007"
-.SH NAME
-igb \- Intel 82575 1Gb PCI Express NIC Driver
-.SH SYNOPSIS
-.LP
-.nf
-\fB/dev/igb*\fR
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The \fBigb\fR Gigabit Ethernet driver is a  multi-threaded,  loadable,
-clonable, GLD-based STREAMS driver supporting the Data Link Provider Interface,
-\fBdlpi\fR(7P),  on  Intel 82575 Gigabit Ethernet controllers.
-.sp
-.LP
-The \fBigb\fR driver functions include controller  initialization, frame
-transmit and receive, promiscuous and multicast support, and error recovery and
-reporting.
-.sp
-.LP
-The \fBigb\fR driver and hardware support auto-negotiation, a protocol
-specified by the 1000  Base-T  standard.  Auto-negotiation allows each device
-to advertise its capabilities and discover those of its peer (link partner).
-The highest common  denominator  supported  by  both link  partners  is
-automatically  selected,  yielding  the  greatest  available throughput, while
-requiring no manual configuration. The \fBigb\fR driver also allows you to
-configure the advertised capabilities to less than the maximum (where the full
-speed  of  the interface is not required), or to force a specific mode of
-operation, irrespective of  the  link  partner's  advertised capabilities.
-.SH APPLICATION PROGRAMMING INTERFACE
-.sp
-.LP
-The cloning character-special device, \fB /dev/igb\fR, is used to access all
-Intel 82575 Gigabit devices installed within the system.
-.sp
-.LP
-The igb driver is managed  by the \fBdladm\fR(1M) command  line utility, which
-allows  VLANs to be defined on top of \fBigb\fR instances and  for \fBigb\fR
-instances to be aggregated.  See \fBdladm\fR(1M) for more details.
-.sp
-.LP
-You must send an explicit DL_ATTACH_REQ message to associate the opened stream
-with a particular device (PPA). The PPA ID is interpreted as an unsigned
-integer data type and  indicates the corresponding device instance (unit)
-number. The driver returns an error (DL_ERROR_ACK) if  the PPA field value does
-not correspond to a valid device instance number for the system. The device is
-initialized on first attach and de-initialized (stopped) at last detach.
-.sp
-.LP
-The values returned by the driver in the DL_INFO_ACK primitive in response to
-your DL_INFO_REQ are:
-.RS +4
-.TP
-.ie t \(bu
-.el o
-Maximum SDU is 9000.
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-Minimum SDU is 0.
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-DLSAP address length is 8.
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-MAC type is DL_ETHER.
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-SAP (Service Access Point) length value is -2, meaning the physical address
-component is followed immediately by a 2-byte SAP component within the DLSAP
-address.
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-Broadcast address value is the Ethernet/IEEE broadcast address
-(FF:FF:FF:FF:FF:FF).
-.sp
-Once in the DL_ATTACHED state, you must send a DL_BIND_REQ to associate a
-particular SAP with the stream.
-.RE
-.SH CONFIGURATION
-.sp
-.LP
-By default, the  igb driver performs auto-negotiation to select the link speed
-and mode. Link speed and mode can be any one of the following, (as described
-in  the \fIIEEE803.2\fR standard):
-.sp
-.LP
-1000 Mbps, full-duplex.
-.sp
-.LP
-100 Mbps, full-duplex.
-.sp
-.LP
-100 Mbps, half-duplex.
-.sp
-.LP
-10 Mbps, full-duplex.
-.sp
-.LP
-10 Mbps, half-duplex.
-.sp
-.LP
-The auto-negotiation protocol automatically selects speed (1000 Mbps, 100 Mbps,
-or 10 Mbps) and operation mode (full-duplex or half-duplex) as the highest
-common denominator supported by both link partners.
-.sp
-.LP
-Alternatively, you can set the capabilities advertised by the \fBigb\fR device
-using \fBndd\fR(1M). The driver supports a number of parameters whose names
-begin with \fIadv_\fR (see below). Each of these parameters contains a boolean
-value that determines if the device advertises that mode of operation. For
-example,  the \fIadv_1000fdx_cap\fR parameter indicates if 1000M full duplex is
-advertised to link partner. The  \fIadv_autoneg\fR cap parameter controls
-whether auto-negotiation is performed. If \fIadv_autoneg_cap\fR is set to 0,
-the driver forces the mode of operation  selected by the first  non-zero
-parameter in priority order as shown below:
-.sp
-.in +2
-.nf
-                        (highest priority/greatest throughput)
-        adv_1000fdx_cap         1000Mbps full duplex
-        adv_100fdx_cap          100Mbps full duplex
-        adv_100hdx_cap          100Mbps half duplex
-        adv_10fdx_cap           10Mbps full duplex
-        adv_10hdx_cap           10Mbps half duplex
-                                (lowest priority/least throughput)
-.fi
-.in -2
-
-.sp
-.LP
-All capabilities default to enabled. Note that changing any capability
-parameter causes the link to go down while the link partners renegotiate the
-link speed/duplex using the newly changed capabilities.
-.SH FILES
-.sp
-.ne 2
-.na
-\fB\fB/dev/igb*\fR\fR
-.ad
-.RS 27n
-Special character device.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/kernel/drv/igb\fR\fR
-.ad
-.RS 27n
-32-bit device driver (x86).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/kernel/drv/amd64/igb\fR\fR
-.ad
-.RS 27n
-64-bit device driver (x86).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/kernel/drv/sparcv9/igb\fR\fR
-.ad
-.RS 27n
-64-bit device driver (SPARC).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/kernel/drv/igb.conf\fR\fR
-.ad
-.RS 27n
+.\"
+.\" This file and its contents are supplied under the terms of the
+.\" Common Development and Distribution License ("CDDL"), version 1.0.
+.\" You may only use this file in accordance with the terms of version
+.\" 1.0 of the CDDL.
+.\"
+.\" A full copy of the text of the CDDL should have accompanied this
+.\" source.  A copy of the CDDL is also available via the Internet at
+.\" http://www.illumos.org/license/CDDL.
+.\"
+.\"
+.\" Copyright 2020 Oxide Computer Company
+.\"
+.Dd September 14, 2020
+.Dt IGB 7D
+.Os
+.Sh NAME
+.Nm igb
+.Nd Intel 1 GbE Server NIC Driver
+.Sh SYNOPSIS
+.Pa /dev/net/igb*
+.Sh DESCRIPTION
+The
+.Nm
+driver is a GLDv3 NIC driver for Intel 1 Gigabit Ethernet PCIe
+controllers which are built-in to motherboards and discrete PCIe
+devices.
+.Pp
+The driver supports the following device families:
+.Bl -dash
+.It
+Intel 82575 Gigabit Ethernet Controller
+.It
+Intel 82576 Gigabit Ethernet Controller
+.It
+Intel 82580 Gigabit Ethernet Controller
+.It
+Intel Ethernet Controller I210
+.It
+Intel Ethernet Controller I211
+.It
+Intel Ethernet Controller I350
+.El
+.Pp
+Many other Intel 1 GbE devices are supported by the
+.Xr e1000g 7D
+driver.
+.Pp
+The driver supports the following functionality depending on the
+controller generation:
+.Bl -dash
+.It
+Jumbo frames up to 9000 bytes.
+.It
+Checksum offload for TCP and UDP on IPv4 and IPv6.
+Checksum offload for IPv4 headers.
+.It
+TCP Segmentation Offload
+.Pq TSO
+over IPv4 and IPv6.
+.It
+Support for multiple hardware rings, enabling receive-side steering
+.Pq RSS
+and multiple MAC address filters.
+.It
+Promiscuous access via
+.Xr snoop 1M
+and
+.Xr dlpi 7P .
+.It
+LED control.
+.It
+Link auto-negotiation, manual link controls, and IEEE 802.3x flow
+control.
+.El
+.Sh APPLICATION PROGRAMMING INTERFACE
+For each supported device instance, which corresponds to a port, a
+character-special file is created.
+This device can be used with the Data Link Provider Interface
+.Pq DLPI
+through either
+.Xr libdlpi 3LIB
+or
+.Xr dlpi 7P .
+.Pp
+Each instance is assigned a unique ascending integer identifier starting
+from zero.
+The first instance in the system would be enumerated with the id 0 and
+be named
+.Sy igb0
+and be found in the file system at
+.Pa /dev/net/igb0 .
+.Sh CONFIGURATION
+The
+.Nm
+driver supports operating at 1 Gbps full-duplex, 100 Mbps full and
+half-duplex, and 10 Mbps full and half-duplex.
+By default, the device will use auto-negotiation and prefer the highest
+compatible speed.
+The advertised speeds and broader configuration can be observed and
+modified with
+.Xr dladm 1M .
+While
+.Xr driver.conf 4
+based configuration is possible, it is recommended that
+.Xr dladm 1M
+is used wherever possible.
+.Sh FILES
+.Bl -tag -width Pa
+.It Pa /dev/net/igb*
+.Nm
+special character device.
+.It Pa /kernel/drv/amd64/igb
+x86 device driver.
+.It Pa /kernel/drv/sparcv9/igb
+SPARC device driver
+.It Pa /kernel/drv/igb.conf
 Configuration file.
-.RE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBdladm\fR(1M), \fBndd\fR(1M), \fBnetstat\fR(1M), \fBdriver.conf\fR(4),
-\fBattributes\fR(5), \fBstreamio\fR(7I), \fBdlpi\fR(7P),
-.sp
-.LP
-\fIWriting Device Drivers\fR
-.sp
-.LP
-\fISTREAMS Programming Guide\fR
-.sp
-.LP
-\fINetwork Interfaces Programmer's Guide\fR
+.El
+.Sh SEE ALSO
+.Xr dladm 1M ,
+.Xr libdlpi 3LIB ,
+.Xr driver.conf 4 ,
+.Xr e1000g 7D ,
+.Xr dlpi 7P ,
+.Xr mac 9E

--- a/usr/src/uts/common/inet/squeue.c	Mon Sep 28 11:50:59 2020 +0000
+++ b/usr/src/uts/common/inet/squeue.c	Tue Sep 29 11:36:29 2020 +0000
@@ -638,11 +638,11 @@
 squeue_drain(squeue_t *sqp, uint_t proc_type, hrtime_t expire)
 {
 	mblk_t		*mp;
-	mblk_t 		*head;
-	sqproc_t 	proc;
+	mblk_t		*head;
+	sqproc_t	proc;
 	conn_t		*connp;
 	ill_rx_ring_t	*sq_rx_ring = sqp->sq_rx_ring;
-	hrtime_t 	now;
+	hrtime_t	now;
 	boolean_t	sq_poll_capable;
 	ip_recv_attr_t	*ira, iras;
 

--- a/usr/src/uts/common/inet/tcp/tcp_socket.c	Mon Sep 28 11:50:59 2020 +0000
+++ b/usr/src/uts/common/inet/tcp/tcp_socket.c	Tue Sep 29 11:36:29 2020 +0000
@@ -199,7 +199,7 @@
 tcp_bind(sock_lower_handle_t proto_handle, struct sockaddr *sa,
     socklen_t len, cred_t *cr)
 {
-	int 		error;
+	int		error;
 	conn_t		*connp = (conn_t *)proto_handle;
 
 	/* All Solaris components should pass a cred for this operation. */
@@ -240,7 +240,7 @@
 {
 	conn_t	*connp = (conn_t *)proto_handle;
 	tcp_t	*tcp = connp->conn_tcp;
-	int 	error;
+	int	error;
 
 	ASSERT(connp->conn_upper_handle != NULL);
 
@@ -660,7 +660,7 @@
 tcp_ioctl(sock_lower_handle_t proto_handle, int cmd, intptr_t arg,
     int mode, int32_t *rvalp, cred_t *cr)
 {
-	conn_t  	*connp = (conn_t *)proto_handle;
+	conn_t		*connp = (conn_t *)proto_handle;
 	int		error;
 
 	ASSERT(connp->conn_upper_handle != NULL);
@@ -825,7 +825,7 @@
 	struct stroptions	*stropt;
 	struct T_capability_ack tca;
 	struct sockaddr_in6	laddr, faddr;
-	socklen_t 		laddrlen, faddrlen;
+	socklen_t		laddrlen, faddrlen;
 	short			opts;
 	int			error;
 	mblk_t			*mp, *mpnext;
@@ -999,7 +999,7 @@
     sock_quiesce_arg_t *arg)
 {
 	tcp_t			*tcp;
-	conn_t 			*connp = (conn_t *)proto_handle;
+	conn_t			*connp = (conn_t *)proto_handle;
 	int			error;
 	mblk_t			*stropt_mp;
 	mblk_t			*ordrel_mp;

--- a/usr/src/uts/common/io/i40e/core/i40e_common.c	Mon Sep 28 11:50:59 2020 +0000
+++ b/usr/src/uts/common/io/i40e/core/i40e_common.c	Tue Sep 29 11:36:29 2020 +0000
@@ -1761,6 +1761,8 @@
 		config.eee_capability = abilities.eee_capability;
 		config.eeer = abilities.eeer_val;
 		config.low_power_ctrl = abilities.d3_lpan;
+		config.fec_config = abilities.fec_cfg_curr_mod_ext_info &
+				    I40E_AQ_PHY_FEC_CONFIG_MASK;
 		status = i40e_aq_set_phy_config(hw, &config, NULL);
 
 		if (status)
@@ -1920,6 +1922,8 @@
 	hw_link_info->link_speed = (enum i40e_aq_link_speed)resp->link_speed;
 	hw_link_info->link_info = resp->link_info;
 	hw_link_info->an_info = resp->an_info;
+	hw_link_info->fec_info = resp->config & (I40E_AQ_CONFIG_FEC_KR_ENA |
+						 I40E_AQ_CONFIG_FEC_RS_ENA);
 	hw_link_info->ext_info = resp->ext_info;
 	hw_link_info->loopback = resp->loopback & I40E_AQ_LOOPBACK_MASK;
 	hw_link_info->max_frame_size = LE16_TO_CPU(resp->max_frame_size);

--- a/usr/src/uts/common/io/i40e/i40e_gld.c	Mon Sep 28 11:50:59 2020 +0000
+++ b/usr/src/uts/common/io/i40e/i40e_gld.c	Tue Sep 29 11:36:29 2020 +0000
@@ -965,10 +965,80 @@
 }
 
 static int
+i40e_update_fec(i40e_t *i40e, link_fec_t fec)
+{
+	struct i40e_hw *hw = &i40e->i40e_hw_space;
+	struct i40e_aq_get_phy_abilities_resp abilities;
+	struct i40e_aq_set_phy_config config;
+	link_fec_t fec_requested;
+	int req_fec;
+
+	ASSERT(MUTEX_HELD(&i40e->i40e_general_lock));
+
+	if (fec == i40e->i40e_fec_requested)
+		return (0);
+
+	fec_requested = fec;
+	if ((fec & LINK_FEC_AUTO) != 0) {
+		req_fec = I40E_AQ_SET_FEC_AUTO;
+		fec &= ~LINK_FEC_AUTO;
+	} else if ((fec & LINK_FEC_NONE) != 0) {
+		req_fec = 0;
+		fec &= ~LINK_FEC_NONE;
+	} else {
+		req_fec = 0;
+		if ((fec & LINK_FEC_BASE_R) != 0) {
+			req_fec |= I40E_AQ_SET_FEC_ABILITY_KR |
+			    I40E_AQ_SET_FEC_REQUEST_KR;
+			fec &= ~LINK_FEC_BASE_R;
+		}
+		if ((fec & LINK_FEC_RS) != 0) {
+			req_fec |= I40E_AQ_SET_FEC_ABILITY_RS |
+			    I40E_AQ_SET_FEC_REQUEST_RS;
+			fec &= ~LINK_FEC_RS;
+		}
+		if (req_fec == 0)
+			return (EINVAL);
+	}
+
+	/*
+	 * if fec is not zero now, then there is an invalid fec or
+	 * combination of settings.
+	 */
+	if (fec != 0)
+		return (EINVAL);
+
+	if (i40e_aq_get_phy_capabilities(hw, B_FALSE, B_FALSE, &abilities,
+	    NULL) != I40E_SUCCESS)
+		return (EIO);
+
+	bzero(&config, sizeof (config));
+	config.abilities = abilities.abilities;
+	/* Restart the link */
+	config.abilities |= I40E_AQ_PHY_ENABLE_ATOMIC_LINK;
+	config.phy_type = abilities.phy_type;
+	config.phy_type_ext = abilities.phy_type_ext;
+	config.link_speed = abilities.link_speed;
+	config.eee_capability = abilities.eee_capability;
+	config.eeer = abilities.eeer_val;
+	config.low_power_ctrl = abilities.d3_lpan;
+	config.fec_config = req_fec & I40E_AQ_PHY_FEC_CONFIG_MASK;
+	if (i40e_aq_set_phy_config(hw, &config, NULL) != I40E_SUCCESS)
+		return (EIO);
+
+	if (i40e_update_link_info(hw) != I40E_SUCCESS)
+		return (EIO);
+
+	i40e->i40e_fec_requested = fec_requested;
+
+	return (0);
+}
+static int
 i40e_m_setprop(void *arg, const char *pr_name, mac_prop_id_t pr_num,
     uint_t pr_valsize, const void *pr_val)
 {
 	uint32_t new_mtu;
+	link_fec_t fec;
 	i40e_t *i40e = arg;
 	int ret = 0;
 
@@ -1029,6 +1099,12 @@
 		}
 		break;
 
+	case MAC_PROP_EN_FEC_CAP:
+		bcopy(pr_val, &fec, sizeof (fec));
+
+		ret = i40e_update_fec(i40e, fec);
+		break;
+
 	case MAC_PROP_PRIVATE:
 		ret = i40e_m_setprop_private(i40e, pr_name, pr_valsize, pr_val);
 		break;
@@ -1041,6 +1117,20 @@
 	return (ret);
 }
 
+static link_fec_t
+i40e_fec_to_linkfec(struct i40e_hw *hw)
+{
+	struct i40e_link_status *ls = &hw->phy.link_info;
+
+	if ((ls->fec_info & I40E_AQ_CONFIG_FEC_KR_ENA) != 0)
+		return (LINK_FEC_BASE_R);
+
+	if ((ls->fec_info & I40E_AQ_CONFIG_FEC_RS_ENA) != 0)
+		return (LINK_FEC_RS);
+
+	return (LINK_FEC_NONE);
+}
+
 static int
 i40e_m_getprop(void *arg, const char *pr_name, mac_prop_id_t pr_num,
     uint_t pr_valsize, void *pr_val)
@@ -1103,6 +1193,21 @@
 		}
 		bcopy(&i40e->i40e_sdu, pr_val, sizeof (uint32_t));
 		break;
+	case MAC_PROP_ADV_FEC_CAP:
+		if (pr_valsize < sizeof (link_fec_t)) {
+			ret = EOVERFLOW;
+			break;
+		}
+		*(link_fec_t *)pr_val =
+		    i40e_fec_to_linkfec(&i40e->i40e_hw_space);
+		break;
+	case MAC_PROP_EN_FEC_CAP:
+		if (pr_valsize < sizeof (link_fec_t)) {
+			ret = EOVERFLOW;
+			break;
+		}
+		*(link_fec_t *)pr_val = i40e->i40e_fec_requested;
+		break;
 
 	/*
 	 * Because we don't let users control the speeds we may auto-negotiate
@@ -1191,6 +1296,19 @@
 	case MAC_PROP_MTU:
 		mac_prop_info_set_range_uint32(prh, I40E_MIN_MTU, I40E_MAX_MTU);
 		break;
+	case MAC_PROP_ADV_FEC_CAP:
+		mac_prop_info_set_perm(prh, MAC_PROP_PERM_READ);
+		if (i40e_is_25G_device(i40e->i40e_hw_space.device_id))
+			mac_prop_info_set_default_fec(prh, LINK_FEC_AUTO);
+		break;
+	case MAC_PROP_EN_FEC_CAP:
+		if (i40e_is_25G_device(i40e->i40e_hw_space.device_id)) {
+			mac_prop_info_set_perm(prh, MAC_PROP_PERM_RW);
+			mac_prop_info_set_default_fec(prh, LINK_FEC_AUTO);
+		} else {
+			mac_prop_info_set_perm(prh, MAC_PROP_PERM_READ);
+		}
+		break;
 
 	/*
 	 * We set the defaults for these based upon the phy's ability to

--- a/usr/src/uts/common/io/i40e/i40e_sw.h	Mon Sep 28 11:50:59 2020 +0000
+++ b/usr/src/uts/common/io/i40e/i40e_sw.h	Tue Sep 29 11:36:29 2020 +0000
@@ -867,6 +867,7 @@
 	link_state_t		i40e_link_state;
 	uint32_t		i40e_link_speed;	/* In Mbps */
 	link_duplex_t		i40e_link_duplex;
+	link_fec_t		i40e_fec_requested;
 	uint_t			i40e_sdu;
 	uint_t			i40e_frame_max;
 

--- a/usr/src/uts/common/mapfiles/mac.mapfile	Mon Sep 28 11:50:59 2020 +0000
+++ b/usr/src/uts/common/mapfiles/mac.mapfile	Tue Sep 29 11:36:29 2020 +0000
@@ -11,6 +11,7 @@
 
 #
 # Copyright (c) 2017, Joyent, Inc.
+# Copyright 2020 RackTop Systems, Inc.
 #
 
 #
@@ -42,6 +43,7 @@
 	mac_lso_get				{ FLAGS = EXTERN };
 	mac_maxsdu_update			{ FLAGS = EXTERN };
 	mac_prop_info_set_default_link_flowctrl	{ FLAGS = EXTERN };
+	mac_prop_info_set_default_fec		{ FLAGS = EXTERN };
 	mac_prop_info_set_default_str		{ FLAGS = EXTERN };
 	mac_prop_info_set_default_uint8		{ FLAGS = EXTERN };
 	mac_prop_info_set_perm			{ FLAGS = EXTERN };