Module Name: src
Committed By: msaitoh
Date: Thu Dec 12 14:23:52 UTC 2024
Modified Files:
src/share/man/man4: puc.4
src/sys/dev/pci: pucdata.c
Log Message:
puc(4): Add some Oxford Semiconductor devices support from FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/share/man/man4/puc.4
cvs rdiff -u -r1.117 -r1.118 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.46 src/share/man/man4/puc.4:1.47
--- src/share/man/man4/puc.4:1.46 Mon Nov 11 14:48:01 2024
+++ src/share/man/man4/puc.4 Thu Dec 12 14:23:52 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.46 2024/11/11 14:48:01 msaitoh Exp $
+.\" $NetBSD: puc.4,v 1.47 2024/12/12 14:23:52 msaitoh 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 November 11, 2024
+.Dd December 12, 2024
.Dt PUC 4
.Os
.Sh NAME
@@ -146,6 +146,7 @@ The driver currently supports the follow
.It Tn "Oxford Semiconductor OX16PCI958 (8 port serial)"
.It Tn "Oxford Semiconductor OXPCIe952 (2 port serial, legacy mode)"
.It Tn "Oxford Semiconductor OXPCIe954 (4 port serial)"
+.It Tn "Oxford Semiconductor OXPCIe958 (8 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"
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.117 src/sys/dev/pci/pucdata.c:1.118
--- src/sys/dev/pci/pucdata.c:1.117 Mon Nov 11 14:48:01 2024
+++ src/sys/dev/pci/pucdata.c Thu Dec 12 14:23:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.117 2024/11/11 14:48:01 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.118 2024/12/12 14:23:52 msaitoh 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.117 2024/11/11 14:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.118 2024/12/12 14:23:52 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1852,19 +1852,6 @@ const struct puc_device_description puc_
},
},
- /* Oxford Semiconductor OXPCIe954 PCIe UARTs */
- { "Oxford Semiconductor OXPCIe954 UART",
- { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE954,
- 0, 0 },
- { 0xffff, 0xffff, 0, 0 },
- {
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1200, COM_FREQ * 0x22 },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1400, COM_FREQ * 0x22 },
- { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1600, COM_FREQ * 0x22 },
- },
- },
-
/* Oxford Semiconductor OXmPCI952 PCI UARTs */
{ "Oxford Semiconductor OXmPCI952 UARTs",
{ PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_EXSYS_EX41092,
@@ -2076,7 +2063,7 @@ const struct puc_device_description puc_
},
},
- /* Oxford Semiconductor OX16PCI958 UARTs (wildcard)*/
+ /* Oxford Semiconductor OX16PCI958 UARTs (wildcard) */
{ "Oxford Semiconductor OX16PCI958 UARTs",
{ PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OX16PCI958,
0, 0 },
@@ -2093,6 +2080,81 @@ const struct puc_device_description puc_
},
},
+ /* Oxford Semiconductor OXPCIe952 PCIe 1 native S */
+ { "Oxford Semiconductor OXPCIe952 UART",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE952SN1,
+ 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
+ },
+ },
+
+ /* Oxford Semiconductor OXPCIe952 PCIe 2 native S */
+ { "Oxford Semiconductor OXPCIe952 UART",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE952SN2,
+ 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1200, COM_FREQ * 0x22 },
+ },
+ },
+
+ /* Oxford Semiconductor OXPCIe952 PCIe 2 native S */
+ { "Oxford Semiconductor OXPCIe952 UART",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE952SN2_2,
+ 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1200, COM_FREQ * 0x22 },
+ },
+ },
+
+ /* Oxford Semiconductor OXPCIe954 PCIe 4 native S */
+ { "Oxford Semiconductor OXPCIe954 UART",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE954,
+ 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1200, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1400, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1600, COM_FREQ * 0x22 },
+ },
+ },
+
+ /* Oxford Semiconductor OXPCIe954 PCIe 4 native S */
+ { "Oxford Semiconductor OXPCIe954 UART",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE954SN4,
+ 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1200, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1400, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1600, COM_FREQ * 0x22 },
+ },
+ },
+
+ /* Oxford Semiconductor OXPCIe958 PCIe 8 native S */
+ { "Oxford Semiconductor OXPCIe958 UART",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE958SN8,
+ 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1200, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1400, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1600, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1800, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1a00, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1c00, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1e00, COM_FREQ * 0x22 },
+ },
+ },
+
{ "SUNIX 5008 1P",
{ PCI_VENDOR_SUNIX2, PCI_PRODUCT_SUNIX2_SER5XXXX,
0x1fd4, 0x0100 },
