Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/modules/if_iavf Added iavf(4) that is based on OpenBSD's...



details:   https://anonhg.NetBSD.org/src/rev/a388de810f1e
branches:  trunk
changeset: 954672:a388de810f1e
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Tue Sep 08 10:05:47 2020 +0000

description:
Added iavf(4) that is based on OpenBSD's iavf(4) implementation

reviewed by msaitoh@n.o and knakahara@n.o

diffstat:

 distrib/sets/lists/man/mi            |     5 +-
 distrib/sets/lists/modules/md.amd64  |     4 +-
 distrib/sets/lists/modules/md.evbarm |     4 +-
 distrib/sets/lists/modules/md.i386   |     4 +-
 share/man/man4/Makefile              |     8 +-
 share/man/man4/iavf.4                |    63 +
 sys/arch/amd64/conf/ALL              |     5 +-
 sys/arch/amd64/conf/GENERIC          |     5 +-
 sys/arch/i386/conf/ALL               |     5 +-
 sys/arch/i386/conf/GENERIC           |     5 +-
 sys/dev/pci/files.pci                |     7 +-
 sys/dev/pci/if_iavf.c                |  5333 ++++++++++++++++++++++++++++++++++
 sys/dev/pci/if_iavfvar.h             |   238 +
 sys/dev/pci/if_ixl.c                 |   108 +-
 sys/dev/pci/if_ixlvar.h              |   145 +-
 sys/modules/Makefile                 |     3 +-
 sys/modules/if_iavf/Makefile         |    12 +
 sys/modules/if_iavf/if_iavf.ioconf   |    10 +
 18 files changed, 5840 insertions(+), 124 deletions(-)

diffs (truncated from 6245 to 300 lines):

diff -r 7ba4693cc3ff -r a388de810f1e distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Tue Sep 08 06:13:53 2020 +0000
+++ b/distrib/sets/lists/man/mi Tue Sep 08 10:05:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1700 2020/08/28 12:15:05 christos Exp $
+# $NetBSD: mi,v 1.1701 2020/09/08 10:05:47 yamaguchi Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1311,6 +1311,7 @@
 ./usr/share/man/cat4/i4btrc.0                  man-obsolete            obsolete
 ./usr/share/man/cat4/i915drm.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/iavc.0                    man-obsolete            obsolete
+./usr/share/man/cat4/iavf.0                    man-sys-catman          .cat
 ./usr/share/man/cat4/ibmcd.0                   man-sys-catman          .cat
 ./usr/share/man/cat4/ibmhawk.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/ichlpcib.0                        man-obsolete            obsolete
@@ -4496,6 +4497,7 @@
 ./usr/share/man/html4/i386/viac7temp.html      man-sys-htmlman         html
 ./usr/share/man/html4/i915drm.html             man-sys-htmlman         html
 ./usr/share/man/html4/iavc.html                        man-obsolete            obsolete
+./usr/share/man/html4/iavf.html                        man-sys-htmlman         html
 ./usr/share/man/html4/ibmcd.html               man-sys-htmlman         html
 ./usr/share/man/html4/ibmhawk.html             man-sys-htmlman         html
 ./usr/share/man/html4/ichlpcib.html            man-obsolete            obsolete
@@ -7513,6 +7515,7 @@
 ./usr/share/man/man4/i4btrc.4                  man-obsolete            obsolete
 ./usr/share/man/man4/i915drm.4                 man-sys-man             .man
 ./usr/share/man/man4/iavc.4                    man-obsolete            obsolete
+./usr/share/man/man4/iavf.4                    man-sys-man             .man
 ./usr/share/man/man4/ibmcd.4                   man-sys-man             .man
 ./usr/share/man/man4/ibmhawk.4                 man-sys-man             .man
 ./usr/share/man/man4/ichlpcib.4                        man-obsolete            obsolete
diff -r 7ba4693cc3ff -r a388de810f1e distrib/sets/lists/modules/md.amd64
--- a/distrib/sets/lists/modules/md.amd64       Tue Sep 08 06:13:53 2020 +0000
+++ b/distrib/sets/lists/modules/md.amd64       Tue Sep 08 10:05:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.88 2020/08/27 15:32:00 riastradh Exp $
+# $NetBSD: md.amd64,v 1.89 2020/09/08 10:05:47 yamaguchi Exp $
 #
 ./@MODULEDIR@/acpiacad                         modules-base-kernel     kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod           modules-base-kernel     kmod
@@ -158,6 +158,8 @@
 ./@MODULEDIR@/i915drmkms/i915drmkms.kmod       modules-base-kernel     kmod
 ./@MODULEDIR@/ichsmb                           modules-base-kernel     kmod
 ./@MODULEDIR@/ichsmb/ichsmb.kmod               modules-base-kernel     kmod
+./@MODULEDIR@/if_iavf                          modules-base-kernel     kmod
+./@MODULEDIR@/if_iavf/if_iavf.kmod             modules-base-kernel     kmod
 ./@MODULEDIR@/if_ixl                           modules-base-kernel     kmod
 ./@MODULEDIR@/if_ixl/if_ixl.kmod               modules-base-kernel     kmod
 ./@MODULEDIR@/imc                              modules-base-kernel     kmod
diff -r 7ba4693cc3ff -r a388de810f1e distrib/sets/lists/modules/md.evbarm
--- a/distrib/sets/lists/modules/md.evbarm      Tue Sep 08 06:13:53 2020 +0000
+++ b/distrib/sets/lists/modules/md.evbarm      Tue Sep 08 10:05:47 2020 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: md.evbarm,v 1.1 2020/03/11 08:31:08 skrll Exp $
+# $NetBSD: md.evbarm,v 1.2 2020/09/08 10:05:47 yamaguchi Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
+./@MODULEDIR@/if_iavf                          modules-base-kernel     kmod
+./@MODULEDIR@/if_iavf/if_iavf.kmod             modules-base-kernel     kmod
 ./@MODULEDIR@/if_ixl                           modules-base-kernel     kmod
 ./@MODULEDIR@/if_ixl/if_ixl.kmod               modules-base-kernel     kmod
 ./@MODULEDIR@/ubsec                            modules-base-kernel     kmod
diff -r 7ba4693cc3ff -r a388de810f1e distrib/sets/lists/modules/md.i386
--- a/distrib/sets/lists/modules/md.i386        Tue Sep 08 06:13:53 2020 +0000
+++ b/distrib/sets/lists/modules/md.i386        Tue Sep 08 10:05:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.88 2020/08/27 15:32:00 riastradh Exp $
+# $NetBSD: md.i386,v 1.89 2020/09/08 10:05:47 yamaguchi Exp $
 #
 ./@MODULEDIR@/acpiacad                         modules-base-kernel     kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod           modules-base-kernel     kmod
@@ -112,6 +112,8 @@
 ./@MODULEDIR@/i915drmkms/i915drmkms.kmod       modules-base-kernel     kmod
 ./@MODULEDIR@/ichsmb                           modules-base-kernel     kmod
 ./@MODULEDIR@/ichsmb/ichsmb.kmod               modules-base-kernel     kmod
+./@MODULEDIR@/if_iavf                          modules-base-kernel     kmod
+./@MODULEDIR@/if_iavf/if_iavf.kmod             modules-base-kernel     kmod
 ./@MODULEDIR@/if_ixl                           modules-base-kernel     kmod
 ./@MODULEDIR@/if_ixl/if_ixl.kmod               modules-base-kernel     kmod
 ./@MODULEDIR@/imc                              modules-base-kernel     kmod
diff -r 7ba4693cc3ff -r a388de810f1e share/man/man4/Makefile
--- a/share/man/man4/Makefile   Tue Sep 08 06:13:53 2020 +0000
+++ b/share/man/man4/Makefile   Tue Sep 08 10:05:47 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.707 2020/08/20 21:36:00 riastradh Exp $
+#      $NetBSD: Makefile,v 1.708 2020/09/08 10:05:47 yamaguchi Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 MAN=   aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -29,9 +29,9 @@
        glxtphy.4 gpib.4 gpio.4 gpioirq.4 gpiolock.4 gpiopps.4 gpiopwm.4 \
        gpiosim.4 gre.4 gphyter.4 gsip.4 \
        hdaudio.4 hifn.4 hme.4 hpacel.4 hpqlb.4 hptide.4 hythygtemp.4 \
-       ibmcd.4 ibmhawk.4 ichsmb.4 icmp.4 icp.4 icsphy.4 iee.4 ieee80211.4 \
-       ifmedia.4 igmafb.4 igphy.4 igsfb.4 iha.4 ihidev.4 ihphy.4 iic.4 ims.4 \
-       inet.4 ikphy.4 inphy.4 intersil7170.4 intro.4 \
+       iavf.4 ibmcd.4 ibmhawk.4 ichsmb.4 icmp.4 icp.4 icsphy.4 iee.4 \
+       ieee80211.4 ifmedia.4 igmafb.4 igphy.4 igsfb.4 iha.4 ihidev.4 \
+       ihphy.4 iic.4 ims.4 inet.4 ikphy.4 inphy.4 intersil7170.4 intro.4 \
        ioasic.4 ioat.4 iop.4 iophy.4 iopsp.4 ip.4 ipgphy.4 ipmi.4 ipw.4 \
        irmce.4 isp.4 ismt.4 isv.4 itesio.4 iteide.4 iwi.4 iwm.4 iwn.4 ixg.4 \
        ixl.4 ixpide.4 ixv.4 \
diff -r 7ba4693cc3ff -r a388de810f1e share/man/man4/iavf.4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/iavf.4     Tue Sep 08 10:05:47 2020 +0000
@@ -0,0 +1,63 @@
+.\"    $NetBSD: iavf.4,v 1.1 2020/09/08 10:05:47 yamaguchi Exp $
+.\"
+.\" Copyright (c) 2020 Internet Initiative Japan, Inc.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+
+.Dd September 7, 2020
+.Dt IAVF 4
+.Os
+.Sh NAME
+.Nm iavf
+.Nd Intel Ethernet Adaptive Virtual Function driver
+.Sh SYNOPSIS
+.Cd "iavf* at pci? dev ? function ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the SR-IOV Virtual Functions of Intel 700 series Ethernet
+controller devices.
+.Sh SEE ALSO
+.Xr arp 4 ,
+.Xr ifmedia 4 ,
+.Xr pci 4 ,
+.Xr ifconfig 8
+.Sh History
+The
+.Nm
+driver comes from
+.Ox .
+It first appeared in
+.Nx 10.0 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An David Gwynne Aq Mt dlg%openbsd.org@localhost
+and
+.An Jonathan Matthew Aq Mt jmatthew%openbsd.org@localhost .
+It was imported from
+.Ox
+into
+.Nx
diff -r 7ba4693cc3ff -r a388de810f1e sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Tue Sep 08 06:13:53 2020 +0000
+++ b/sys/arch/amd64/conf/ALL   Tue Sep 08 10:05:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.162 2020/08/26 16:03:41 riastradh Exp $
+# $NetBSD: ALL,v 1.163 2020/09/08 10:05:47 yamaguchi Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "ALL-$Revision: 1.162 $"
+#ident         "ALL-$Revision: 1.163 $"
 
 maxusers       64              # estimated number of users
 
@@ -979,6 +979,7 @@
 gem*   at pci? dev ? function ?        # Apple GMAC and Sun ERI gigabit enet
 gsip*  at pci? dev ? function ?        # NS83820 Gigabit Ethernet
 hme*   at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ
+iavf*  at pci? dev ? function ?        # Intel Adaptive Virtual Function
 ipw*   at pci? dev ? function ?        # Intel PRO/Wireless 2100
 iwi*   at pci? dev ? function ?        # Intel PRO/Wireless 2200BG
 iwm*   at pci? dev ? function ?        # Intel Wireless WiFi Link 7xxx
diff -r 7ba4693cc3ff -r a388de810f1e sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue Sep 08 06:13:53 2020 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Sep 08 10:05:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.578 2020/08/30 11:16:17 dholland Exp $
+# $NetBSD: GENERIC,v 1.579 2020/09/08 10:05:47 yamaguchi Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.578 $"
+#ident         "GENERIC-$Revision: 1.579 $"
 
 maxusers       64              # estimated number of users
 
@@ -811,6 +811,7 @@
 gem*   at pci? dev ? function ?        # Apple GMAC and Sun ERI gigabit enet
 gsip*  at pci? dev ? function ?        # NS83820 Gigabit Ethernet
 hme*   at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ
+iavf*  at pci? dev ? function ?        # Intel Adaptive Virtual Function
 ipw*   at pci? dev ? function ?        # Intel PRO/Wireless 2100
 iwi*   at pci? dev ? function ?        # Intel PRO/Wireless 2200BG
 iwm*   at pci? dev ? function ?        # Intel Centrino 7260
diff -r 7ba4693cc3ff -r a388de810f1e sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Tue Sep 08 06:13:53 2020 +0000
+++ b/sys/arch/i386/conf/ALL    Tue Sep 08 10:05:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.495 2020/08/01 08:20:49 maxv Exp $
+# $NetBSD: ALL,v 1.496 2020/09/08 10:05:47 yamaguchi Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "ALL-$Revision: 1.495 $"
+#ident         "ALL-$Revision: 1.496 $"
 
 maxusers       64              # estimated number of users
 
@@ -1062,6 +1062,7 @@
 gem*   at pci? dev ? function ?        # Apple GMAC and Sun ERI gigabit enet
 gsip*  at pci? dev ? function ?        # NS83820 Gigabit Ethernet
 hme*   at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ
+iavf*  at pci? dev ? function ?        # Intel Adaptive Virtual Function
 ipw*   at pci? dev ? function ?        # Intel PRO/Wireless 2100
 iwi*   at pci? dev ? function ?        # Intel PRO/Wireless 2200BG
 iwm*   at pci? dev ? function ?        # Intel Wireless WiFi Link 7xxx
diff -r 7ba4693cc3ff -r a388de810f1e sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Tue Sep 08 06:13:53 2020 +0000
+++ b/sys/arch/i386/conf/GENERIC        Tue Sep 08 10:05:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1231 2020/08/16 10:27:47 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.1232 2020/09/08 10:05:47 yamaguchi Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.1231 $"
+#ident         "GENERIC-$Revision: 1.1232 $"
 
 maxusers       64              # estimated number of users
 
@@ -983,6 +983,7 @@
 fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
 gsip*  at pci? dev ? function ?        # NS83820 Gigabit Ethernet
 hme*   at pci? dev ? function ?        # Sun Microelectronics STP2002-STQ
+iavf*  at pci? dev ? function ?        # Intel Adaptive Virtual Function
 ipw*   at pci? dev ? function ?        # Intel PRO/Wireless 2100
 iwi*   at pci? dev ? function ?        # Intel PRO/Wireless 2200BG
 iwm*   at pci? dev ? function ?        # Intel Wireless WiFi Link 7xxx
diff -r 7ba4693cc3ff -r a388de810f1e sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Tue Sep 08 06:13:53 2020 +0000
+++ b/sys/dev/pci/files.pci     Tue Sep 08 10:05:47 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.430 2020/07/26 14:51:18 jdolecek Exp $
+#      $NetBSD: files.pci,v 1.431 2020/09/08 10:05:47 yamaguchi Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -1166,6 +1166,11 @@
 defparam opt_if_ixl.h  IXL_STATS_INTERVAL_MSEC
                        IXL_QUEUE_NUM
 
+# Intel Ethernet Adaptive Virtual Function
+device iavf: ether, ifnet, arp
+attach iavf at pci
+file   dev/pci/if_iavf.c       iavf
+
 # Intel XMM 7360 LTE modem
 device  wwanc {} : tty
 attach  wwanc at pci
diff -r 7ba4693cc3ff -r a388de810f1e sys/dev/pci/if_iavf.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/pci/if_iavf.c     Tue Sep 08 10:05:47 2020 +0000



Home | Main Index | Thread Index | Old Index