[src/netbsd-8]: src Pull up following revision(s) (requested by jdolecek in t...

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

details:   https://anonhg.NetBSD.org/src/rev/aebe4909d344
branches:  netbsd-8
changeset: 434031:aebe4909d344
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Jun 25 06:22:57 2017 +0000

description:
Pull up following revision(s) (requested by jdolecek in ticket #55):
        share/man/man4/siisata.4: revision 1.6
        sys/dev/pci/pcidevs: revision 1.1291
        sys/dev/pci/siisata_pci.c: revision 1.15
add entry for Adaptec 1220SA
--
match Adaptec 1220SA; that card actually uses Silicon Image 3132, and works
well with the siisata(4) driver
--
add Adaptec 1220SA

diffstat:

 share/man/man4/siisata.4  |   5 +++--
 sys/dev/pci/pcidevs       |   3 ++-
 sys/dev/pci/siisata_pci.c |  10 ++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diffs (74 lines):

diff -r 5458ab9c0416 -r aebe4909d344 share/man/man4/siisata.4
--- a/share/man/man4/siisata.4  Thu Jun 22 05:38:03 2017 +0000
+++ b/share/man/man4/siisata.4  Sun Jun 25 06:22:57 2017 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: siisata.4,v 1.5 2014/03/18 18:20:39 riastradh Exp $
+.\" $NetBSD: siisata.4,v 1.5.18.1 2017/06/25 06:22:57 snj Exp $
 .\"
 .\" Copyright (c) 2007, 2008 Jonathan A. Kollasch. All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 19, 2009
+.Dd June 17, 2017
 .Dt SIISATA 4
 .Os
 .Sh NAME
@@ -48,6 +48,7 @@
 .Bl -tag -width Ds -offset indent -compact
 .It Silicon Image SiI3124 4-port PCI/PCI-X
 .It Silicon Image SiI3132 2-port PCI-Express x1
+.It Adaptec 1220SA (SiI3132 chip)
 .It Silicon Image SiI3531 1-port PCI-Express x1
 .El
 .Sh SEE ALSO
diff -r 5458ab9c0416 -r aebe4909d344 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Thu Jun 22 05:38:03 2017 +0000
+++ b/sys/dev/pci/pcidevs       Sun Jun 25 06:22:57 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1289 2017/05/23 07:12:56 nonaka Exp $
+$NetBSD: pcidevs,v 1.1289.2.1 2017/06/25 06:22:57 snj Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1955,6 +1955,7 @@
 
 /* Adaptec's AAR-1210SA serial ATA RAID controller uses the CMDTECH chip */
 product CMDTECH AAR_1210SA     0x0240  AAR-1210SA SATA RAID Controller
+product CMDTECH AAR_1220SA     0x0242  AAR-1220SA SATA RAID Controller
 /* CMD Technology products -- info gleaned from their web site */
 product CMDTECH 640            0x0640  PCI0640
 /* No data on the CMD Tech. web site for the following as of Mar. 3 '98 */
diff -r 5458ab9c0416 -r aebe4909d344 sys/dev/pci/siisata_pci.c
--- a/sys/dev/pci/siisata_pci.c Thu Jun 22 05:38:03 2017 +0000
+++ b/sys/dev/pci/siisata_pci.c Sun Jun 25 06:22:57 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata_pci.c,v 1.14 2016/07/14 04:19:27 msaitoh Exp $ */
+/* $NetBSD: siisata_pci.c,v 1.14.10.1 2017/06/25 06:22:57 snj Exp $ */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata_pci.c,v 1.14 2016/07/14 04:19:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata_pci.c,v 1.14.10.1 2017/06/25 06:22:57 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -97,6 +97,12 @@
        },
        {
                .spb_vend = PCI_VENDOR_CMDTECH,
+               .spb_prod = PCI_PRODUCT_CMDTECH_AAR_1220SA,
+               .spb_port = 2,
+               .spb_chip = 3132,
+       },
+       {
+               .spb_vend = PCI_VENDOR_CMDTECH,
                .spb_prod = PCI_PRODUCT_CMDTECH_3531,
                .spb_port = 1,
                .spb_chip = 3531,