[src/trunk]: src Add pcidevs entries and support to amr(4) for newer LSI Meg...

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

details:   https://anonhg.NetBSD.org/src/rev/75a38e0951b2
branches:  trunk
changeset: 586254:75a38e0951b2
user:      jonathan <jonathan%NetBSD.org@localhost>
date:      Sun Dec 11 19:34:47 2005 +0000

description:
Add pcidevs entries and support to  amr(4) for newer LSI MegaRAID devices,
including the LSI MegaRAID SCSI 320-0x, 320-2x, 320-4x, 320-1E, 320-2E,
the LSI MegaRAID SATA 300-6x and 300-8x.

Tested on an LSI MegaRAID SATA 300-8x, which confirms private advice
that after PCI-IDs to our amr(4) driver, the newer LSI MegaRAID cards
will Just Work

The Linux megaraid2 driver accepts various Intel cards with the same
pci-device IDs as the LSI MegaRAID cards, treating them exaclty as the
above-listed LSI cards. Rework our amr(4) driver to also match and
attach those device-ID if seen with an Intel vendor-ID. Add the
Intel-vendor PCI decice-ids to pcidevs, so that PCI_VERBOSE will
correctly identify the Intel cards.

Update src/share/man/man4/amr.4 to list the newly-supported cards.

(NB: I don't have the LSI SCSI or any Intel cards to test, just the
LSI SATA, which works fine for me.)

diffstat:

 share/man/man4/amr.4 |  22 +++++++++++++++++-----
 sys/dev/pci/amr.c    |  10 ++++++++--
 sys/dev/pci/pcidevs  |  10 +++++++++-
 3 files changed, 34 insertions(+), 8 deletions(-)

diffs (116 lines):

diff -r 58145881c754 -r 75a38e0951b2 share/man/man4/amr.4
--- a/share/man/man4/amr.4      Sun Dec 11 19:29:27 2005 +0000
+++ b/share/man/man4/amr.4      Sun Dec 11 19:34:47 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: amr.4,v 1.10 2005/02/14 22:53:23 he Exp $
+.\" $NetBSD: amr.4,v 1.11 2005/12/11 19:34:47 jonathan Exp $
 .\"
 .\" Copyright (c) 2000 Jeroen Ruigrok van der Werven
 .\" All rights reserved.
@@ -36,9 +36,9 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for American Megatrends MegaRAID Express,
-Elite and Enterprise family SCSI RAID controllers,
-including models relabeled and sold by Hewlett-Packard and Dell.
+driver provides support for LSI (formerly American Megatrends) MegaRAID
+Express, Elite and Enterprise family  RAID controllers for SCSI and SATA,
+including models relabeled and sold by Dell, Hewlett-Packard, and Intel.
 Supported controllers include:
 .Pp
 .Bl -bullet -compact
@@ -69,7 +69,11 @@
 .It
 MegaRAID Express 300 (Series 490)
 .It
-MegaRAID Express 500 (Series 475)
+LSI MegaRAID SCSI 320-0X, 320-2X, 320-4X
+.It
+LSI MegaRAID SCSI 320-1E, 320-2E
+.It
+LSI MegaRAID SATA 300-6x, 300-8x
 .It
 Dell PERC
 .It
@@ -88,6 +92,14 @@
 HP NetRAID-3/Si
 .It
 HP Embedded NetRAID
+.It
+Intel SRCU42X
+.It
+Intel SRCU42E
+.It 
+Intel SRMOBU42E
+.It
+Intel SRCS28X
 .El
 .Sh DIAGNOSTICS
 .Ss Driver initialisation/shutdown phase
diff -r 58145881c754 -r 75a38e0951b2 sys/dev/pci/amr.c
--- a/sys/dev/pci/amr.c Sun Dec 11 19:29:27 2005 +0000
+++ b/sys/dev/pci/amr.c Sun Dec 11 19:34:47 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amr.c,v 1.30 2005/12/11 12:22:48 christos Exp $        */
+/*     $NetBSD: amr.c,v 1.31 2005/12/11 19:34:47 jonathan Exp $        */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.30 2005/12/11 12:22:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.31 2005/12/11 19:34:47 jonathan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -131,10 +131,16 @@
        { PCI_VENDOR_AMI,   PCI_PRODUCT_AMI_MEGARAID3, AT_QUARTZ },
        { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_AMI_MEGARAID3, AT_QUARTZ },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_AMI_MEGARAID3, AT_QUARTZ | AT_SIG },
+       { PCI_VENDOR_INTEL,  PCI_PRODUCT_SYMBIOS_MEGARAID_320X, AT_QUARTZ },
+       { PCI_VENDOR_INTEL,  PCI_PRODUCT_SYMBIOS_MEGARAID_320E, AT_QUARTZ },
+       { PCI_VENDOR_SYMBIOS,  PCI_PRODUCT_SYMBIOS_MEGARAID_300X, AT_QUARTZ },
        { PCI_VENDOR_DELL,  PCI_PRODUCT_DELL_PERC_4DI, AT_QUARTZ },
        { PCI_VENDOR_DELL,  PCI_PRODUCT_DELL_PERC_4DI_2, AT_QUARTZ },
        { PCI_VENDOR_DELL,  PCI_PRODUCT_DELL_PERC_4ESI, AT_QUARTZ },
        { PCI_VENDOR_SYMBIOS,  PCI_PRODUCT_SYMBIOS_PERC_4SC, AT_QUARTZ },
+       { PCI_VENDOR_SYMBIOS,  PCI_PRODUCT_SYMBIOS_MEGARAID_320X, AT_QUARTZ },
+       { PCI_VENDOR_SYMBIOS,  PCI_PRODUCT_SYMBIOS_MEGARAID_320E, AT_QUARTZ },
+       { PCI_VENDOR_SYMBIOS,  PCI_PRODUCT_SYMBIOS_MEGARAID_300X, AT_QUARTZ },
 };
 
 struct amr_typestr {
diff -r 58145881c754 -r 75a38e0951b2 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Sun Dec 11 19:29:27 2005 +0000
+++ b/sys/dev/pci/pcidevs       Sun Dec 11 19:34:47 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.745 2005/12/10 19:03:22 jonathan Exp $
+$NetBSD: pcidevs,v 1.746 2005/12/11 19:34:47 jonathan Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1669,6 +1669,11 @@
 product INTEL 80321            0x0319  80321 I/O Processor
 product INTEL 6700PXH_PCIE0    0x0329  6700PXH PCI Express-to-PCI Bridge #0
 product INTEL 6700PXH_PCIE1    0x032a  6700PXH PCI Express-to-PCI Bridge #1
+///
+product INTEL SRCZCRX          0x0407  RAID controller
+product INTEL SRCU42E          0x0408  SCSI RAID controller
+product INTEL SRCS28X          0x0409  SATA RAID controller
+///
 product INTEL PCEB             0x0482  82375EB/SB PCI-EISA Bridge
 product INTEL CDC              0x0483  82424ZX Cache and DRAM controller
 product INTEL SIO              0x0484  82378ZB System I/O
@@ -2222,6 +2227,9 @@
 product SYMBIOS FC929X         0x0626  FC929X
 product SYMBIOS FC919X         0x0628  FC919X
 product SYMBIOS PERC_4SC       0x1960  PERC 4/SC
+product SYMBIOS MEGARAID_320X  0x0407  LSI Megaraid SCSI 320-X
+product SYMBIOS MEGARAID_320E  0x0408  LSI Megaraid SCSI 320-E
+product SYMBIOS MEGARAID_300X  0x0409  LSI Megaraid SATA (300-6X/300-8X) 
 
 /* Packet Engines products */
 product SYMBIOS PE_GNIC        0x0702  Packet Engines G-NIC Ethernet