Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Pull up following revision(s) (requested by bouyer in tic...
details: https://anonhg.NetBSD.org/src/rev/c2a6c15d3954
branches: netbsd-6
changeset: 774029:c2a6c15d3954
user: riz <riz%NetBSD.org@localhost>
date: Mon Apr 23 16:31:35 2012 +0000
description:
Pull up following revision(s) (requested by bouyer in ticket #193):
sys/arch/i386/conf/GENERIC: revision 1.1072
sys/dev/pci/mpii.c: revision 1.1
sys/arch/i386/conf/XEN3_DOM0: revision 1.66
sys/dev/pci/files.pci: revision 1.357
share/man/man4/Makefile: revision 1.584
distrib/sets/lists/man/mi: revision 1.1387
share/man/man4/mpii.4: revision 1.1
sys/arch/amd64/conf/GENERIC: revision 1.354
sys/arch/amd64/conf/XEN3_DOM0: revision 1.83
sys/arch/i386/conf/ALL: revision 1.337
Add mpii(4), a driver for LSI Logic Fusion-MPT Message Passing Interface II
SAS controllers. Ported from OpenBSD.
diffstat:
distrib/sets/lists/man/mi | 5 +-
share/man/man4/Makefile | 4 +-
share/man/man4/mpii.4 | 97 +
sys/arch/amd64/conf/GENERIC | 7 +-
sys/arch/amd64/conf/XEN3_DOM0 | 5 +-
sys/arch/i386/conf/ALL | 7 +-
sys/arch/i386/conf/GENERIC | 7 +-
sys/arch/i386/conf/XEN3_DOM0 | 5 +-
sys/dev/pci/files.pci | 7 +-
sys/dev/pci/mpii.c | 5536 +++++++++++++++++++++++++++++++++++++++++
10 files changed, 5663 insertions(+), 17 deletions(-)
diffs (truncated from 5835 to 300 lines):
diff -r ab743bd5b407 -r c2a6c15d3954 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Mon Apr 23 16:28:30 2012 +0000
+++ b/distrib/sets/lists/man/mi Mon Apr 23 16:31:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1379.2.2 2012/03/08 17:54:42 riz Exp $
+# $NetBSD: mi,v 1.1379.2.3 2012/04/23 16:31:36 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1304,6 +1304,7 @@
./usr/share/man/cat4/mly.0 man-sys-catman .cat
./usr/share/man/cat4/module.0 man-obsolete obsolete
./usr/share/man/cat4/mpls.0 man-sys-catman .cat
+./usr/share/man/cat4/mpii.0 man-sys-catman .cat
./usr/share/man/cat4/mpt.0 man-sys-catman .cat
./usr/share/man/cat4/mpu.0 man-sys-catman .cat
./usr/share/man/cat4/mr.0 man-obsolete obsolete
@@ -4133,6 +4134,7 @@
./usr/share/man/html4/mly.html man-sys-htmlman html
./usr/share/man/html4/module.html man-obsolete obsolete
./usr/share/man/html4/mpls.html man-sys-htmlman html
+./usr/share/man/html4/mpii.html man-sys-htmlman html
./usr/share/man/html4/mpt.html man-sys-htmlman html
./usr/share/man/html4/mpu.html man-sys-htmlman html
./usr/share/man/html4/mr.html man-obsolete obsolete
@@ -6815,6 +6817,7 @@
./usr/share/man/man4/mly.4 man-sys-man .man
./usr/share/man/man4/module.4 man-obsolete obsolete
./usr/share/man/man4/mpls.4 man-sys-man .man
+./usr/share/man/man4/mpii.4 man-sys-man .man
./usr/share/man/man4/mpt.4 man-sys-man .man
./usr/share/man/man4/mpu.4 man-sys-man .man
./usr/share/man/man4/mr.4 man-obsolete obsolete
diff -r ab743bd5b407 -r c2a6c15d3954 share/man/man4/Makefile
--- a/share/man/man4/Makefile Mon Apr 23 16:28:30 2012 +0000
+++ b/share/man/man4/Makefile Mon Apr 23 16:31:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.581 2012/02/14 17:35:11 plunky Exp $
+# $NetBSD: Makefile,v 1.581.2.1 2012/04/23 16:31:36 riz Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -38,7 +38,7 @@
kame_ipsec.4 kloader.4 kse.4 ksyms.4 kttcp.4 \
lc.4 ld.4 lii.4 lo.4 lxtphy.4 \
mainbus.4 makphy.4 mbe.4 mca.4 mcclock.4 md.4 mfb.4 mfi.4 mhzc.4 \
- midi.4 mii.4 mk48txx.4 mlx.4 mly.4 mpls.4 mpt.4 mpu.4 mtd.4 \
+ midi.4 mii.4 mk48txx.4 mlx.4 mly.4 mpls.4 mpii.4 mpt.4 mpu.4 mtd.4 \
mtio.4 multicast.4 mvsata.4 \
nadb.4 ne.4 neo.4 netintro.4 nfe.4 nfsmb.4 njata.4 njs.4 \
nsclpcsio.4 nside.4 nsp.4 nsphy.4 nsphyter.4 ntwoc.4 null.4 nsmb.4 \
diff -r ab743bd5b407 -r c2a6c15d3954 share/man/man4/mpii.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/mpii.4 Mon Apr 23 16:31:35 2012 +0000
@@ -0,0 +1,97 @@
+.\" $NetBSD: mpii.4,v 1.2.2.2 2012/04/23 16:31:36 riz Exp $
+.\" OpenBSD: mpii.4,v 1.8 2010/10/01 12:27:36 mikeb Exp
+.\"
+.\" Copyright (c) 2010 Marco Peereboom <marco%openbsd.org@localhost>
+.\" Copyright (c) 2009 David Gwynne <dlg%openbsd.org@localhost>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd April 19, 2012
+.Dt MPII 4
+.Os
+.Sh NAME
+.Nm mpii
+.Nd LSI Logic Fusion-MPT Message Passing Interface II
+.Sh SYNOPSIS
+.Cd "mpii* at pci? dev ? function ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for storage controllers using the
+LSI Logic Fusion-MPT Message Passing Interface II
+family of chipsets:
+.Pp
+.Bl -dash -offset indent -compact
+.It
+LSISAS2004,
+LSISAS2008
+.El
+.Pp
+These chipsets can be found on the following controllers:
+.Pp
+.Bl -dash -offset indent -compact
+.It
+Dell PERC H200
+.It
+LSI SAS 9200-8e, SAS 9211-4i, SAS 9211-8i
+.El
+.Pp
+Some models of these controllers have varying degrees of support for RAID 0
+and RAID 1.
+.Pp
+.Nm
+supports monitoring of the logical disks in the controller through the
+.Xr bioctl 8
+and
+.Xr envstat 8
+commands.
+.Sh EVENTS
+The
+.Nm
+driver is able to send events to
+.Xr powerd 8
+if a logical drive in the controller is not online.
+The
+.Em state-changed
+event will be sent to the
+.Pa /etc/powerd/scripts/sensor_drive
+script when such condition happens.
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr pci 4 ,
+.Xr scsi 4 ,
+.Xr sd 4 ,
+.Xr bioctl 8 ,
+.Xr envstat 8 ,
+.Xr powerd 8
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Ox 4.7 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An James Giannoules
+and
+.An Mike Belopuhov .
+.Sh BUGS
+The chips supported by
+.Nm
+do not use a SCSI-like identifier.
+Instead they use an opaque ID and leave discovery order up to the operating
+system.
+The code to handle this is currently not implemented and therefore it is not a
+good idea to run this driver on a multi-boot machine or with more than 1 drive.
diff -r ab743bd5b407 -r c2a6c15d3954 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Mon Apr 23 16:28:30 2012 +0000
+++ b/sys/arch/amd64/conf/GENERIC Mon Apr 23 16:31:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.348 2012/01/22 06:44:29 christos Exp $
+# $NetBSD: GENERIC,v 1.348.2.1 2012/04/23 16:31:37 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.348 $"
+#ident "GENERIC-$Revision: 1.348.2.1 $"
maxusers 64 # estimated number of users
@@ -543,7 +543,8 @@
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
mfi* at pci? dev ? function ? # LSI MegaRAID SAS
mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
-mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030
+mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030 (Fusion-MPT)
+mpii* at pci? dev ? function ? # LSI Logic Fusion-MPT II
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
esiop* at pci? dev ? function ? # Symbios 53c875 and newer SCSI
diff -r ab743bd5b407 -r c2a6c15d3954 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0 Mon Apr 23 16:28:30 2012 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0 Mon Apr 23 16:31:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.77.2.2 2012/02/25 21:39:07 sborrill Exp $
+# $NetBSD: XEN3_DOM0,v 1.77.2.3 2012/04/23 16:31:37 riz Exp $
include "arch/amd64/conf/std.xen"
@@ -488,7 +488,8 @@
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
mfi* at pci? dev ? function ? # LSI MegaRAID SAS
mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
-mpt* at pci? dev ? function ? # LSI Fusion SCSI/FC
+mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030 (Fusion-MPT)
+mpii* at pci? dev ? function ? # LSI Logic Fusion-MPT II
njs* at pci? dev ? function ? # Workbit NinjaSCSI-32
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
diff -r ab743bd5b407 -r c2a6c15d3954 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Mon Apr 23 16:28:30 2012 +0000
+++ b/sys/arch/i386/conf/ALL Mon Apr 23 16:31:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.332.2.1 2012/03/02 16:31:44 riz Exp $
+# $NetBSD: ALL,v 1.332.2.2 2012/04/23 16:31:36 riz Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.332.2.1 $"
+#ident "ALL-$Revision: 1.332.2.2 $"
maxusers 64 # estimated number of users
@@ -777,7 +777,8 @@
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
mfi* at pci? dev ? function ? # LSI MegaRAID SAS
mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
-mpt* at pci? dev ? function ? # LSI Fusion SCSI/FC
+mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030 (Fusion-MPT)
+mpii* at pci? dev ? function ? # LSI Logic Fusion-MPT II
nca* at pci? dev ? function ? # Domex DMX-3191D
njs* at pci? dev ? function ? # Workbit NinjaSCSI-32
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
diff -r ab743bd5b407 -r c2a6c15d3954 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Mon Apr 23 16:28:30 2012 +0000
+++ b/sys/arch/i386/conf/GENERIC Mon Apr 23 16:31:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1066 2012/01/22 06:44:29 christos Exp $
+# $NetBSD: GENERIC,v 1.1066.2.1 2012/04/23 16:31:35 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1066 $"
+#ident "GENERIC-$Revision: 1.1066.2.1 $"
maxusers 64 # estimated number of users
@@ -741,7 +741,8 @@
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
mfi* at pci? dev ? function ? # LSI MegaRAID SAS
mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
-mpt* at pci? dev ? function ? # LSI Fusion SCSI/FC
+mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030 (Fusion-MPT)
+mpii* at pci? dev ? function ? # LSI Logic Fusion-MPT II
njs* at pci? dev ? function ? # Workbit NinjaSCSI-32
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
diff -r ab743bd5b407 -r c2a6c15d3954 sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0 Mon Apr 23 16:28:30 2012 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0 Mon Apr 23 16:31:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.60.2.2 2012/02/25 21:39:07 sborrill Exp $
+# $NetBSD: XEN3_DOM0,v 1.60.2.3 2012/04/23 16:31:36 riz Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -466,7 +466,8 @@
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
mfi* at pci? dev ? function ? # LSI MegaRAID SAS
mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
-mpt* at pci? dev ? function ? # LSI Fusion SCSI/FC
+mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030 (Fusion-MPT)
+mpii* at pci? dev ? function ? # LSI Logic Fusion-MPT II
njs* at pci? dev ? function ? # Workbit NinjaSCSI-32
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
diff -r ab743bd5b407 -r c2a6c15d3954 sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci Mon Apr 23 16:28:30 2012 +0000
+++ b/sys/dev/pci/files.pci Mon Apr 23 16:31:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.354 2012/01/24 01:58:40 rkujawa Exp $
+# $NetBSD: files.pci,v 1.354.2.1 2012/04/23 16:31:36 riz Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -152,6 +152,11 @@
attach mpt at pci with mpt_pci
file dev/pci/mpt_pci.c mpt_pci
+# LSI Logic Fusion-MPT Message Passing Interface 2.0
+device mpii: scsi
+attach mpii at pci
+file dev/pci/mpii.c mpii
+
# Ethernet driver for DC21040-based boards
device de: ether, ifnet, arp
attach de at pci
diff -r ab743bd5b407 -r c2a6c15d3954 sys/dev/pci/mpii.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/pci/mpii.c Mon Apr 23 16:31:35 2012 +0000
@@ -0,0 +1,5536 @@
+/* $NetBSD: mpii.c,v 1.1.2.2 2012/04/23 16:31:36 riz Exp $ */
Home |
Main Index |
Thread Index |
Old Index