summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-07-07 10:29:05 +0000
committermartin <martin@NetBSD.org>2020-07-07 10:29:05 +0000
commit98c9dbf0687dcc80ec50ed806aab1ae9a8455569 (patch)
tree83069efdba73264ce2b4497548f9077fe5a3fb4c /sys/arch/amd64
parenta10ed4d277f07967c819e3c277d1aceb1c5e2a0a (diff)
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 (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/ALL5
-rw-r--r--sys/arch/amd64/conf/GENERIC5
-rw-r--r--sys/arch/amd64/conf/XEN3_DOM05
3 files changed, 9 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/ALL b/sys/arch/amd64/conf/ALL
index 3a2e9c3c3b3..329a79bfabd 100644
--- a/sys/arch/amd64/conf/ALL
+++ b/sys/arch/amd64/conf/ALL
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet
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 --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 9437d1f9020..42df48317af 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet
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 --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0
index 15dbfda33fb..913de44c312 100644
--- a/sys/arch/amd64/conf/XEN3_DOM0
+++ b/sys/arch/amd64/conf/XEN3_DOM0
@@ -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 INCLUDE_CONFIG_FILE # embed config file in kernel binary
#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 @@ age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet
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