Patchwork [Quantal,SRU,1/1,SCSI] hpsa: gen8plus Smart Array IDs

login
register
mail settings
Submitter Leann Ogasawara
Date Dec. 12, 2012, 9:02 p.m.
Message ID <61389b7166055c672358d6a77e219ec79b3d4346.1355345675.git.leann.ogasawara@canonical.com>
Download mbox | patch
Permalink /patch/205658/
State New
Headers show

Comments

Leann Ogasawara - Dec. 12, 2012, 9:02 p.m.
From: Mike Miller <mike.miller@hp.com>

BugLink: http://bugs.launchpad.net/bugs/1089623

Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit fe0c9610bb68dd0aad1017456f5e3c31264d70c2)

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 drivers/scsi/hpsa.c     |   32 +++++++++++++++++++++++++-------
 include/linux/pci_ids.h |    1 +
 2 files changed, 26 insertions(+), 7 deletions(-)
Brad Figg - Dec. 12, 2012, 9:14 p.m.
On 12/12/2012 01:02 PM, leann.ogasawara@canonical.com wrote:
> From: Mike Miller <mike.miller@hp.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1089623
> 
> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
> (cherry picked from commit fe0c9610bb68dd0aad1017456f5e3c31264d70c2)
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> ---
>  drivers/scsi/hpsa.c     |   32 +++++++++++++++++++++++++-------
>  include/linux/pci_ids.h |    1 +
>  2 files changed, 26 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index f9823f2..cb00d70 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -99,6 +99,15 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
>  	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3354},
>  	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3355},
>  	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3356},
> +	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1920},
> +	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1921},
> +	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1922},
> +	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1923},
> +	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1924},
> +	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1925},
> +	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1926},
> +	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1928},
> +	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x334d},
>  	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,
>  		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
>  	{0,}
> @@ -118,13 +127,22 @@ static struct board_type products[] = {
>  	{0x3249103C, "Smart Array P812", &SA5_access},
>  	{0x324a103C, "Smart Array P712m", &SA5_access},
>  	{0x324b103C, "Smart Array P711m", &SA5_access},
> -	{0x3350103C, "Smart Array", &SA5_access},
> -	{0x3351103C, "Smart Array", &SA5_access},
> -	{0x3352103C, "Smart Array", &SA5_access},
> -	{0x3353103C, "Smart Array", &SA5_access},
> -	{0x3354103C, "Smart Array", &SA5_access},
> -	{0x3355103C, "Smart Array", &SA5_access},
> -	{0x3356103C, "Smart Array", &SA5_access},
> +	{0x3350103C, "Smart Array P222", &SA5_access},
> +	{0x3351103C, "Smart Array P420", &SA5_access},
> +	{0x3352103C, "Smart Array P421", &SA5_access},
> +	{0x3353103C, "Smart Array P822", &SA5_access},
> +	{0x3354103C, "Smart Array P420i", &SA5_access},
> +	{0x3355103C, "Smart Array P220i", &SA5_access},
> +	{0x3356103C, "Smart Array P721m", &SA5_access},
> +	{0x1920103C, "Smart Array", &SA5_access},
> +	{0x1921103C, "Smart Array", &SA5_access},
> +	{0x1922103C, "Smart Array", &SA5_access},
> +	{0x1923103C, "Smart Array", &SA5_access},
> +	{0x1924103C, "Smart Array", &SA5_access},
> +	{0x1925103C, "Smart Array", &SA5_access},
> +	{0x1926103C, "Smart Array", &SA5_access},
> +	{0x1928103C, "Smart Array", &SA5_access},
> +	{0x334d103C, "Smart Array P822se", &SA5_access},
>  	{0xFFFF103C, "Unknown Smart Array", &SA5_access},
>  };
>  
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index c71eea2..a56c194 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -752,6 +752,7 @@
>  #define PCI_DEVICE_ID_HP_CISSD		0x3238
>  #define PCI_DEVICE_ID_HP_CISSE		0x323a
>  #define PCI_DEVICE_ID_HP_CISSF		0x323b
> +#define PCI_DEVICE_ID_HP_CISSH		0x323c
>  #define PCI_DEVICE_ID_HP_ZX2_IOC	0x4031
>  
>  #define PCI_VENDOR_ID_PCTECH		0x1042
> 

Low possibility of regression.
Seth Forshee - Dec. 12, 2012, 9:58 p.m.

Patch

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index f9823f2..cb00d70 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -99,6 +99,15 @@  static const struct pci_device_id hpsa_pci_device_id[] = {
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3354},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3355},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3356},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1920},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1921},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1922},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1923},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1924},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1925},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1926},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1928},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x334d},
 	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,
 		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
 	{0,}
@@ -118,13 +127,22 @@  static struct board_type products[] = {
 	{0x3249103C, "Smart Array P812", &SA5_access},
 	{0x324a103C, "Smart Array P712m", &SA5_access},
 	{0x324b103C, "Smart Array P711m", &SA5_access},
-	{0x3350103C, "Smart Array", &SA5_access},
-	{0x3351103C, "Smart Array", &SA5_access},
-	{0x3352103C, "Smart Array", &SA5_access},
-	{0x3353103C, "Smart Array", &SA5_access},
-	{0x3354103C, "Smart Array", &SA5_access},
-	{0x3355103C, "Smart Array", &SA5_access},
-	{0x3356103C, "Smart Array", &SA5_access},
+	{0x3350103C, "Smart Array P222", &SA5_access},
+	{0x3351103C, "Smart Array P420", &SA5_access},
+	{0x3352103C, "Smart Array P421", &SA5_access},
+	{0x3353103C, "Smart Array P822", &SA5_access},
+	{0x3354103C, "Smart Array P420i", &SA5_access},
+	{0x3355103C, "Smart Array P220i", &SA5_access},
+	{0x3356103C, "Smart Array P721m", &SA5_access},
+	{0x1920103C, "Smart Array", &SA5_access},
+	{0x1921103C, "Smart Array", &SA5_access},
+	{0x1922103C, "Smart Array", &SA5_access},
+	{0x1923103C, "Smart Array", &SA5_access},
+	{0x1924103C, "Smart Array", &SA5_access},
+	{0x1925103C, "Smart Array", &SA5_access},
+	{0x1926103C, "Smart Array", &SA5_access},
+	{0x1928103C, "Smart Array", &SA5_access},
+	{0x334d103C, "Smart Array P822se", &SA5_access},
 	{0xFFFF103C, "Unknown Smart Array", &SA5_access},
 };
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c71eea2..a56c194 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -752,6 +752,7 @@ 
 #define PCI_DEVICE_ID_HP_CISSD		0x3238
 #define PCI_DEVICE_ID_HP_CISSE		0x323a
 #define PCI_DEVICE_ID_HP_CISSF		0x323b
+#define PCI_DEVICE_ID_HP_CISSH		0x323c
 #define PCI_DEVICE_ID_HP_ZX2_IOC	0x4031
 
 #define PCI_VENDOR_ID_PCTECH		0x1042