From 08e958452532187958dbff5121d3010ef1de98ee Mon Sep 17 00:00:00 2001
From: Robert Mustacchi <rm@joyent.com>
Date: Tue, 3 Jun 2014 14:07:49 -0700
Subject: [PATCH] 4906 cpqary3: add support for hp gen8+ smart array
 controllers Reviewed by: Garrett D'Amore <garrett@damore.org> Reviewed by:
 Eric Sproul <esproul@omniti.com> Approved by: Dan McDonald
 <danmcd@omniti.com>

---
 .../pkg/manifests/driver-storage-cpqary3.mf   |  9 +-
 usr/src/uts/common/io/cpqary3/cpqary3_bd.c    | 86 ++++++++++++++++++-
 2 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/usr/src/pkg/manifests/driver-storage-cpqary3.mf b/usr/src/pkg/manifests/driver-storage-cpqary3.mf
index 0308ddc7fc34..25b882d75a30 100644
--- a/usr/src/pkg/manifests/driver-storage-cpqary3.mf
+++ b/usr/src/pkg/manifests/driver-storage-cpqary3.mf
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2013 Joyent, Inc.  All rights reserved.
+# Copyright 2014 Joyent, Inc.  All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
 
@@ -27,6 +27,13 @@ dir path=kernel/drv/$(ARCH64) group=sys
 dir path=usr/share/man
 dir path=usr/share/man/man7d
 driver name=cpqary3 class=scsi \
+    alias=pci103c,1920 \
+    alias=pci103c,1921 \
+    alias=pci103c,1922 \
+    alias=pci103c,1923 \
+    alias=pci103c,1924 \
+    alias=pci103c,1926 \
+    alias=pci103c,1928 \
     alias=pci103c,3211 \
     alias=pci103c,3212 \
     alias=pci103c,3223 \
diff --git a/usr/src/uts/common/io/cpqary3/cpqary3_bd.c b/usr/src/uts/common/io/cpqary3/cpqary3_bd.c
index 84cf7af7ce27..a643418e5f8f 100644
--- a/usr/src/uts/common/io/cpqary3/cpqary3_bd.c
+++ b/usr/src/uts/common/io/cpqary3/cpqary3_bd.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (C) 2013 Hewlett-Packard Development Company, L.P.
+ * Copyright (C) 2014 Hewlett-Packard Development Company, L.P.
  */
 
 /*
@@ -408,6 +408,90 @@ static cpqary3_bd_t cpqary3_bds[] = {
 		INTR_PERF_MASK,
 		0,
 		1
+	},
+	{
+		"Smart Array P230i Controller",
+		8,
+		0x103c,
+		0x1928,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P430i Controller",
+		8,
+		0x103c,
+		0x1920,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P430 Controller",
+		8,
+		0x103c,
+		0x1922,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P431 Controller",
+		8,
+		0x103c,
+		0x1923,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P731m Controller",
+		8,
+		0x103c,
+		0x1926,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P830i Controller",
+		8,
+		0x103c,
+		0x1921,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
+	},
+	{
+		"Smart Array P830 Controller",
+		8,
+		0x103c,
+		0x1924,
+		OUTBOUND_LIST_5300_EXISTS,
+		SA_BD_SAS,
+		0,
+		INTR_PERF_MASK,
+		0,
+		1
 	}
 };