Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by h...



details:   https://anonhg.NetBSD.org/src/rev/3b89774b9b30
branches:  netbsd-7
changeset: 461062:3b89774b9b30
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Nov 14 15:43:59 2019 +0000

description:
Pull up following revision(s) (requested by hauke in ticket #1712):

        sys/dev/pci/pucdata.c: revision 1.105

The 16C1054 and 16C1058 serial multi-port controllers need a clock
multiplier of 8, just like the 16C1050 controller.

Verified with an ExSys EX-41388.
ryo@ checked back with the hardware his original commit was based on,
and confirmed the change.

XXX Pull-up to netbsd-{7,8,9}

diffstat:

 sys/dev/pci/pucdata.c |  28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diffs (56 lines):

diff -r fd5261ae1c0d -r 3b89774b9b30 sys/dev/pci/pucdata.c
--- a/sys/dev/pci/pucdata.c     Mon Nov 04 14:53:35 2019 +0000
+++ b/sys/dev/pci/pucdata.c     Thu Nov 14 15:43:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pucdata.c,v 1.93.4.3 2018/01/03 21:37:36 snj Exp $     */
+/*     $NetBSD: pucdata.c,v 1.93.4.4 2019/11/14 15:43:59 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.93.4.3 2018/01/03 21:37:36 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.93.4.4 2019/11/14 15:43:59 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2833,10 +2833,10 @@
            {   PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1054, 0, 0 },
            {   0xffff, 0xffff,                                          0, 0 },
            {
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ },
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ },
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ },
+               { 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 },
            },
        },
 
@@ -2845,14 +2845,14 @@
            {   PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1058, 0, 0 },
            {   0xffff, 0xffff,                                          0, 0 },
            {
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ },
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ },
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ },
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x20, COM_FREQ },
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x28, COM_FREQ },
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x30, COM_FREQ },
-               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x38, COM_FREQ },
+               { 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 },
+               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x20, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x28, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x30, COM_FREQ * 8 },
+               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x38, COM_FREQ * 8 },
            },
        },
 



Home | Main Index | Thread Index | Old Index