[src/netbsd-9]: src/sys/net Pull up following revision(s) (requested by jmcne...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-9]: src/sys/net Pull up following revision(s) (requested by jmcne...
From: martin <martin%NetBSD.org@localhost>
Date: Tue, 07 Jul 2020 13:20:15 +0000
details:   https://anonhg.NetBSD.org/src/rev/0cde32c9aa91
branches:  netbsd-9
changeset: 935632:0cde32c9aa91
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jul 07 10:29:05 2020 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #980):

        sys/dev/pci/if_aq.c: revision 1.4
        sys/dev/pci/if_aq.c: revision 1.5
        sys/arch/amd64/conf/GENERIC: revision 1.553
        sys/dev/pci/files.pci: revision 1.419
        sys/arch/amd64/conf/XEN3_DOM0: revision 1.170
        sys/dev/pci/if_aq.c: revision 1.9
        share/man/man4/Makefile: revision 1.693
        sys/dev/pci/pcidevs: revision 1.1411
        share/man/man4/aq.4: revision 1.1
        share/man/man4/aq.4: revision 1.3
        sys/arch/i386/conf/ALL: revision 1.479
        share/man/man4/aq.4: revision 1.4
        sys/dev/pci/if_aq.c: revision 1.10
        sys/dev/pci/files.pci: revision 1.421
        sys/dev/pci/if_aq.c: revision 1.11
        sys/dev/pci/if_aq.c: revision 1.12
        sys/dev/pci/if_aq.c: revision 1.13
        sys/dev/pci/if_aq.c: revision 1.14
        sys/dev/pci/if_aq.c: revision 1.15
        sys/dev/pci/if_aq.c: revision 1.16
        sys/dev/pci/pcidevs: revision 1.1408
        sys/arch/amd64/conf/ALL: revision 1.135
        sys/net/ethertypes.h: revision 1.19
        sys/arch/i386/conf/GENERIC: revision 1.1218
        distrib/sets/lists/man/mi: revision 1.1668
        sys/dev/pci/if_aq.c: revision 1.1
        sys/dev/pci/if_aq.c: revision 1.2
        sys/dev/pci/pcidevs: revision 1.1395
        sys/dev/pci/if_aq.c: revision 1.3
        sys/arch/evbarm/conf/GENERIC64: revision 1.125

Add the ETHERTYPE_QINQ for 802.1ad VLAN stacking

add Aquantia AQC 10G network adapters
add support Aquantia AQC seriese 10G network adapters.

this driver is based on the FreeBSD version https://github.com/Aquantia/aqtion-freebsd ,
but drastically rewritten for NetBSD.

add aq(4)

 Add Aquantia AQC100, AQC100S and D100.

add support VLAN HW filter

set/clear IFF_OACTIVE flag only on txring 0

make counters per queue

support internal PHY temperature sensor

Found by kUBSan:
- Use unsigned to avoid undefined behavior in aq_hw_init().
- Cast to unsigned to avoid undefined behavior in aq_set_mac_addr().

fix descriptions of register map in comment

return the ifmedia active status correctly even while the link is not up after attach.
pointed out by msaitoh@. thanks.

On FIBRE devices, there are times when linkstat interrupt doesn't occur?
reported from Andrius V. thanks.
- use polling instead of linkstat interrupt when FIBRE
- add AQ_FORCE_POLL_LINKSTAT options (not by default)

sort product table, and tabify

add support AQC100S and D100.
not tested, but they are probably the same as the AQC100.

diffstat:

 distrib/sets/lists/man/mi      |     5 +-
 share/man/man4/Makefile        |     4 +-
 share/man/man4/aq.4            |    89 +
 sys/arch/amd64/conf/ALL        |     5 +-
 sys/arch/amd64/conf/GENERIC    |     5 +-
 sys/arch/amd64/conf/XEN3_DOM0  |     5 +-
 sys/arch/evbarm/conf/GENERIC64 |     3 +-
 sys/arch/i386/conf/ALL         |     5 +-
 sys/arch/i386/conf/GENERIC     |     5 +-
 sys/dev/pci/files.pci          |     8 +-
 sys/dev/pci/if_aq.c            |  4844 ++++++++++++++++++++++++++++++++++++++++
 sys/dev/pci/pcidevs            |     6 +-
 sys/net/ethertypes.h           |     3 +-
 13 files changed, 4970 insertions(+), 17 deletions(-)

diffs (truncated from 5209 to 300 lines):

diff -r 016990a6d732 -r 0cde32c9aa91 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Tue Jun 30 18:49:17 2020 +0000
+++ b/distrib/sets/lists/man/mi Tue Jul 07 10:29:05 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1649.2.6 2020/04/12 08:44:42 martin Exp $
+# $NetBSD: mi,v 1.1649.2.7 2020/07/07 10:29:06 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -852,6 +852,7 @@
 ./usr/share/man/cat4/ams.0                     man-sys-catman          .cat
 ./usr/share/man/cat4/an.0                      man-sys-catman          .cat
 ./usr/share/man/cat4/aps.0                     man-sys-catman          .cat
+./usr/share/man/cat4/aq.0                      man-sys-catman          .cat
 ./usr/share/man/cat4/arc/intro.0               man-sys-catman          .cat
 ./usr/share/man/cat4/arcmsr.0                  man-sys-catman          .cat
 ./usr/share/man/cat4/arcofi.0                  man-sys-catman          .cat
@@ -4066,6 +4067,7 @@
 ./usr/share/man/html4/ams.html                 man-sys-htmlman         html
 ./usr/share/man/html4/an.html                  man-sys-htmlman         html
 ./usr/share/man/html4/aps.html                 man-sys-htmlman         html
+./usr/share/man/html4/aq.html                  man-sys-htmlman         html
 ./usr/share/man/html4/arc/intro.html           man-sys-htmlman         html
 ./usr/share/man/html4/arcmsr.html              man-sys-htmlman         html
 ./usr/share/man/html4/arcofi.html              man-sys-htmlman         html
@@ -6976,6 +6978,7 @@
 ./usr/share/man/man4/ams.4                     man-sys-man             .man
 ./usr/share/man/man4/an.4                      man-sys-man             .man
 ./usr/share/man/man4/aps.4                     man-sys-man             .man
+./usr/share/man/man4/aq.4                      man-sys-man             .man
 ./usr/share/man/man4/arc/intro.4               man-sys-man             .man
 ./usr/share/man/man4/arcmsr.4                  man-sys-man             .man
 ./usr/share/man/man4/arcofi.4                  man-sys-man             .man
diff -r 016990a6d732 -r 0cde32c9aa91 share/man/man4/Makefile
--- a/share/man/man4/Makefile   Tue Jun 30 18:49:17 2020 +0000
+++ b/share/man/man4/Makefile   Tue Jul 07 10:29:05 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.680.2.4 2020/04/12 08:44:42 martin Exp $
+#      $NetBSD: Makefile,v 1.680.2.5 2020/07/07 10:29:05 martin Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 MAN=   aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -6,7 +6,7 @@
        adc.4 adm1026hm.4 admtemp.4 adv.4 adw.4 age.4 agp.4 agr.4 ahb.4 ahc.4 \
        ahcisata.4 ahd.4 aibs.4 alc.4 ale.4 alipm.4 altmem.4 altq.4 \
        am2315temp.4 amdpm.4 amdtemp.4 amhphy.4 amr.4 aps.4 asus.4 \
-       an.4 arcmsr.4 arcofi.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \
+       an.4 aq.4 arcmsr.4 arcofi.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \
        ath.4 athn.4 atphy.4 atppc.4 attimer.4 atw.4 \
        auacer.4 audio.4 audiocs.4 auich.4 \
        auixp.4 autri.4 auvia.4 awi.4 azalia.4 \
diff -r 016990a6d732 -r 0cde32c9aa91 share/man/man4/aq.4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/aq.4       Tue Jul 07 10:29:05 2020 +0000
@@ -0,0 +1,89 @@
+.\"    $NetBSD: aq.4,v 1.4.2.2 2020/07/07 10:29:06 martin Exp $
+.\"
+.\" Copyright (c) 2020 Ryo Shimizu <ryo%nerv.org@localhost>
+.\" 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 AUTHOR ``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 AUTHOR 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 April 24, 2020
+.Dt AQ 4
+.Os
+.Sh NAME
+.Nm aq
+.Nd Aquantia AQC multigigabit Network driver
+.Sh SYNOPSIS
+.Cd "aq* at pci? dev ? function ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports Aquantia AQC series controllers.
+Supported controllers include:
+.Pp
+.Bl -bullet -compact
+.It
+AQC100 10 Gigabit Network Adapter
+.It
+AQC107 10 Gigabit Network Adapter
+.It
+AQC108 5 Gigabit Network Adapter
+.It
+AQC109 2.5 Gigabit Network Adapter
+.It
+AQC111 5 Gigabit Network Adapter
+.It
+AQC112 2.5 Gigabit Network Adapter
+.It
+AQC100S 10 Gigabit Network Adapter
+.It
+AQC107S 10 Gigabit Network Adapter
+.It
+AQC108S 5 Gigabit Network Adapter
+.It
+AQC109S 2.5 Gigabit Network Adapter
+.It
+AQC111S 5 Gigabit Network Adapter
+.It
+AQC112S 2.5 Gigabit Network Adapter
+.It
+D100 10 Gigabit Network Adapter
+.It
+D107 10 Gigabit Network Adapter
+.It
+D108 5 Gigabit Network Adapter
+.It
+D109 2.5 Gigabit Network Adapter
+.El
+.Sh SEE ALSO
+.Xr arp 4 ,
+.Xr ifmedia 4 ,
+.Xr netintro 4 ,
+.Xr pci 4 ,
+.Xr vlan 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Nx 10.0 ,
+and is based on the
+.Fx
+driver of the same name, but has been drastically rewritten by Ryo Shimizu.
diff -r 016990a6d732 -r 0cde32c9aa91 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Tue Jun 30 18:49:17 2020 +0000
+++ b/sys/arch/amd64/conf/ALL   Tue Jul 07 10:29:05 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.120.2.3 2019/11/25 20:47:24 martin Exp $
+# $NetBSD: ALL,v 1.120.2.4 2020/07/07 10:29:05 martin 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.120.2.3 $"
+#ident         "ALL-$Revision: 1.120.2.4 $"
 
 maxusers       64              # estimated number of users
 
@@ -960,6 +960,7 @@
 alc*   at pci? dev ? function ?        # Attansic/Atheros L1C/L2C Ethernet
 ale*   at pci? dev ? function ?        # Attansic/Atheros L1E Ethernet
 an*    at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)
+aq*    at pci? dev ? function ?        # Aquantia AQC 10 gigabit
 ath*   at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11
 athn*  at pci? dev ? function ?        # Atheros AR9k (802.11a/g/n)
 atw*   at pci? dev ? function ?        # ADMtek ADM8211 (802.11)
diff -r 016990a6d732 -r 0cde32c9aa91 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue Jun 30 18:49:17 2020 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Jul 07 10:29:05 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.531.2.9 2020/05/18 18:12:25 martin Exp $
+# $NetBSD: GENERIC,v 1.531.2.10 2020/07/07 10:29:05 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.531.2.9 $"
+#ident         "GENERIC-$Revision: 1.531.2.10 $"
 
 maxusers       64              # estimated number of users
 
@@ -762,6 +762,7 @@
 alc*   at pci? dev ? function ?        # Attansic/Atheros L1C/L2C Ethernet
 ale*   at pci? dev ? function ?        # Attansic/Atheros L1E Ethernet
 an*    at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)
+aq*    at pci? dev ? function ?        # Aquantia AQC 10 gigabit
 ath*   at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11
 athn*  at pci? dev ? function ?        # Atheros AR9k (802.11a/g/n)
 atw*   at pci? dev ? function ?        # ADMtek ADM8211 (802.11)
diff -r 016990a6d732 -r 0cde32c9aa91 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Tue Jun 30 18:49:17 2020 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Tue Jul 07 10:29:05 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.167.2.2 2019/11/21 18:17:59 martin Exp $
+# $NetBSD: XEN3_DOM0,v 1.167.2.3 2020/07/07 10:29:05 martin Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -11,7 +11,7 @@
 #options       UVMHIST_PRINT
 #options       SYSCALL_DEBUG
 
-#ident         "XEN3_DOM0-$Revision: 1.167.2.2 $"
+#ident         "XEN3_DOM0-$Revision: 1.167.2.3 $"
 
 maxusers       32              # estimated number of users
 
@@ -333,6 +333,7 @@
 alc*   at pci? dev ? function ?        # Attansic/Atheros L1C/L2C Ethernet
 ale*   at pci? dev ? function ?        # Attansic/Atheros L1E Ethernet
 an*    at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)
+aq*    at pci? dev ? function ?        # Aquantia AQC 10 gigabit
 ath*   at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11
 atw*   at pci? dev ? function ?        # ADMtek ADM8211 (802.11)
 bce*   at pci? dev ? function ?        # Broadcom 4401 10/100 Ethernet
diff -r 016990a6d732 -r 0cde32c9aa91 sys/arch/evbarm/conf/GENERIC64
--- a/sys/arch/evbarm/conf/GENERIC64    Tue Jun 30 18:49:17 2020 +0000
+++ b/sys/arch/evbarm/conf/GENERIC64    Tue Jul 07 10:29:05 2020 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC64,v 1.103.2.12 2020/05/18 18:54:30 martin Exp $
+#      $NetBSD: GENERIC64,v 1.103.2.13 2020/07/07 10:29:06 martin Exp $
 #
 #      GENERIC ARM (aarch64) kernel
 #
@@ -289,6 +289,7 @@
 # Ethernet
 awge*          at fdt?                         # DesignWare Gigabit Ethernet
 emac*          at fdt?                         # Allwinner Gigabit Ethernet (EMAC)
+aq*            at pci? dev ? function ?        # Aquantia AQC 10 gigabit
 ena*           at pci? dev ? function ?        # Amazon.com Elastic Network Adapter
 mcx*           at pci? dev ? function ?        # Mellanox 5th generation Ethernet
 mskc*          at pci? dev ? function ?        # Marvell Yukon 2 Gigabit Ethernet
diff -r 016990a6d732 -r 0cde32c9aa91 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Tue Jun 30 18:49:17 2020 +0000
+++ b/sys/arch/i386/conf/ALL    Tue Jul 07 10:29:05 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.469.2.2 2019/11/25 20:47:24 martin Exp $
+# $NetBSD: ALL,v 1.469.2.3 2020/07/07 10:29:06 martin 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.469.2.2 $"
+#ident         "ALL-$Revision: 1.469.2.3 $"
 
 maxusers       64              # estimated number of users
 
@@ -1044,6 +1044,7 @@
 an*    at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)
 alc*   at pci? dev ? function ?        # Attansic/Atheros L1C/L2C Ethernet
 ale*   at pci? dev ? function ?        # Attansic/Atheros L1E Ethernet
+aq*    at pci? dev ? function ?        # Aquantia AQC 10 gigabit
 ath*   at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11
 athn*  at pci? dev ? function ?        # Atheros AR9k (802.11a/g/n)
 atw*   at pci? dev ? function ?        # ADMtek ADM8211 (802.11)
diff -r 016990a6d732 -r 0cde32c9aa91 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Tue Jun 30 18:49:17 2020 +0000
+++ b/sys/arch/i386/conf/GENERIC        Tue Jul 07 10:29:05 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1208.2.4 2019/11/25 20:47:24 martin Exp $
+# $NetBSD: GENERIC,v 1.1208.2.5 2020/07/07 10:29:06 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.1208.2.4 $"
+#ident         "GENERIC-$Revision: 1.1208.2.5 $"
 
 maxusers       64              # estimated number of users
 
@@ -956,6 +956,7 @@
 an*    at pci? dev ? function ?        # Aironet PC4500/PC4800 (802.11)
 alc*   at pci? dev ? function ?        # Attansic/Atheros L1C/L2C Ethernet
 ale*   at pci? dev ? function ?        # Attansic/Atheros L1E Ethernet
+aq*    at pci? dev ? function ?        # Aquantia AQC 10 gigabit
 ath*   at pci? dev ? function ?        # Atheros 5210/5211/5212 802.11
 athn*  at pci? dev ? function ?        # Atheros AR9k (802.11a/g/n)
 atw*   at pci? dev ? function ?        # ADMtek ADM8211 (802.11)
diff -r 016990a6d732 -r 0cde32c9aa91 sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Tue Jun 30 18:49:17 2020 +0000
+++ b/sys/dev/pci/files.pci     Tue Jul 07 10:29:05 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.413.2.1 2019/09/23 07:04:40 martin Exp $
+#      $NetBSD: files.pci,v 1.413.2.2 2020/07/07 10:29:05 martin Exp $
 #
 # Config file and device description for machine-independent PCI code.
Prev by Date: [src/trunk]: src/external/bsd/nvi/dist/vi PR bin/55468
Next by Date: [src/netbsd-9]: src/sys/dev/pci regen
Previous by Thread: [src/trunk]: src/external/bsd/nvi/dist/vi PR bin/55468
Next by Thread: [src/netbsd-9]: src/sys/dev/pci regen
Indexes:
Home | Main Index | Thread Index | Old Index