head	1.8;
access;
symbols
	RELENG_8_4:1.8.0.2
	RELENG_9_1_0_RELEASE:1.3.4.3.2.2
	RELENG_9_1:1.3.4.3.0.2
	RELENG_9_1_BP:1.3.4.3
	RELENG_8_3_0_RELEASE:1.3.2.3.2.1
	RELENG_8_3:1.3.2.3.0.2
	RELENG_8_3_BP:1.3.2.3
	RELENG_9_0_0_RELEASE:1.3.4.1.2.1
	RELENG_9_0:1.3.4.1.0.2
	RELENG_9_0_BP:1.3.4.1
	RELENG_9:1.3.0.4
	RELENG_9_BP:1.3
	RELENG_8:1.3.0.2;
locks; strict;
comment	@# @;


1.8
date	2012.11.17.01.52.57;	author svnexp;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2012.08.20.18.33.03;	author dim;	state Exp;
branches;
next	1.6;

1.6
date	2012.03.23.11.35.01;	author dim;	state Exp;
branches;
next	1.5;

1.5
date	2012.03.16.21.46.02;	author rmh;	state Exp;
branches;
next	1.4;

1.4
date	2012.01.26.18.17.21;	author ken;	state Exp;
branches;
next	1.3;

1.3
date	2010.10.17.20.01.56;	author scottl;	state Exp;
branches
	1.3.2.1
	1.3.4.1;
next	1.2;

1.2
date	2010.10.15.15.24.59;	author mdf;	state Exp;
branches;
next	1.1;

1.1
date	2010.09.10.15.03.56;	author ken;	state Exp;
branches;
next	;

1.8.2.1
date	2012.11.17.01.52.57;	author svnexp;	state dead;
branches;
next	1.8.2.2;

1.8.2.2
date	2013.03.28.13.05.21;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2011.02.18.16.29.38;	author ken;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2011.02.18.16.29.38;	author ken;	state Exp;
branches;
next	1.3.2.3;

1.3.2.3
date	2012.02.02.19.03.29;	author ken;	state Exp;
branches
	1.3.2.3.2.1;
next	1.3.2.4;

1.3.2.4
date	2012.11.17.10.36.57;	author svnexp;	state Exp;
branches;
next	1.3.2.5;

1.3.2.5
date	2014.02.06.08.21.45;	author svnexp;	state Exp;
branches;
next	;

1.3.2.3.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.3.2.3.2.2;

1.3.2.3.2.2
date	2012.11.17.08.25.33;	author svnexp;	state Exp;
branches;
next	;

1.3.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.3.4.1.2.1;
next	1.3.4.2;

1.3.4.2
date	2012.02.02.19.01.41;	author ken;	state Exp;
branches;
next	1.3.4.3;

1.3.4.3
date	2012.04.13.21.47.14;	author dim;	state Exp;
branches
	1.3.4.3.2.1;
next	1.3.4.4;

1.3.4.4
date	2012.11.17.11.37.18;	author svnexp;	state Exp;
branches;
next	1.3.4.5;

1.3.4.5
date	2013.01.14.20.03.26;	author svnexp;	state Exp;
branches;
next	1.3.4.6;

1.3.4.6
date	2014.02.06.08.01.46;	author svnexp;	state Exp;
branches;
next	;

1.3.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.3.4.1.2.2;

1.3.4.1.2.2
date	2012.11.17.08.37.14;	author svnexp;	state Exp;
branches;
next	;

1.3.4.3.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.3.4.3.2.2;

1.3.4.3.2.2
date	2012.11.17.08.48.05;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/mps/Makefile 239462 2012-08-20 18:33:03Z dim $

.PATH: ${.CURDIR}/../../dev/mps

KMOD=	mps
SRCS=	mps_pci.c mps.c mps_sas.c mps_table.c mps_user.c
SRCS+=	mps_config.c mps_mapping.c mps_sas_lsi.c
SRCS+=	opt_cam.h opt_compat.h
SRCS+=	device_if.h bus_if.h pci_if.h

#CFLAGS += -DMPS_DEBUG

.include <bsd.kmod.mk>

CWARNFLAGS.mps_sas.c=		${NO_WUNNEEDED_INTERNAL_DECL}
# XXX Work around clang warning, until maintainer approves fix.
CWARNFLAGS.mps_mapping.c=	${NO_WSOMETIMES_UNINITIALIZED}
CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
@


1.8.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:21 +0000
@
text
@d1 18
@


1.8.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 14
# $FreeBSD: releng/8.4/sys/modules/mps/Makefile 230922 2012-02-02 19:03:29Z ken $

.PATH: ${.CURDIR}/../../dev/mps

KMOD=	mps
SRCS=	mps_pci.c mps.c mps_sas.c mps_table.c mps_user.c
SRCS+=	mps_config.c mps_mapping.c mps_sas_lsi.c
SRCS+=	opt_cam.h opt_compat.h
SRCS+=	device_if.h bus_if.h pci_if.h

#CFLAGS += -DMPS_DEBUG
DEBUG_FLAGS += -g

.include <bsd.kmod.mk>
@


1.7
log
@SVN rev 239462 on 2012-08-20 18:33:03Z by dim

Upgrade our copy of llvm/clang to trunk r162107.  With thanks to
Benjamin Kramer and Joerg Sonnenberger for their input and fixes.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.6
log
@SVN rev 233354 on 2012-03-23 11:35:01Z by dim

Work around the following clang warning in mps(4):

  sys/dev/mps/mps_sas.c:861:1: error: function 'mpssas_discovery_timeout' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
  mpssas_discovery_timeout(void *data)
  ^

Because the driver is obtained from upstream, we don't want to modify
it; just silence the warning instead, it is harmless.

MFC after:	3 days
@
text
@d15 4
a18 2
CWARNFLAGS.mps_sas.c=	${NO_WUNNEEDED_INTERNAL_DECL}
CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
@


1.5
log
@SVN rev 233049 on 2012-03-16 21:46:02Z by rmh

Remove gratuitous DEBUG_FLAGS="-g" setting (this is already the default
option with GENERIC kernels).

Reviewed by:	ken
@
text
@d14 3
@


1.4
log
@SVN rev 230592 on 2012-01-26 18:17:21Z by ken

Bring in the LSI-supported version of the mps(4) driver.

This involves significant changes to the mps(4) driver, but is not a
complete rewrite.

Some of the changes in this version of the driver:
 - Integrated RAID (IR) support.
 - Support for WarpDrive controllers.
 - Support for SCSI protection information (EEDP).
 - Support for TLR (Transport Level Retries), needed for tape drives.
 - Improved error recovery code.
 - ioctl interface compatible with LSI utilities.

mps.4:		Update the mps(4) driver man page somewhat for the driver
		changes.  The list of supported hardware still needs to be
		updated to reflect the full list of supported cards.

conf/files:	Add the new driver files.

mps/mpi/*:	Updated version of the MPI header files, with a BSD style
		copyright.

mps/*:		See above for a description of the new driver features.

modules/mps/Makefile:
		Add the new mps(4) driver files.

Submitted by:	Kashyap Desai <Kashyap.Desai@@lsi.com>
Reviewed by:	ken
MFC after:	1 week
@
text
@a11 1
DEBUG_FLAGS += -g
@


1.3
log
@SVN rev 213993 on 2010-10-17 20:01:56Z by scottl

Re-add opt_mps.h and opt_cam.h, lost in the previous rev.
@
text
@d7 2
a8 1
SRCS+=	opt_mps.h opt_cam.h opt_compat.h
d12 1
a12 1
DEBUG += -g
@


1.3.4.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.4.2
log
@SVN rev 230920 on 2012-02-02 19:01:41Z by ken

MFC 230592:

Bring in the LSI-supported version of the mps(4) driver.

This involves significant changes to the mps(4) driver, but is not a
complete rewrite.

Some of the changes in this version of the driver:
 - Integrated RAID (IR) support.
 - Support for WarpDrive controllers.
 - Support for SCSI protection information (EEDP).
 - Support for TLR (Transport Level Retries), needed for tape drives.
 - Improved error recovery code.
 - ioctl interface compatible with LSI utilities.

mps.4:		Update the mps(4) driver man page somewhat for the driver
		changes.  The list of supported hardware still needs to be
		updated to reflect the full list of supported cards.

conf/files:	Add the new driver files.

mps/mpi/*:	Updated version of the MPI header files, with a BSD style
		copyright.

mps/*:		See above for a description of the new driver features.

modules/mps/Makefile:
		Add the new mps(4) driver files.

Submitted by:	Kashyap Desai <Kashyap.Desai@@lsi.com>
Sponsored by:	LSI, Spectra Logic
Reviewed by:	ken
@
text
@d7 1
a7 2
SRCS+=	mps_config.c mps_mapping.c mps_sas_lsi.c
SRCS+=	opt_cam.h opt_compat.h
d11 1
a11 1
DEBUG_FLAGS += -g
@


1.3.4.3
log
@SVN rev 234238 on 2012-04-13 21:47:14Z by dim

MFC r233354:

Work around the following clang warning in mps(4):

  sys/dev/mps/mps_sas.c:861:1: error: function 'mpssas_discovery_timeout' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
  mpssas_discovery_timeout(void *data)
  ^

Because the driver is obtained from upstream, we don't want to modify
it; just silence the warning instead, it is harmless.
@
text
@a14 3

CWARNFLAGS.mps_sas.c=	${NO_WUNNEEDED_INTERNAL_DECL}
CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
@


1.3.4.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/mps/Makefile 234238 2012-04-13 21:47:14Z dim $
@


1.3.4.5
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/245431
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/mps/Makefile 245431 2013-01-14 19:51:26Z dim $
d16 2
a17 4
CWARNFLAGS.mps_sas.c=		${NO_WUNNEEDED_INTERNAL_DECL}
# XXX Work around clang warning, until maintainer approves fix.
CWARNFLAGS.mps_mapping.c=	${NO_WSOMETIMES_UNINITIALIZED}
CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
@


1.3.4.6
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/261539
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/mps/Makefile 261539 2014-02-06 07:55:50Z brueffer $
d12 1
@


1.3.4.3.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.3.4.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/mps/Makefile 234238 2012-04-13 21:47:14Z dim $
@


1.3.4.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.3.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/mps/Makefile 213993 2010-10-17 20:01:56Z scottl $
@


1.3.2.1
log
@file Makefile was added on branch RELENG_8 on 2011-02-18 16:30:07 +0000
@
text
@d1 13
@


1.3.2.2
log
@SVN rev 218810 on 2011-02-18 16:29:38Z by ken

MFC: 212420, 212616, 212772, 212802, 213535, 213702, 213704, 213707, 213708,
     213743, 213839, 213840, 213882, 213898, 216088, 216227, 216363, 216368:

Merge the mps(4) driver into stable/8.  This is currently only included in
GENERIC on amd64, since that is the only architecture it has been tested
on.
@
text
@a0 14
# $FreeBSD$

.PATH: ${.CURDIR}/../../dev/mps

KMOD=	mps
SRCS=	mps_pci.c mps.c mps_sas.c mps_table.c mps_user.c
SRCS+=	opt_compat.h
SRCS+=	opt_cam.h
SRCS+=	device_if.h bus_if.h pci_if.h

#CFLAGS += -DMPS_DEBUG
DEBUG += -g

.include <bsd.kmod.mk>
@


1.3.2.3
log
@SVN rev 230922 on 2012-02-02 19:03:29Z by ken

MFC 230592:

Bring in the LSI-supported version of the mps(4) driver.

This involves significant changes to the mps(4) driver, but is not a
complete rewrite.

Some of the changes in this version of the driver:
 - Integrated RAID (IR) support.
 - Support for WarpDrive controllers.
 - Support for SCSI protection information (EEDP).
 - Support for TLR (Transport Level Retries), needed for tape drives.
 - Improved error recovery code.
 - ioctl interface compatible with LSI utilities.

mps.4:		Update the mps(4) driver man page somewhat for the driver
		changes.  The list of supported hardware still needs to be
		updated to reflect the full list of supported cards.

conf/files:	Add the new driver files.

mps/mpi/*:	Updated version of the MPI header files, with a BSD style
		copyright.

mps/*:		See above for a description of the new driver features.

modules/mps/Makefile:
		Add the new mps(4) driver files.

Submitted by:	Kashyap Desai <Kashyap.Desai@@lsi.com>
Sponsored by:	LSI, Spectra Logic
Reviewed by:	ken
@
text
@d7 2
a8 2
SRCS+=	mps_config.c mps_mapping.c mps_sas_lsi.c
SRCS+=	opt_cam.h opt_compat.h
d12 1
a12 1
DEBUG_FLAGS += -g
@


1.3.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/mps/Makefile 230922 2012-02-02 19:03:29Z ken $
@


1.3.2.5
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/261540
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/mps/Makefile 261540 2014-02-06 07:59:05Z brueffer $
d12 1
@


1.3.2.3.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.2.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/mps/Makefile 230922 2012-02-02 19:03:29Z ken $
@


1.2
log
@SVN rev 213898 on 2010-10-15 15:24:59Z by mdf

Currently only opt_compat.h is included by the mps(4) driver. Also
enable /dev/mps0, which was missing from my previous patches enabling
f/w upload and download.

opt_compat.h issue noticed by scottl.
@
text
@d7 1
a7 1
SRCS+=	opt_compat.h
@


1.1
log
@SVN rev 212420 on 2010-09-10 15:03:56Z by ken

MFp4 (//depot/projects/mps/...)

Bring in a driver for the LSI Logic MPT2 6Gb SAS controllers.

This driver supports basic I/O, and works with SAS and SATA drives and
expanders.

Basic error recovery works (i.e. timeouts and aborts) as well.

Integrated RAID isn't supported yet, and there are some known bugs.

So this isn't ready for production use, but is certainly ready for
testing and additional development.  For the moment, new commits to this
driver should go into the FreeBSD Perforce repository first
(//depot/projects/mps/...) and then get merged into -current once
they've been vetted.

This has only been added to the amd64 GENERIC, since that is the only
architecture I have tested this driver with.

Submitted by:	scottl
Discussed with:	imp, gibbs, will
Sponsored by:	Yahoo, Spectra Logic Corporation
@
text
@d7 1
a7 1
SRCS+=	opt_mps.h opt_cam.h
@

