From owner-svn-src-all@FreeBSD.ORG  Fri Jul  5 23:10:03 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 552E34EC;
 Fri,  5 Jul 2013 23:10:03 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2D4C219FA;
 Fri,  5 Jul 2013 23:10:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65NA3q2017480;
 Fri, 5 Jul 2013 23:10:03 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65NA2pR017478;
 Fri, 5 Jul 2013 23:10:02 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201307052310.r65NA2pR017478@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 5 Jul 2013 23:10:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252851 - in head: share/man/man4 sys/dev/hptiop
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 23:10:03 -0000

Author: delphij
Date: Fri Jul  5 23:10:02 2013
New Revision: 252851
URL: http://svnweb.freebsd.org/changeset/base/252851

Log:
  Add PCI IDs for HighPoint RocketRAID 4521, 3620, 3622 and 3640
  controllers.  Update the hptiop(4) manual page to reflect this
  as well as mentioning that some cards are already end-of-life.
  
  Many thanks to Highpoint for providing this driver update.
  
  MFC after:	1 day

Modified:
  head/share/man/man4/hptiop.4
  head/sys/dev/hptiop/hptiop.c

Modified: head/share/man/man4/hptiop.4
==============================================================================
--- head/share/man/man4/hptiop.4	Fri Jul  5 22:42:10 2013	(r252850)
+++ head/share/man/man4/hptiop.4	Fri Jul  5 23:10:02 2013	(r252851)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 25, 2012
+.Dd July 5, 2013
 .Dt HPTIOP 4
 .Os
 .Sh NAME
@@ -60,6 +60,8 @@ driver supports the following SAS and SA
 .It
 HighPoint RocketRAID 4522
 .It
+HighPoint RocketRAID 4521
+.It
 HighPoint RocketRAID 4520
 .It
 HighPoint RocketRAID 4322
@@ -72,6 +74,20 @@ HighPoint RocketRAID 4311
 .It
 HighPoint RocketRAID 4310
 .It
+HighPoint RocketRAID 3640
+.It
+HighPoint RocketRAID 3622
+.It
+HighPoint RocketRAID 3620
+.El
+.Pp
+The
+.Nm
+driver also supports the following SAS and SATA RAID controllers that
+are already End-of-Life:
+.Pp
+.Bl -bullet -compact
+.It
 HighPoint RocketRAID 4211
 .It
 HighPoint RocketRAID 4210

Modified: head/sys/dev/hptiop/hptiop.c
==============================================================================
--- head/sys/dev/hptiop/hptiop.c	Fri Jul  5 22:42:10 2013	(r252850)
+++ head/sys/dev/hptiop/hptiop.c	Fri Jul  5 23:10:02 2013	(r252851)
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hptiop/hptiop.h>
 
 static const char driver_name[] = "hptiop";
-static const char driver_version[] = "v1.8";
+static const char driver_version[] = "v1.9";
 
 static devclass_t hptiop_devclass;
 
@@ -1821,8 +1821,12 @@ static int hptiop_probe(device_t dev)
 
 	switch (id) {
 		case 0x4520:
+		case 0x4521:
 		case 0x4522:
 			sas = 1;
+		case 0x3620:
+		case 0x3622:
+		case 0x3640:
 			ops = &hptiop_mvfrey_ops;
 			break;
 		case 0x4210: