Module Name: src
Committed By: martin
Date: Fri Dec 3 18:11:42 UTC 2021
Modified Files:
src/share/man/man4 [netbsd-9]: puc.4
src/sys/dev/pci [netbsd-9]: pucdata.c
Log Message:
Pull up the following revisions (all via patch), requested by msaitoh
in ticket #1382:
sys/dev/pci/pucdata.c 1.106-1.112
share/man/man4/puc.4 1.42-1.43
- Add NetMos NM9900 Quad and Octal serial card.
- Add ASIX AX99100 PCIe 4port serial card.
- Add Oxford Semiconductor Exsys EX-41098 PCI serial card.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 src/share/man/man4/puc.4
cvs rdiff -u -r1.104.2.1 -r1.104.2.2 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/puc.4
diff -u src/share/man/man4/puc.4:1.41 src/share/man/man4/puc.4:1.41.2.1
--- src/share/man/man4/puc.4:1.41 Sun Jul 8 20:29:08 2018
+++ src/share/man/man4/puc.4 Fri Dec 3 18:11:41 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.41 2018/07/08 20:29:08 jnemeth Exp $
+.\" $NetBSD: puc.4,v 1.41.2.1 2021/12/03 18:11:41 martin Exp $
.\"
.\" Copyright (c) 1998 Christopher G. Demetriou
.\" All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
.\"
-.Dd July 8, 2018
+.Dd December 2, 2021
.Dt PUC 4
.Os
.Sh NAME
@@ -67,6 +67,7 @@ The driver currently supports the follow
.It Tn "Advantech PCI-1610 (4 port serial)"
.It Tn "Advantech PCI-1612 (4 port serial)"
.It Tn "Advantech PCI-1620 (8 port serial)"
+.It Tn "ASIX AX9910 (4 port serial)"
.It Tn "Avlab Low Profile PCI 4S Quartet (4 port serial)"
.It Tn "Avlab Low Profile PCI 4 Serial (4 port serial)"
.It Tn "Avlab PCI 2S (2 port serial)"
@@ -122,9 +123,12 @@ The driver currently supports the follow
.It Tn "NetMos NM9815 Dual 1284 (dual parallel)"
.It Tn "NetMos NM9835 series (up to dual serial and single parallel)"
.It Tn "NetMos NM9845 series (up to 6 serial and 1 parallel)"
+.It Tn "NetMos NM9855 series (up to 4 serial and 1 parallel)"
.It Tn "NetMos NM9865 series (up to 4 serial and 2 parallel)"
+.It Tn "NetMos NM9900 PCIe (4 port or 8 port serial)"
.It Tn "NetMos NM9901 PCIe (1 serial or 1 parallel)"
.It Tn "NetMos NM9904 PCIe (4 port serial)"
+.It Tn "NetMos NM9912 PCIe (2 serial or 1 parallel)"
.It Tn "NetMos NM9922 PCIe (2 port serial)"
.It Tn "Oxford Semiconductor OX16PCI952 (dual serial and single parallel)"
.It Tn "Oxford Semiconductor OX16PCI954 (4 port serial)"
@@ -132,6 +136,7 @@ The driver currently supports the follow
.It Tn "Oxford Semiconductor OXPCIe952 (2 port serial, legacy mode)"
.It Tn "Oxford Semiconductor OXPCIe954 (4 port serial)"
.It Tn "Oxford Semiconductor OXmPCI952 (2 port serial)"
+.It Tn "Oxford Semiconductor Exsys EX-41098 (4 port serial)"
.It Tn "Perle Systems PCI-RAS 4 modem ports"
.It Tn "Perle Systems PCI-RAS 8 modem ports"
.It Tn "Perle Systems PCI-RASV92 4 modem ports"
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.104.2.1 src/sys/dev/pci/pucdata.c:1.104.2.2
--- src/sys/dev/pci/pucdata.c:1.104.2.1 Thu Nov 14 15:41:03 2019
+++ src/sys/dev/pci/pucdata.c Fri Dec 3 18:11:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.104.2.1 2019/11/14 15:41:03 martin Exp $ */
+/* $NetBSD: pucdata.c,v 1.104.2.2 2021/12/03 18:11:41 martin Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.104.2.1 2019/11/14 15:41:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.104.2.2 2021/12/03 18:11:41 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,6 +142,15 @@ const struct puc_device_description puc_
}
},
+ /* ASIX PCIe AX99100 : 4S */
+ { "ASIX AX99100 UART",
+ { PCI_VENDOR_ASIX, PCI_PRODUCT_ASIX_AX99100, 0xa000, 0x1000 },
+ { 0xffff, 0xffff, 0xffff, 0xffff },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ },
+ },
+
/* Avlab Technology, Inc. PCI 2 Serial: 2S */
{ "Avlab PCI 2 Serial",
{ PCI_VENDOR_AVLAB, PCI_PRODUCT_AVLAB_PCI2S, 0, 0 },
@@ -983,6 +992,25 @@ const struct puc_device_description puc_
},
},
+ /* NetMos PCIe NM9900 : 4S */
+ { "NetMos NM9900 UART",
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9900, 0xa000, 0x1000 },
+ { 0xffff, 0xffff, 0xffff, 0xffff },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ },
+ },
+
+ /* NetMos PCIe NM9900 : 8S */
+ { "NetMos NM9900 UART 8S",
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9900, 0xa000, 0x3002 },
+ { 0xffff, 0xffff, 0xffff, 0xffff },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR3, 0x00, COM_FREQ },
+ },
+ },
+
/* NetMos PCIe Peripheral Controller :UART part */
{ "NetMos NM9901 UART",
{ PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9901, 0xa000, 0x1000 },
@@ -1294,6 +1322,19 @@ const struct puc_device_description puc_
},
},
+ /* Oxford Semiconductor Exsys EX-41098 PCI UARTs */
+ { "Oxford Semiconductor Exsys EX-41098 UARTs",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_EXSYS_EX41098,
+ PCI_VENDOR_OXFORDSEMI, 0 },
+ { 0xffff, 0xffff, 0xffff, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 8},
+ },
+ },
+
/* I-O DATA RSA-PCI2 eight(5-8) UARTs base on OX16PCI954 */
{ "I-O DATA RSA-PCI2/P8 (5-8) UARTs",
{ PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_EXSYS_EX41098,
@@ -1987,6 +2028,51 @@ const struct puc_device_description puc_
},
},
+ /* Intel Comet Lake KT */
+ { "Intel Comet Lake KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CMTLK_KT, 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel 400 Series (H) KT */
+ { "Intel 400 Series (H) KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_4HS_H_KT, 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel 400 Series (V) KT */
+ { "Intel 400 Series (V) KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_4HS_V_KT, 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel 495 Series KT */
+ { "Intel 495 Series KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_495_YU_KT, 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel 500 Series (H) KT */
+ { "Intel 500 Series (H) KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5HS_H_KT, 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ },
+ },
+
/* Intel C600/X79 Series KT */
{ "Intel C600/X79 Series KT",
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_KT, 0, 0 },
@@ -2005,6 +2091,15 @@ const struct puc_device_description puc_
},
},
+ /* Intel Core 5G (mobile) KT */
+ { "Intel Core 5G (mobile) KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE5G_M_KT, 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ },
+ },
+
/* Intel EG20T UART */
{ "Intel EG20T UART #0",
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EG20T_UART_0, 0, 0 },
