Wed Apr 22 22:54:44 2020 UTC ()
Add AQUANTIA AQC100 from Andrius V.


(christos)
diff -r1.11 -r1.12 src/sys/dev/pci/if_aq.c
diff -r1.1410 -r1.1411 src/sys/dev/pci/pcidevs
cvs diff -r1.11 -r1.12 src/sys/dev/pci/if_aq.c (expand / switch to unified diff)

--- src/sys/dev/pci/if_aq.c 2020/02/15 12:20:35 1.11
+++ src/sys/dev/pci/if_aq.c 2020/04/22 22:54:43 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_aq.c,v 1.11 2020/02/15 12:20:35 ryo Exp $ */ 1/* $NetBSD: if_aq.c,v 1.12 2020/04/22 22:54:43 christos Exp $ */
2 2
3/** 3/**
4 * aQuantia Corporation Network Driver 4 * aQuantia Corporation Network Driver
5 * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved 5 * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
11 * (1) Redistributions of source code must retain the above 11 * (1) Redistributions of source code must retain the above
12 * copyright notice, this list of conditions and the following 12 * copyright notice, this list of conditions and the following
13 * disclaimer. 13 * disclaimer.
14 * 14 *
@@ -52,27 +52,27 @@ @@ -52,27 +52,27 @@
52 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 52 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
53 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 53 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
54 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, 54 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
55 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 55 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
56 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 56 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
57 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 57 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
58 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 58 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
59 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 59 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
60 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 60 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
61 * POSSIBILITY OF SUCH DAMAGE. 61 * POSSIBILITY OF SUCH DAMAGE.
62 */ 62 */
63 63
64#include <sys/cdefs.h> 64#include <sys/cdefs.h>
65__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.11 2020/02/15 12:20:35 ryo Exp $"); 65__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.12 2020/04/22 22:54:43 christos Exp $");
66 66
67#ifdef _KERNEL_OPT 67#ifdef _KERNEL_OPT
68#include "opt_if_aq.h" 68#include "opt_if_aq.h"
69#include "sysmon_envsys.h" 69#include "sysmon_envsys.h"
70#endif 70#endif
71 71
72#include <sys/param.h> 72#include <sys/param.h>
73#include <sys/types.h> 73#include <sys/types.h>
74#include <sys/bitops.h> 74#include <sys/bitops.h>
75#include <sys/cprng.h> 75#include <sys/cprng.h>
76#include <sys/cpu.h> 76#include <sys/cpu.h>
77#include <sys/interrupt.h> 77#include <sys/interrupt.h>
78#include <sys/module.h> 78#include <sys/module.h>
@@ -1144,26 +1144,30 @@ static const struct aq_product { @@ -1144,26 +1144,30 @@ static const struct aq_product {
1144} aq_products[] = { 1144} aq_products[] = {
1145 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC107, 1145 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC107,
1146 "Aquantia AQC107 10 Gigabit Network Adapter", 1146 "Aquantia AQC107 10 Gigabit Network Adapter",
1147 AQ_MEDIA_TYPE_TP, AQ_LINK_ALL 1147 AQ_MEDIA_TYPE_TP, AQ_LINK_ALL
1148 }, 1148 },
1149 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC108, 1149 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC108,
1150 "Aquantia AQC108 5 Gigabit Network Adapter", 1150 "Aquantia AQC108 5 Gigabit Network Adapter",
1151 AQ_MEDIA_TYPE_TP, AQ_LINK_100M | AQ_LINK_1G | AQ_LINK_2G5 | AQ_LINK_5G 1151 AQ_MEDIA_TYPE_TP, AQ_LINK_100M | AQ_LINK_1G | AQ_LINK_2G5 | AQ_LINK_5G
1152 }, 1152 },
1153 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC109, 1153 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC109,
1154 "Aquantia AQC109 2.5 Gigabit Network Adapter", 1154 "Aquantia AQC109 2.5 Gigabit Network Adapter",
1155 AQ_MEDIA_TYPE_TP, AQ_LINK_100M | AQ_LINK_1G | AQ_LINK_2G5 1155 AQ_MEDIA_TYPE_TP, AQ_LINK_100M | AQ_LINK_1G | AQ_LINK_2G5
1156 }, 1156 },
 1157 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC100,
 1158 "Aquantia AQC100 10 Gigabit Network Adapter",
 1159 AQ_MEDIA_TYPE_FIBRE, AQ_LINK_ALL
 1160 },
1157 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC111, 1161 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC111,
1158 "Aquantia AQC111 5 Gigabit Network Adapter", 1162 "Aquantia AQC111 5 Gigabit Network Adapter",
1159 AQ_MEDIA_TYPE_TP, AQ_LINK_100M | AQ_LINK_1G | AQ_LINK_2G5 | AQ_LINK_5G 1163 AQ_MEDIA_TYPE_TP, AQ_LINK_100M | AQ_LINK_1G | AQ_LINK_2G5 | AQ_LINK_5G
1160 }, 1164 },
1161 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC112, 1165 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC112,
1162 "Aquantia AQC112 2.5 Gigabit Network Adapter", 1166 "Aquantia AQC112 2.5 Gigabit Network Adapter",
1163 AQ_MEDIA_TYPE_TP, AQ_LINK_100M | AQ_LINK_1G | AQ_LINK_2G5 1167 AQ_MEDIA_TYPE_TP, AQ_LINK_100M | AQ_LINK_1G | AQ_LINK_2G5
1164 }, 1168 },
1165 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC107S, 1169 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC107S,
1166 "Aquantia AQC107S 10 Gigabit Network Adapter", 1170 "Aquantia AQC107S 10 Gigabit Network Adapter",
1167 AQ_MEDIA_TYPE_TP, AQ_LINK_ALL 1171 AQ_MEDIA_TYPE_TP, AQ_LINK_ALL
1168 }, 1172 },
1169 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC108S, 1173 { PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC108S,
cvs diff -r1.1410 -r1.1411 src/sys/dev/pci/pcidevs (expand / switch to unified diff)

--- src/sys/dev/pci/pcidevs 2020/04/22 15:39:59 1.1410
+++ src/sys/dev/pci/pcidevs 2020/04/22 22:54:43 1.1411
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: pcidevs,v 1.1410 2020/04/22 15:39:59 prlw1 Exp $ 1$NetBSD: pcidevs,v 1.1411 2020/04/22 22:54:43 christos Exp $
2 2
3/* 3/*
4 * Copyright (c) 1995, 1996 Christopher G. Demetriou 4 * Copyright (c) 1995, 1996 Christopher G. Demetriou
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -1283,26 +1283,27 @@ product APPLE SHASTA_HT 0x0056 Shasta H @@ -1283,26 +1283,27 @@ product APPLE SHASTA_HT 0x0056 Shasta H
1283product APPLE INTREPID2_AGP 0x0066 Intrepid 2 AGP 1283product APPLE INTREPID2_AGP 0x0066 Intrepid 2 AGP
1284product APPLE INTREPID2_PCI1 0x0067 Intrepid 2 PCI 1284product APPLE INTREPID2_PCI1 0x0067 Intrepid 2 PCI
1285product APPLE INTREPID2_PCI2 0x0068 Intrepid 2 PCI 1285product APPLE INTREPID2_PCI2 0x0068 Intrepid 2 PCI
1286product APPLE INTREPID2_ATA 0x0069 Intrepid 2 ATA 1286product APPLE INTREPID2_ATA 0x0069 Intrepid 2 ATA
1287product APPLE INTREPID2_FW 0x006a Intrepid 2 FireWire 1287product APPLE INTREPID2_FW 0x006a Intrepid 2 FireWire
1288product APPLE INTREPID2_GMAC 0x006b Intrepid 2 GMAC 1288product APPLE INTREPID2_GMAC 0x006b Intrepid 2 GMAC
1289product APPLE BCM5701 0x1645 BCM5701 1289product APPLE BCM5701 0x1645 BCM5701
1290 1290
1291/* Aquantia Corp. */ 1291/* Aquantia Corp. */
1292product AQUANTIA AQC100 0x00b1 AQC100 10 Gigabit Network Adapter 1292product AQUANTIA AQC100 0x00b1 AQC100 10 Gigabit Network Adapter
1293product AQUANTIA AQC107 0x07b1 AQC107 10 Gigabit Network Adapter 1293product AQUANTIA AQC107 0x07b1 AQC107 10 Gigabit Network Adapter
1294product AQUANTIA AQC108 0x08b1 AQC108 5 Gigabit Network Adapter 1294product AQUANTIA AQC108 0x08b1 AQC108 5 Gigabit Network Adapter
1295product AQUANTIA AQC109 0x09b1 AQC109 2.5 Gigabit Network Adapter 1295product AQUANTIA AQC109 0x09b1 AQC109 2.5 Gigabit Network Adapter
 1296product AQUANTIA AQC100 0x00b1 AQC100 10 Gigabit Network Adapter
1296product AQUANTIA AQC111 0x11b1 AQC111 5 Gigabit Network Adapter 1297product AQUANTIA AQC111 0x11b1 AQC111 5 Gigabit Network Adapter
1297product AQUANTIA AQC112 0x12b1 AQC112 2.5 Gigabit Network Adapter 1298product AQUANTIA AQC112 0x12b1 AQC112 2.5 Gigabit Network Adapter
1298product AQUANTIA AQC100S 0x80b1 AQC100S 10 Gigabit Network Adapter 1299product AQUANTIA AQC100S 0x80b1 AQC100S 10 Gigabit Network Adapter
1299product AQUANTIA AQC107S 0x87b1 AQC107S 10 Gigabit Network Adapter 1300product AQUANTIA AQC107S 0x87b1 AQC107S 10 Gigabit Network Adapter
1300product AQUANTIA AQC108S 0x88b1 AQC108S 5 Gigabit Network Adapter 1301product AQUANTIA AQC108S 0x88b1 AQC108S 5 Gigabit Network Adapter
1301product AQUANTIA AQC109S 0x89b1 AQC109S 2.5 Gigabit Network Adapter 1302product AQUANTIA AQC109S 0x89b1 AQC109S 2.5 Gigabit Network Adapter
1302product AQUANTIA AQC111S 0x91b1 AQC111S 5 Gigabit Network Adapter 1303product AQUANTIA AQC111S 0x91b1 AQC111S 5 Gigabit Network Adapter
1303product AQUANTIA AQC112S 0x92b1 AQC112S 2.5 Gigabit Network Adapter 1304product AQUANTIA AQC112S 0x92b1 AQC112S 2.5 Gigabit Network Adapter
1304product AQUANTIA D100 0xd100 D100 10 Gigabit Network Adapter 1305product AQUANTIA D100 0xd100 D100 10 Gigabit Network Adapter
1305product AQUANTIA D107 0xd107 D107 10 Gigabit Network Adapter 1306product AQUANTIA D107 0xd107 D107 10 Gigabit Network Adapter
1306product AQUANTIA D108 0xd108 D108 5 Gigabit Network Adapter 1307product AQUANTIA D108 0xd108 D108 5 Gigabit Network Adapter
1307product AQUANTIA D109 0xd109 D109 2.5 Gigabit Network Adapter 1308product AQUANTIA D109 0xd109 D109 2.5 Gigabit Network Adapter
1308 1309