[kernel] r22463 - in dists/wheezy/linux/debian: . patches patches/features/all/hpsa
Ben Hutchings
benh at moszumanska.debian.org
Tue Mar 31 03:20:40 UTC 2015
Author: benh
Date: Tue Mar 31 03:20:39 2015
New Revision: 22463
Log:
hpsa: Update device ID tables (Closes: #781548)
Added:
dists/wheezy/linux/debian/patches/features/all/hpsa/
dists/wheezy/linux/debian/patches/features/all/hpsa/0001-SCSI-hpsa-add-HP-Smart-Array-Gen9-PCI-ID-s.patch
dists/wheezy/linux/debian/patches/features/all/hpsa/0002-SCSI-hpsa-add-HP-Smart-Array-Gen8-names.patch
dists/wheezy/linux/debian/patches/features/all/hpsa/0003-SCSI-hpsa-housekeeping-patch-for-device_id-and-produ.patch
dists/wheezy/linux/debian/patches/features/all/hpsa/0004-SCSI-hpsa-remove-unused-Smart-Array-ID.patch
dists/wheezy/linux/debian/patches/features/all/hpsa/0005-SCSI-hpsa-remove-P822se-PCI-ID.patch
dists/wheezy/linux/debian/patches/features/all/hpsa/0006-SCSI-hpsa-add-HP-3PAR-vendor-id-to-pci_ids.h.patch
dists/wheezy/linux/debian/patches/features/all/hpsa/0007-SCSI-hpsa-Add-support-for-a-few-HP-Storage-controlle.patch
dists/wheezy/linux/debian/patches/features/all/hpsa/0008-hpsa-add-new-Smart-Array-PCI-IDs-May-2014.patch
dists/wheezy/linux/debian/patches/features/all/hpsa/0009-hpsa-fix-a-couple-pci-id-table-mistakes.patch
dists/wheezy/linux/debian/patches/features/all/hpsa/0010-hpsa-add-in-gen9-controller-model-names.patch
dists/wheezy/linux/debian/patches/features/all/hpsa/0011-hpsa-add-in-P840ar-controller-model-name.patch
Modified:
dists/wheezy/linux/debian/changelog
dists/wheezy/linux/debian/patches/series
Modified: dists/wheezy/linux/debian/changelog
==============================================================================
--- dists/wheezy/linux/debian/changelog Sun Mar 29 21:32:30 2015 (r22462)
+++ dists/wheezy/linux/debian/changelog Tue Mar 31 03:20:39 2015 (r22463)
@@ -78,6 +78,7 @@
current VRAM size.
- drm/radeon: add missing crtc unlock when setting up the MC
* [rt] Update to 3.2.68-rt98
+ * hpsa: Update device ID tables (Closes: #781548)
-- Ben Hutchings <ben at decadent.org.uk> Mon, 23 Feb 2015 03:42:59 +0000
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0001-SCSI-hpsa-add-HP-Smart-Array-Gen9-PCI-ID-s.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0001-SCSI-hpsa-add-HP-Smart-Array-Gen9-PCI-ID-s.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,66 @@
+From: Mike Miller <mike.miller at hp.com>
+Date: Wed, 4 Sep 2013 15:05:55 -0500
+Subject: [1/1] [SCSI] hpsa: add HP Smart Array Gen9 PCI ID's
+Origin: https://git.kernel.org/linus/97b9f53d7deb3b8c0acdeb52a5801f9f5080ce0f
+
+This patch adds the PCI ID's for HP Smart Array Gen9 controllers. Please
+consider this patch for inclusion.
+
+Signed-off-by: Mike Miller <mike.miller at hp.com>
+Signed-off-by: James Bottomley <JBottomley at Parallels.com>
+---
+ drivers/scsi/hpsa.c | 25 +++++++++++++++++++++++++
+ include/linux/pci_ids.h | 1 +
+ 2 files changed, 26 insertions(+)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -107,6 +107,19 @@ static const struct pci_device_id hpsa_p
+ {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_DEVICE_ID_HP_CISSH, 0x103C, 0x1929},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21BD},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21BE},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21BF},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C0},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C1},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C2},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C3},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C4},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C5},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C7},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C8},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C9},
+ {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+ PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
+ {0,}
+@@ -142,6 +155,18 @@ static struct board_type products[] = {
+ {0x1926103C, "Smart Array", &SA5_access},
+ {0x1928103C, "Smart Array", &SA5_access},
+ {0x334d103C, "Smart Array P822se", &SA5_access},
++ {0x21BD103C, "Smart Array", &SA5_access},
++ {0x21BE103C, "Smart Array", &SA5_access},
++ {0x21BF103C, "Smart Array", &SA5_access},
++ {0x21C0103C, "Smart Array", &SA5_access},
++ {0x21C1103C, "Smart Array", &SA5_access},
++ {0x21C2103C, "Smart Array", &SA5_access},
++ {0x21C3103C, "Smart Array", &SA5_access},
++ {0x21C4103C, "Smart Array", &SA5_access},
++ {0x21C5103C, "Smart Array", &SA5_access},
++ {0x21C7103C, "Smart Array", &SA5_access},
++ {0x21C8103C, "Smart Array", &SA5_access},
++ {0x21C9103C, "Smart Array", &SA5_access},
+ {0xFFFF103C, "Unknown Smart Array", &SA5_access},
+ };
+
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -753,6 +753,7 @@
+ #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_CISSI 0x3239
+ #define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031
+
+ #define PCI_VENDOR_ID_PCTECH 0x1042
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0002-SCSI-hpsa-add-HP-Smart-Array-Gen8-names.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0002-SCSI-hpsa-add-HP-Smart-Array-Gen8-names.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,38 @@
+From: Mike Miller <mike.miller at hp.com>
+Date: Wed, 4 Sep 2013 15:08:29 -0500
+Subject: [2/2] [SCSI] hpsa: add HP Smart Array Gen8 names
+Origin: https://git.kernel.org/linus/1fd6c8e37c0cb89ed294c7d38286ab75c1ae62ac
+
+Add the marketing names for HP Smart Array Gen8 controllers. Also removes an
+unused ID. Please consider this for inclusion.
+
+Signed-off-by: Mike Miller <mike.miller at hp.com>
+Signed-off-by: James Bottomley <JBottomley at Parallels.com>
+---
+ drivers/scsi/hpsa.c | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -146,14 +146,13 @@ static struct board_type products[] = {
+ {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},
++ {0x1921103C, "Smart Array P830i", &SA5_access},
++ {0x1922103C, "Smart Array P430", &SA5_access},
++ {0x1923103C, "Smart Array P431", &SA5_access},
++ {0x1924103C, "Smart Array P830", &SA5_access},
++ {0x1926103C, "Smart Array P731m", &SA5_access},
++ {0x1928103C, "Smart Array P230i", &SA5_access},
++ {0x1929103C, "Smart Array P530", &SA5_access},
+ {0x334d103C, "Smart Array P822se", &SA5_access},
+ {0x21BD103C, "Smart Array", &SA5_access},
+ {0x21BE103C, "Smart Array", &SA5_access},
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0003-SCSI-hpsa-housekeeping-patch-for-device_id-and-produ.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0003-SCSI-hpsa-housekeeping-patch-for-device_id-and-produ.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,67 @@
+From: Mike Miller <mike.miller at hp.com>
+Date: Wed, 4 Sep 2013 15:11:10 -0500
+Subject: [3/3] [SCSI] hpsa: housekeeping patch for device_id and product
+ arrays
+Origin: https://git.kernel.org/linus/163dbcd89c5acc5502636963023b9b42ca08c00f
+
+This patch does a bit of housekeeping for hpsa. Change lowercase alpha hex
+digits to uppercase for consistency within the driver. Also moves the P822se
+in the tables to keep controllers of each family grouped together.
+
+Signed-off-by: Mike Miller <mike.miller at hp.com>
+Signed-off-by: James Bottomley <JBottomley at Parallels.com>
+---
+ drivers/scsi/hpsa.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -88,13 +88,14 @@ static const struct pci_device_id hpsa_p
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3245},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3247},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3249},
+- {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324a},
+- {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324b},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324A},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324B},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3233},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3350},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3351},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3352},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3353},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x334D},
+ {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},
+@@ -106,7 +107,6 @@ static const struct pci_device_id hpsa_p
+ {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_DEVICE_ID_HP_CISSH, 0x103C, 0x1929},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21BD},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21BE},
+@@ -137,12 +137,13 @@ static struct board_type products[] = {
+ {0x3245103C, "Smart Array P410i", &SA5_access},
+ {0x3247103C, "Smart Array P411", &SA5_access},
+ {0x3249103C, "Smart Array P812", &SA5_access},
+- {0x324a103C, "Smart Array P712m", &SA5_access},
+- {0x324b103C, "Smart Array P711m", &SA5_access},
++ {0x324A103C, "Smart Array P712m", &SA5_access},
++ {0x324B103C, "Smart Array P711m", &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},
++ {0x334D103C, "Smart Array P822se", &SA5_access},
+ {0x3354103C, "Smart Array P420i", &SA5_access},
+ {0x3355103C, "Smart Array P220i", &SA5_access},
+ {0x3356103C, "Smart Array P721m", &SA5_access},
+@@ -153,7 +154,6 @@ static struct board_type products[] = {
+ {0x1926103C, "Smart Array P731m", &SA5_access},
+ {0x1928103C, "Smart Array P230i", &SA5_access},
+ {0x1929103C, "Smart Array P530", &SA5_access},
+- {0x334d103C, "Smart Array P822se", &SA5_access},
+ {0x21BD103C, "Smart Array", &SA5_access},
+ {0x21BE103C, "Smart Array", &SA5_access},
+ {0x21BF103C, "Smart Array", &SA5_access},
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0004-SCSI-hpsa-remove-unused-Smart-Array-ID.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0004-SCSI-hpsa-remove-unused-Smart-Array-ID.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,22 @@
+From: Mike Miller <mike.miller at hp.com>
+Date: Tue, 10 Sep 2013 13:18:23 -0500
+Subject: [4/4] [SCSI] hpsa: remove unused Smart Array ID
+Origin: https://git.kernel.org/linus/f79666bbb4ba361aecd36e7796d3b41eee07876e
+
+This patch removes the PCI ID of a cancelled Smart Array.
+
+Signed-off-by: James Bottomley <JBottomley at Parallels.com>
+---
+ drivers/scsi/hpsa.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -99,7 +99,6 @@ static const struct pci_device_id hpsa_p
+ {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},
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0005-SCSI-hpsa-remove-P822se-PCI-ID.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0005-SCSI-hpsa-remove-P822se-PCI-ID.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,31 @@
+From: Mike Miller <mike.miller at hp.com>
+Date: Wed, 13 Nov 2013 17:42:17 -0600
+Subject: [5/5] [SCSI] hpsa: remove P822se PCI ID
+Origin: https://git.kernel.org/linus/d5747e0aa0e52fc07ac4b4cae40c70ac9697f2fc
+
+Remove PCI ID for the never shipped P822se.
+
+Signed-off-by: Mike Miller <mike.miller at hp.com>
+Signed-off-by: James Bottomley <JBottomley at Parallels.com>
+---
+ drivers/scsi/hpsa.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -95,7 +95,6 @@ static const struct pci_device_id hpsa_p
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3351},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3352},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3353},
+- {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x334D},
+ {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},
+@@ -142,7 +141,6 @@ static struct board_type products[] = {
+ {0x3351103C, "Smart Array P420", &SA5_access},
+ {0x3352103C, "Smart Array P421", &SA5_access},
+ {0x3353103C, "Smart Array P822", &SA5_access},
+- {0x334D103C, "Smart Array P822se", &SA5_access},
+ {0x3354103C, "Smart Array P420i", &SA5_access},
+ {0x3355103C, "Smart Array P220i", &SA5_access},
+ {0x3356103C, "Smart Array P721m", &SA5_access},
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0006-SCSI-hpsa-add-HP-3PAR-vendor-id-to-pci_ids.h.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0006-SCSI-hpsa-add-HP-3PAR-vendor-id-to-pci_ids.h.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,21 @@
+From: "Stephen M. Cameron" <scameron at beardog.cce.hp.com>
+Date: Tue, 18 Feb 2014 13:57:57 -0600
+Subject: [6/6] [SCSI] hpsa: add HP/3PAR vendor id to pci_ids.h
+Origin: https://git.kernel.org/linus/4b409c50343f41596f76006460cb5adc4d25824e
+
+Signed-off-by: Stephen M. Cameron <scameron at beardog.cce.hp.com>
+Signed-off-by: James Bottomley <JBottomley at Parallels.com>
+---
+ include/linux/pci_ids.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -721,6 +721,7 @@
+ #define PCI_DEVICE_ID_SI_7018 0x7018
+
+ #define PCI_VENDOR_ID_HP 0x103c
++#define PCI_VENDOR_ID_HP_3PAR 0x1590
+ #define PCI_DEVICE_ID_HP_VISUALIZE_EG 0x1005
+ #define PCI_DEVICE_ID_HP_VISUALIZE_FX6 0x1006
+ #define PCI_DEVICE_ID_HP_VISUALIZE_FX4 0x1008
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0007-SCSI-hpsa-Add-support-for-a-few-HP-Storage-controlle.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0007-SCSI-hpsa-Add-support-for-a-few-HP-Storage-controlle.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,37 @@
+From: "Stephen M. Cameron" <scameron at beardog.cce.hp.com>
+Date: Tue, 18 Feb 2014 13:58:02 -0600
+Subject: [7/7] [SCSI] hpsa: Add support for a few HP Storage controllers
+Origin: https://git.kernel.org/linus/8e616a5ee6e389f855a9fa0ab57194b4b049d9c8
+
+Signed-off-by: Stephen M. Cameron <scameron at beardog.cce.hp.com>
+Signed-off-by: James Bottomley <JBottomley at Parallels.com>
+---
+ drivers/scsi/hpsa.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -118,6 +118,11 @@ static const struct pci_device_id hpsa_p
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C7},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C8},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C9},
++ {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0076},
++ {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0087},
++ {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D},
++ {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0088},
++ {PCI_VENDOR_ID_HP, 0x333f, 0x103c, 0x333f},
+ {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+ PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
+ {0,}
+@@ -163,6 +168,11 @@ static struct board_type products[] = {
+ {0x21C7103C, "Smart Array", &SA5_access},
+ {0x21C8103C, "Smart Array", &SA5_access},
+ {0x21C9103C, "Smart Array", &SA5_access},
++ {0x00761590, "HP Storage P1224 Array Controller", &SA5_access},
++ {0x00871590, "HP Storage P1224e Array Controller", &SA5_access},
++ {0x007D1590, "HP Storage P1228 Array Controller", &SA5_access},
++ {0x00881590, "HP Storage P1228e Array Controller", &SA5_access},
++ {0x333f103c, "HP StorageWorks 1210m Array Controller", &SA5_access},
+ {0xFFFF103C, "Unknown Smart Array", &SA5_access},
+ };
+
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0008-hpsa-add-new-Smart-Array-PCI-IDs-May-2014.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0008-hpsa-add-new-Smart-Array-PCI-IDs-May-2014.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,48 @@
+From: Joe Handzik <joseph.t.handzik at hp.com>
+Date: Thu, 8 May 2014 14:27:24 -0500
+Subject: [8/8] hpsa: add new Smart Array PCI IDs (May 2014)
+Origin: https://git.kernel.org/linus/3b7a45e5ba85dc79c7714edd9eee9aaed730cd6b
+
+Signed-off-by: Scott Teel <scott.teel at hp.com>
+Signed-off-by: Joe Handzik <joseph.t.handzik at hp.com>
+Signed-off-by: Stephen M. Cameron <scameron at beardog.cce.hp.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Christoph Hellwig <hch at lst.de>
+---
+ drivers/scsi/hpsa.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -115,9 +115,15 @@ static const struct pci_device_id hpsa_p
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C3},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C4},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C5},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C6},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C7},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C8},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C9},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21CA},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21CB},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21CC},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21CD},
++ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21CE},
+ {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0076},
+ {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0087},
+ {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D},
+@@ -165,9 +171,15 @@ static struct board_type products[] = {
+ {0x21C3103C, "Smart Array", &SA5_access},
+ {0x21C4103C, "Smart Array", &SA5_access},
+ {0x21C5103C, "Smart Array", &SA5_access},
++ {0x21C6103C, "Smart Array", &SA5_access},
+ {0x21C7103C, "Smart Array", &SA5_access},
+ {0x21C8103C, "Smart Array", &SA5_access},
+ {0x21C9103C, "Smart Array", &SA5_access},
++ {0x21CA103C, "Smart Array", &SA5_access},
++ {0x21CB103C, "Smart Array", &SA5_access},
++ {0x21CC103C, "Smart Array", &SA5_access},
++ {0x21CD103C, "Smart Array", &SA5_access},
++ {0x21CE103C, "Smart Array", &SA5_access},
+ {0x00761590, "HP Storage P1224 Array Controller", &SA5_access},
+ {0x00871590, "HP Storage P1224e Array Controller", &SA5_access},
+ {0x007D1590, "HP Storage P1228 Array Controller", &SA5_access},
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0009-hpsa-fix-a-couple-pci-id-table-mistakes.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0009-hpsa-fix-a-couple-pci-id-table-mistakes.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,35 @@
+From: "Stephen M. Cameron" <scameron at beardog.cce.hp.com>
+Date: Fri, 14 Nov 2014 17:26:38 -0600
+Subject: [9/9] hpsa: fix a couple pci id table mistakes
+Origin: https://git.kernel.org/linus/7d2cce58a765e802959471f8a7edd83f113ad637
+
+Fix a couple of pci id table mistakes:
+Subdevice ID 0x3323 missing from product[] table
+ (another name for HP Smart Storage 1210m)
+Bogus 0x1925 subdevice id removed from hpsa_pci_device_id[] (no such thing.)
+
+Signed-off-by: Don Brace <don.brace at pmcs.com>
+Reviewed-by: Webb Scales <webbnh at hp.com>
+Signed-off-by: Christoph Hellwig <hch at lst.de>
+---
+ drivers/scsi/hpsa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -102,7 +102,6 @@ static const struct pci_device_id hpsa_p
+ {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_CISSH, 0x103C, 0x1929},
+@@ -148,6 +147,7 @@ static struct board_type products[] = {
+ {0x3249103C, "Smart Array P812", &SA5_access},
+ {0x324A103C, "Smart Array P712m", &SA5_access},
+ {0x324B103C, "Smart Array P711m", &SA5_access},
++ {0x3233103C, "HP StorageWorks 1210m", &SA5_access}, /* alias of 333f */
+ {0x3350103C, "Smart Array P222", &SA5_access},
+ {0x3351103C, "Smart Array P420", &SA5_access},
+ {0x3352103C, "Smart Array P421", &SA5_access},
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0010-hpsa-add-in-gen9-controller-model-names.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0010-hpsa-add-in-gen9-controller-model-names.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,54 @@
+From: Don Brace <don.brace at pmcs.com>
+Date: Fri, 23 Jan 2015 16:45:07 -0600
+Subject: [10/10] hpsa: add in gen9 controller model names
+Origin: https://git.kernel.org/linus/27fb8137299d4b0ee1d248d369e8c7a1dccf54dc
+
+Add in gen9 controller model names
+
+Reviewed-by: Scott Teel <scott.teel at pmcs.com>
+Signed-off-by: Don Brace <don.brace at pmcs.com>
+Signed-off-by: Christoph Hellwig <hch at lst.de>
+---
+ drivers/scsi/hpsa.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -162,24 +162,24 @@ static struct board_type products[] = {
+ {0x1926103C, "Smart Array P731m", &SA5_access},
+ {0x1928103C, "Smart Array P230i", &SA5_access},
+ {0x1929103C, "Smart Array P530", &SA5_access},
+- {0x21BD103C, "Smart Array", &SA5_access},
+- {0x21BE103C, "Smart Array", &SA5_access},
+- {0x21BF103C, "Smart Array", &SA5_access},
+- {0x21C0103C, "Smart Array", &SA5_access},
++ {0x21BD103C, "Smart Array P244br", &SA5_access},
++ {0x21BE103C, "Smart Array P741m", &SA5_access},
++ {0x21BF103C, "Smart HBA H240ar", &SA5_access},
++ {0x21C0103C, "Smart Array P440ar", &SA5_access},
+ {0x21C1103C, "Smart Array", &SA5_access},
+- {0x21C2103C, "Smart Array", &SA5_access},
+- {0x21C3103C, "Smart Array", &SA5_access},
++ {0x21C2103C, "Smart Array P440", &SA5_access},
++ {0x21C3103C, "Smart Array P441", &SA5_access},
+ {0x21C4103C, "Smart Array", &SA5_access},
+- {0x21C5103C, "Smart Array", &SA5_access},
+- {0x21C6103C, "Smart Array", &SA5_access},
+- {0x21C7103C, "Smart Array", &SA5_access},
+- {0x21C8103C, "Smart Array", &SA5_access},
++ {0x21C5103C, "Smart Array P841", &SA5_access},
++ {0x21C6103C, "Smart HBA H244br", &SA5_access},
++ {0x21C7103C, "Smart HBA H240", &SA5_access},
++ {0x21C8103C, "Smart HBA H241", &SA5_access},
+ {0x21C9103C, "Smart Array", &SA5_access},
+- {0x21CA103C, "Smart Array", &SA5_access},
+- {0x21CB103C, "Smart Array", &SA5_access},
++ {0x21CA103C, "Smart Array P246br", &SA5_access},
++ {0x21CB103C, "Smart Array P840", &SA5_access},
+ {0x21CC103C, "Smart Array", &SA5_access},
+ {0x21CD103C, "Smart Array", &SA5_access},
+- {0x21CE103C, "Smart Array", &SA5_access},
++ {0x21CE103C, "Smart HBA", &SA5_access},
+ {0x00761590, "HP Storage P1224 Array Controller", &SA5_access},
+ {0x00871590, "HP Storage P1224e Array Controller", &SA5_access},
+ {0x007D1590, "HP Storage P1228 Array Controller", &SA5_access},
Added: dists/wheezy/linux/debian/patches/features/all/hpsa/0011-hpsa-add-in-P840ar-controller-model-name.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/hpsa/0011-hpsa-add-in-P840ar-controller-model-name.patch Tue Mar 31 03:20:39 2015 (r22463)
@@ -0,0 +1,25 @@
+From: Don Brace <don.brace at pmcs.com>
+Date: Fri, 23 Jan 2015 16:45:12 -0600
+Subject: [11/11] hpsa: add in P840ar controller model name
+Origin: https://git.kernel.org/linus/c8ae0ab10044a7aee47d1e97f2eed992b34b0c59
+
+Add in P840ar model name for gen9
+
+Reviewed-by: Scott Teel <scott.teel at pmcs.com>
+Signed-off-by: Don Brace <don.brace at pmcs.com>
+Signed-off-by: Christoph Hellwig <hch at lst.de>
+---
+ drivers/scsi/hpsa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -166,7 +166,7 @@ static struct board_type products[] = {
+ {0x21BE103C, "Smart Array P741m", &SA5_access},
+ {0x21BF103C, "Smart HBA H240ar", &SA5_access},
+ {0x21C0103C, "Smart Array P440ar", &SA5_access},
+- {0x21C1103C, "Smart Array", &SA5_access},
++ {0x21C1103C, "Smart Array P840ar", &SA5_access},
+ {0x21C2103C, "Smart Array P440", &SA5_access},
+ {0x21C3103C, "Smart Array P441", &SA5_access},
+ {0x21C4103C, "Smart Array", &SA5_access},
Modified: dists/wheezy/linux/debian/patches/series
==============================================================================
--- dists/wheezy/linux/debian/patches/series Sun Mar 29 21:32:30 2015 (r22462)
+++ dists/wheezy/linux/debian/patches/series Tue Mar 31 03:20:39 2015 (r22463)
@@ -1140,3 +1140,16 @@
bugfix/all/aslr-fix-stack-randomization-on-64-bit-systems.patch
debian/sock-fix-abi-change-in-3.2.67.patch
debian/rmap-fix-abi-change-in-3.2.67.patch
+
+# Update hpsa device IDs
+features/all/hpsa/0001-SCSI-hpsa-add-HP-Smart-Array-Gen9-PCI-ID-s.patch
+features/all/hpsa/0002-SCSI-hpsa-add-HP-Smart-Array-Gen8-names.patch
+features/all/hpsa/0003-SCSI-hpsa-housekeeping-patch-for-device_id-and-produ.patch
+features/all/hpsa/0004-SCSI-hpsa-remove-unused-Smart-Array-ID.patch
+features/all/hpsa/0005-SCSI-hpsa-remove-P822se-PCI-ID.patch
+features/all/hpsa/0006-SCSI-hpsa-add-HP-3PAR-vendor-id-to-pci_ids.h.patch
+features/all/hpsa/0007-SCSI-hpsa-Add-support-for-a-few-HP-Storage-controlle.patch
+features/all/hpsa/0008-hpsa-add-new-Smart-Array-PCI-IDs-May-2014.patch
+features/all/hpsa/0009-hpsa-fix-a-couple-pci-id-table-mistakes.patch
+features/all/hpsa/0010-hpsa-add-in-gen9-controller-model-names.patch
+features/all/hpsa/0011-hpsa-add-in-P840ar-controller-model-name.patch
More information about the Kernel-svn-changes
mailing list