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

[Xin LI]

Author: delphij
Date: Mon Aug 20 18:19:06 2012
New Revision: 239458
URL: http://svn.freebsd.org/changeset/base/239458

Log:
  MFC r239084:
  
  Add PCI IDs for various new High Point RocketRAID 43xx and 3xxx devices.
  
  Obtained from:	FreeNAS

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	Mon Aug 20 18:16:39 2012	(r239457)
+++ stable/9/share/man/man4/hptiop.4	Mon Aug 20 18:19:06 2012	(r239458)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 1, 2011
+.Dd August 5, 2012
 .Dt HPTIOP 4
 .Os
 .Sh NAME
@@ -58,34 +58,46 @@ driver supports the following SAS and SA
 .Pp
 .Bl -bullet -compact
 .It
-HighPoint RocketRAID 4320
+HighPoint RocketRAID 4322
 .It
 HighPoint RocketRAID 4321
 .It
-HighPoint RocketRAID 4322
+HighPoint RocketRAID 4320
 .It
-HighPoint RocketRAID 3220
+HighPoint RocketRAID 4311
 .It
-HighPoint RocketRAID 3320
+HighPoint RocketRAID 4310
 .It
-HighPoint RocketRAID 3410
+HighPoint RocketRAID 4211
 .It
-HighPoint RocketRAID 3520
+HighPoint RocketRAID 4210
 .It
-HighPoint RocketRAID 3510
+HighPoint RocketRAID 3560
 .It
-HighPoint RocketRAID 3511
+HighPoint RocketRAID 3540
 .It
-HighPoint RocketRAID 3521
+HighPoint RocketRAID 3530
 .It
 HighPoint RocketRAID 3522
 .It
-HighPoint RocketRAID 3540
+HighPoint RocketRAID 3521
 .It
-HighPoint RocketRAID 3120
+HighPoint RocketRAID 3520
+.It
+HighPoint RocketRAID 3511
+.It
+HighPoint RocketRAID 3510
+.It
+HighPoint RocketRAID 3410
+.It
+HighPoint RocketRAID 3320
+.It
+HighPoint RocketRAID 3220
 .It
 HighPoint RocketRAID 3122
 .It
+HighPoint RocketRAID 3120
+.It
 HighPoint RocketRAID 3020
 .El
 .Sh NOTES

Modified: stable/9/sys/dev/hptiop/hptiop.c
==============================================================================
--- stable/9/sys/dev/hptiop/hptiop.c	Mon Aug 20 18:16:39 2012	(r239457)
+++ stable/9/sys/dev/hptiop/hptiop.c	Mon Aug 20 18:19:06 2012	(r239458)
@@ -1284,9 +1284,13 @@ static int hptiop_probe(device_t dev)
 	id = pci_get_device(dev);
 
 	switch (id) {
-		case 0x4322:
-		case 0x4321:
+		case 0x4210:
+		case 0x4211:
+		case 0x4310:
+		case 0x4311:
 		case 0x4320:
+		case 0x4321:
+ 		case 0x4322:
 			sas = 1;
 		case 0x3220:
 		case 0x3320:
@@ -1296,12 +1300,14 @@ static int hptiop_probe(device_t dev)
 		case 0x3511:
 		case 0x3521:
 		case 0x3522:
+		case 0x3530:
 		case 0x3540:
+		case 0x3560:
 			ops = &hptiop_itl_ops;
 			break;
+		case 0x3020:
 		case 0x3120:
 		case 0x3122:
-		case 0x3020:
 			ops = &hptiop_mv_ops;
 			break;
 		default: