re #10798 rb3177 Integrate vmxnet3s driver to nza-kernel

usr/src/man/man7d/Makefile

@@ -9,7 +9,10 @@
 # at http://www.illumos.org/license/CDDL.
 #
 
+#
 # Copyright 2011, Richard Lowe
+# Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+#
 
 include ../../Makefile.master
 
@@ -231,6 +234,7 @@ i386_MANFILES =	ahci.7d		\
 		uath.7d		\
 		ural.7d		\
 		urtw.7d		\
+		vmxnet3s.7d	\
 		wpi.7d		\
 		zyd.7d
 

usr/src/man/man7d/vmxnet3s.7d

@@ -0,0 +1,62 @@
+'\" te
+.\"
+.\" 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 2012 Nexenta Systems, Inc. All rights reserved.
+.\"
+.TH VMXNET3S 7D "Jun 9, 2012"
+.SH NAME
+vmxnet3s \- Driver for VMware Vmxnet Generation 3 adapters
+.SH SYNOPSIS
+.sp
+.in +2
+.nf
+/dev/net/vmxnet3s
+.fi
+.in -2
+
+.SH DESCRIPTION
+.sp
+.LP
+The \fBvmxnet3s\fR driver supports VMware Vmxnet Generation 3 adapters.
+
+.SH FILES
+.sp
+.ne 2
+.na
+\fB\fB/dev/net/vmxnet3s\fR\fR
+.ad
+.RS 27n
+Special network device
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fB/kernel/drv/vmxnet3s\fR\fR
+.ad
+.RS 27n
+32-bit driver binary (x86)
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fB/kernel/drv/amd64/vmxnet3s\fR\fR
+.ad
+.RS 27n
+64-bit driver binary (x86)
+.RE
+
+.SH SEE ALSO
+.sp
+.LP
+\fBdladm\fR(1M), \fBdlpi\fR(7P)

usr/src/pkg/manifests/driver-network-vmxnet3s.mf

@@ -0,0 +1,33 @@
+#
+# 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 2012 Nexenta Systems, Inc. All rights reserved.
+#
+
+<include global_zone_only_component>
+set name=pkg.fmri value=pkg:/driver/network/vmxnet3s@$(PKGVERS)
+set name=pkg.description value=VMXNET3
+set name=pkg.summary value=VMXNET3
+set name=info.classification \
+    value=org.opensolaris.category.2008:Drivers/Networking
+set name=variant.arch value=i386
+dir path=kernel group=sys
+dir path=kernel/drv group=sys
+dir path=kernel/drv/$(ARCH64) group=sys
+dir path=usr/share/man
+dir path=usr/share/man/man7d
+driver name=vmxnet3s alias=pci15ad,7b0 clone_perms="vmxnet3s 0666 root sys"
+file path=kernel/drv/$(ARCH64)/vmxnet3s group=sys
+file path=kernel/drv/vmxnet3s group=sys
+file path=kernel/drv/vmxnet3s.conf group=sys
+file path=usr/share/man/man7d/vmxnet3s.7d
+license lic_CDDL license=lic_CDDL

usr/src/uts/intel/Makefile.files

@@ -213,8 +213,9 @@ ACPICA_OBJS	+= dbcmds.o dbdisply.o \
 		   evglock.o evgpeinit.o evgpeutil.o evxfgpe.o exdebug.o \
 		   hwpci.o utdecode.o utosi.o utxferror.o
 
-PVSCSI_OBJS += pvscsi.o
+PVSCSI_OBJS=	pvscsi.o
 
+VMXNET3S_OBJS=	vmxnet3s_main.o vmxnet3s_rx.o vmxnet3s_tx.o vmxnet3s_utils.o
 
 AGP_OBJS += agpmaster.o
 FBT_OBJS += fbt.o
@@ -285,3 +286,8 @@ MCAMD_OBJS	+= \
 	mcamd_dimmcfg.o \
 	mcamd_subr.o \
 	mcamd_pcicfg.o
+
+#
+# VMXNET3S
+#
+

usr/src/uts/intel/Makefile.intel.shared

@@ -441,6 +441,7 @@ DRV_KMODS	+= fp
 DRV_KMODS	+= qlc
 DRV_KMODS	+= iscsi
 DRV_KMODS	+= pvscsi
+DRV_KMODS	+= vmxnet3s
 
 #
 #	PCMCIA specific module(s)

usr/src/uts/intel/Makefile.rules

@@ -275,6 +275,10 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/intel/io/scsi/adapters/pvscsi/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
+$(OBJS_DIR)/%.o:		$(UTSBASE)/intel/io/vmxnet3s/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
 #
 # krtld compiled into unix
 #
@@ -488,6 +492,9 @@ $(LINTS_DIR)/%.ln:		$(UTSBASE)/intel/nskern/%.s
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/intel/io/scsi/adapters/pvscsi/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
 
+$(LINTS_DIR)/%.ln:		$(UTSBASE)/intel/io/vmxnet3s/%.c
+	@($(LHEAD) $(LINT.c) $< $(LTAIL))
+
 #
 # krtld lints
 #

usr/src/uts/intel/io/vmxnet3s/vmxnet3s.conf

@@ -0,0 +1,54 @@
+#
+# The contents of this file are subject to the terms of the Common
+# Development and Distribution License (the "License") version 1.0
+# and no later version.  You may not use this file except in
+# compliance with the License.
+#
+# You can obtain a copy of the License at
+#         http://www.opensource.org/licenses/cddl1.php
+#
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# Copyright (C) 2007, 2011 VMware, Inc. All rights reserved.
+# Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+#
+# Driver.conf file for VMware Vmxnet Generation 3 adapters.
+
+# TxRingSize --
+#
+#    Tx ring size for each vmxnet3s# adapter. Must be a multiple of 32.
+#
+#    Minimum value: 32
+#    Maximum value: 4096
+#
+TxRingSize=2048,2048,2048,2048,2048,2048,2048,2048,2048,2048;
+
+# RxRingSize --
+#
+#    Rx ring size for each vmxnet3s# adapter. Must be a multiple of 32.
+#
+#    Minimum value: 32
+#    Maximum value: 4096
+#
+RxRingSize=2048,2048,2048,2048,2048,2048,2048,2048,2048,2048;
+
+# RxBufPoolLimit --
+#
+#    Limit the number of Rx buffers cached for each vmxnet3s# adapter.
+#    Increasing the limit might improve performance but increases the
+#    memory footprint.
+#
+#    Minimum value: 0
+#    Maximum value: RxRingSize * 10
+#
+RxBufPoolLimit=512,512,512,512,512,512,512,512,512,512;
+
+# EnableLSO --
+#
+#    Enable or disable LSO for each vmxnet3s# adapter.
+#
+#    Minimum value: 0
+#    Maximum value: 1
+#
+EnableLSO=0,0,0,0,0,0,0,0,0,0;