svn commit: r252884 - in stable/9: share/man/man4 sys/dev/hptiop

[Xin LI]

Author: delphij
Date: Sat Jul  6 09:49:01 2013
New Revision: 252884
URL: http://svnweb.freebsd.org/changeset/base/252884

Log:
  MFC r252851:
  
  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.

Modified:
  stable/9/share/man/man4/hptiop.4
  stable/9/sys/dev/hptiop/hptiop.c
Directory Properties:
  stable/9/share/man/man4/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/share/man/man4/hptiop.4
==============================================================================
--- stable/9/share/man/man4/hptiop.4	Sat Jul  6 09:23:04 2013	(r252883)
+++ stable/9/share/man/man4/hptiop.4	Sat Jul  6 09:49:01 2013	(r252884)
@@ -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: stable/9/sys/dev/hptiop/hptiop.c
==============================================================================
--- stable/9/sys/dev/hptiop/hptiop.c	Sat Jul  6 09:23:04 2013	(r252883)
+++ stable/9/sys/dev/hptiop/hptiop.c	Sat Jul  6 09:49:01 2013	(r252884)
@@ -90,7 +90,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;
 
@@ -1869,8 +1869,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: