Module Name: src
Committed By: riz
Date: Sat May 19 15:06:03 UTC 2012
Modified Files:
src/share/man/man4 [netbsd-6]: mfi.4
src/sys/dev/pci [netbsd-6]: mfi_pci.c
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #261):
sys/dev/pci/mfi_pci.c: revision 1.14
share/man/man4/mfi.4: revision 1.11
Add IBM ServeRAID M5014 as subtype
Add IBM ServeRAID M1015 and M5014
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.10.1 src/share/man/man4/mfi.4
cvs rdiff -u -r1.12.16.1 -r1.12.16.2 src/sys/dev/pci/mfi_pci.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/mfi.4
diff -u src/share/man/man4/mfi.4:1.10 src/share/man/man4/mfi.4:1.10.10.1
--- src/share/man/man4/mfi.4:1.10 Tue Feb 9 06:48:28 2010
+++ src/share/man/man4/mfi.4 Sat May 19 15:06:03 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: mfi.4,v 1.10 2010/02/09 06:48:28 wiz Exp $
+.\" $NetBSD: mfi.4,v 1.10.10.1 2012/05/19 15:06:03 riz Exp $
.\" $OpenBSD: mfi.4,v 1.7 2006/09/01 09:58:09 jmc Exp $
.\"
.\" Written by Marco Peereboom <ma...@peereboom.us>
@@ -24,7 +24,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd February 9, 2010
+.Dd March 22, 2012
.Dt MFI 4
.Os
.Sh NAME
@@ -59,6 +59,9 @@ MegaRAID SAS 8708ELP,
MegaRAID SAS 8888ELP,
MegaRAID SAS 8880EM2,
MegaRAID SAS 9260-8i
+.It
+IBM ServeRAID M1015,
+ServeRAID M5014
.El
.Pp
These controllers support RAID 0, RAID 1, RAID 5, RAID 6, RAID 10, RAID 50 and
Index: src/sys/dev/pci/mfi_pci.c
diff -u src/sys/dev/pci/mfi_pci.c:1.12.16.1 src/sys/dev/pci/mfi_pci.c:1.12.16.2
--- src/sys/dev/pci/mfi_pci.c:1.12.16.1 Thu Mar 22 23:04:26 2012
+++ src/sys/dev/pci/mfi_pci.c Sat May 19 15:06:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi_pci.c,v 1.12.16.1 2012/03/22 23:04:26 riz Exp $ */
+/* $NetBSD: mfi_pci.c,v 1.12.16.2 2012/05/19 15:06:03 riz Exp $ */
/* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <ma...@peereboom.us>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.12.16.1 2012/03/22 23:04:26 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.12.16.2 2012/05/19 15:06:03 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,6 +85,7 @@ static const struct mfi_pci_subtype mfi_
static const struct mfi_pci_subtype mfi_gen2_subtypes[] = {
{ PCI_VENDOR_SYMBIOS, 0x9261, "SAS 9260-8i" },
+ { PCI_VENDOR_IBM, 0x03c7, "IBM ServeRAID M5014 SAS/SATA" },
{ 0x0, 0, "" }
};
