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

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/63dc4b2e9683
branches:  netbsd-8
changeset: 936193:63dc4b2e9683
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jul 20 18:47:16 2020 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1578):

        sys/dev/pci/pcidevs: revision 1.1404
        sys/dev/pci/pcidevs: revision 1.1405
        sys/arch/x86/pci/rdcpcib.c: revision 1.3

Add more RDC products (Andrius V)

Recognize more rdc devices (Andrius V.)

Fix typo

diffstat:

 sys/arch/x86/pci/rdcpcib.c |  21 +++++++++++++++++----
 sys/dev/pci/pcidevs        |  27 +++++++++++++++++++++------
 2 files changed, 38 insertions(+), 10 deletions(-)

diffs (93 lines):

diff -r 819e977e4c35 -r 63dc4b2e9683 sys/arch/x86/pci/rdcpcib.c
--- a/sys/arch/x86/pci/rdcpcib.c        Mon Jul 20 18:43:25 2020 +0000
+++ b/sys/arch/x86/pci/rdcpcib.c        Mon Jul 20 18:47:16 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rdcpcib.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $       */
+/*     $NetBSD: rdcpcib.c,v 1.2.46.1 2020/07/20 18:47:16 martin Exp $  */
 
 /*
  * Copyright (c) 2011 Manuel Bouyer.
@@ -31,7 +31,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rdcpcib.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rdcpcib.c,v 1.2.46.1 2020/07/20 18:47:16 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -88,6 +88,17 @@
     rdcpcibmatch, rdcpcibattach, rdcpcibdetach, NULL,
     pcibrescan, pcibchilddet);
 
+
+static const struct rdcpcib_device {
+       pcireg_t vendor, product;
+} rdcpcib_devices[] = {
+       { PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R6011_PCIB},
+       { PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R6013_PCIB},
+       { PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R6031_PCIB},
+       { PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R6035_PCIB},
+       { PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R6036_PCIB},
+};
+
 static int
 rdcpcibmatch(device_t parent, cfdata_t match, void *aux)
 {
@@ -97,9 +108,11 @@
            PCI_SUBCLASS(pa->pa_class) != PCI_SUBCLASS_BRIDGE_ISA)
                return 0;
 
-       if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_RDC &&
-           PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_RDC_PCIB)
+       for (size_t i = 0; i < __arraycount(rdcpcib_devices); i++) {
+               if (PCI_VENDOR(pa->pa_id) == rdcpcib_devices[i].vendor &&
+                   PCI_PRODUCT(pa->pa_id) == rdcpcib_devices[i].product)
                        return 10;
+       }
 
        return 0;
 }
diff -r 819e977e4c35 -r 63dc4b2e9683 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Mon Jul 20 18:43:25 2020 +0000
+++ b/sys/dev/pci/pcidevs       Mon Jul 20 18:47:16 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1289.2.17 2019/11/19 10:36:47 martin Exp $
+$NetBSD: pcidevs,v 1.1289.2.18 2020/07/20 18:47:16 martin Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -7015,13 +7015,28 @@
 product RATOC  REXPCI31        0x0853  REX PCI-31/33 SCSI
 
 /* RDC Semiconductor products */
-product RDC    R1010_IDE       0x1010  R1010 IDE controller
-product RDC    R1011_IDE       0x1011  R1011 IDE controller
-product RDC    R1012_IDE       0x1012  R1012 IDE controller
+product RDC    R1010_IDE       0x1010  R1010 IDE Controller
+product RDC    R1011_IDE       0x1011  R1011 IDE Controller
+product RDC    R1012_IDE       0x1012  R1012 IDE Controller
+product RDC    R1031_PPB       0x1031  R1031 PCI-PCIE Bridge
+product RDC    R1060_USBD      0x1060  R1060 USB Device
+product RDC    R1061_USBD      0x1061  R1061 USB Device
+product RDC    R1070_CAN       0x1070  R1070 CANbus
+product RDC    R1331_MC        0x1331  R1331 Motion Control
+product RDC    R1710_SPI       0x1710  R1710 SPI
+product RDC    R1930_HBRD      0x1930  R1930 Hybrid Function Control Register
+product RDC    R2010_VGA       0x2010  R2010 VGA Controller
+product RDC    R2012_VGA       0x2012  R2012 VGA Controller
+product RDC    R2015_VGA       0x2015  R2015 VGA Controller
+product RDC    R6011_PCIB      0x6011  R6011 PCI-ISA bridge
+product RDC    R6013_PCIB      0x6013  R6013 PCI-ISA bridge
 product RDC    R6021_HB        0x6021  R6021 Host
+product RDC    R6023_HB        0x6023  R6023 Host
 product RDC    R6025_HB        0x6025  R6025 Host
-product RDC    R6031_ISA       0x6031  R6031 PCI-ISA bridge
-product RDC    PCIB            0x6036  R6036 PCI-ISA bridge
+product RDC    R6026_HB        0x6026  R6026 Host
+product RDC    R6031_PCIB      0x6031  R6031 PCI-ISA bridge
+product RDC    R6035_PCIB      0x6035  R6035 PCI-ISA bridge
+product RDC    R6036_PCIB      0x6036  R6036 PCI-ISA bridge
 product RDC    R6040           0x6040  R6040 10/100 Ethernet
 product RDC    R6060_OHCI      0x6060  R6060 USB OHCI
 product RDC    R6061_EHCI      0x6061  R6061 USB EHCI