diff options
Diffstat (limited to 'drivers/scsi/hpsa.c')
-rw-r--r-- | drivers/scsi/hpsa.c | 54 |
1 files changed, 39 insertions, 15 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index fac8cf5832dd..891c86b66253 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c | |||
@@ -54,7 +54,7 @@ | |||
54 | #include "hpsa.h" | 54 | #include "hpsa.h" |
55 | 55 | ||
56 | /* HPSA_DRIVER_VERSION must be 3 byte values (0-255) separated by '.' */ | 56 | /* HPSA_DRIVER_VERSION must be 3 byte values (0-255) separated by '.' */ |
57 | #define HPSA_DRIVER_VERSION "2.0.2-1" | 57 | #define HPSA_DRIVER_VERSION "3.4.0-1" |
58 | #define DRIVER_NAME "HP HPSA Driver (v " HPSA_DRIVER_VERSION ")" | 58 | #define DRIVER_NAME "HP HPSA Driver (v " HPSA_DRIVER_VERSION ")" |
59 | #define HPSA "hpsa" | 59 | #define HPSA "hpsa" |
60 | 60 | ||
@@ -89,13 +89,14 @@ static const struct pci_device_id hpsa_pci_device_id[] = { | |||
89 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3245}, | 89 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3245}, |
90 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3247}, | 90 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3247}, |
91 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3249}, | 91 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3249}, |
92 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324a}, | 92 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324A}, |
93 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324b}, | 93 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324B}, |
94 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3233}, | 94 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3233}, |
95 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3350}, | 95 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3350}, |
96 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3351}, | 96 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3351}, |
97 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3352}, | 97 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3352}, |
98 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3353}, | 98 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3353}, |
99 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x334D}, | ||
99 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3354}, | 100 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3354}, |
100 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3355}, | 101 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3355}, |
101 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3356}, | 102 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x3356}, |
@@ -107,7 +108,19 @@ static const struct pci_device_id hpsa_pci_device_id[] = { | |||
107 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSH, 0x103C, 0x1925}, | 108 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSH, 0x103C, 0x1925}, |
108 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSH, 0x103C, 0x1926}, | 109 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSH, 0x103C, 0x1926}, |
109 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSH, 0x103C, 0x1928}, | 110 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSH, 0x103C, 0x1928}, |
110 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x334d}, | 111 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSH, 0x103C, 0x1929}, |
112 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21BD}, | ||
113 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21BE}, | ||
114 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21BF}, | ||
115 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C0}, | ||
116 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C1}, | ||
117 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C2}, | ||
118 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C3}, | ||
119 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C4}, | ||
120 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C5}, | ||
121 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C7}, | ||
122 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C8}, | ||
123 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSI, 0x103C, 0x21C9}, | ||
111 | {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, | 124 | {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, |
112 | PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0}, | 125 | PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0}, |
113 | {0,} | 126 | {0,} |
@@ -125,24 +138,35 @@ static struct board_type products[] = { | |||
125 | {0x3245103C, "Smart Array P410i", &SA5_access}, | 138 | {0x3245103C, "Smart Array P410i", &SA5_access}, |
126 | {0x3247103C, "Smart Array P411", &SA5_access}, | 139 | {0x3247103C, "Smart Array P411", &SA5_access}, |
127 | {0x3249103C, "Smart Array P812", &SA5_access}, | 140 | {0x3249103C, "Smart Array P812", &SA5_access}, |
128 | {0x324a103C, "Smart Array P712m", &SA5_access}, | 141 | {0x324A103C, "Smart Array P712m", &SA5_access}, |
129 | {0x324b103C, "Smart Array P711m", &SA5_access}, | 142 | {0x324B103C, "Smart Array P711m", &SA5_access}, |
130 | {0x3350103C, "Smart Array P222", &SA5_access}, | 143 | {0x3350103C, "Smart Array P222", &SA5_access}, |
131 | {0x3351103C, "Smart Array P420", &SA5_access}, | 144 | {0x3351103C, "Smart Array P420", &SA5_access}, |
132 | {0x3352103C, "Smart Array P421", &SA5_access}, | 145 | {0x3352103C, "Smart Array P421", &SA5_access}, |
133 | {0x3353103C, "Smart Array P822", &SA5_access}, | 146 | {0x3353103C, "Smart Array P822", &SA5_access}, |
147 | {0x334D103C, "Smart Array P822se", &SA5_access}, | ||
134 | {0x3354103C, "Smart Array P420i", &SA5_access}, | 148 | {0x3354103C, "Smart Array P420i", &SA5_access}, |
135 | {0x3355103C, "Smart Array P220i", &SA5_access}, | 149 | {0x3355103C, "Smart Array P220i", &SA5_access}, |
136 | {0x3356103C, "Smart Array P721m", &SA5_access}, | 150 | {0x3356103C, "Smart Array P721m", &SA5_access}, |
137 | {0x1920103C, "Smart Array", &SA5_access}, | 151 | {0x1921103C, "Smart Array P830i", &SA5_access}, |
138 | {0x1921103C, "Smart Array", &SA5_access}, | 152 | {0x1922103C, "Smart Array P430", &SA5_access}, |
139 | {0x1922103C, "Smart Array", &SA5_access}, | 153 | {0x1923103C, "Smart Array P431", &SA5_access}, |
140 | {0x1923103C, "Smart Array", &SA5_access}, | 154 | {0x1924103C, "Smart Array P830", &SA5_access}, |
141 | {0x1924103C, "Smart Array", &SA5_access}, | 155 | {0x1926103C, "Smart Array P731m", &SA5_access}, |
142 | {0x1925103C, "Smart Array", &SA5_access}, | 156 | {0x1928103C, "Smart Array P230i", &SA5_access}, |
143 | {0x1926103C, "Smart Array", &SA5_access}, | 157 | {0x1929103C, "Smart Array P530", &SA5_access}, |
144 | {0x1928103C, "Smart Array", &SA5_access}, | 158 | {0x21BD103C, "Smart Array", &SA5_access}, |
145 | {0x334d103C, "Smart Array P822se", &SA5_access}, | 159 | {0x21BE103C, "Smart Array", &SA5_access}, |
160 | {0x21BF103C, "Smart Array", &SA5_access}, | ||
161 | {0x21C0103C, "Smart Array", &SA5_access}, | ||
162 | {0x21C1103C, "Smart Array", &SA5_access}, | ||
163 | {0x21C2103C, "Smart Array", &SA5_access}, | ||
164 | {0x21C3103C, "Smart Array", &SA5_access}, | ||
165 | {0x21C4103C, "Smart Array", &SA5_access}, | ||
166 | {0x21C5103C, "Smart Array", &SA5_access}, | ||
167 | {0x21C7103C, "Smart Array", &SA5_access}, | ||
168 | {0x21C8103C, "Smart Array", &SA5_access}, | ||
169 | {0x21C9103C, "Smart Array", &SA5_access}, | ||
146 | {0xFFFF103C, "Unknown Smart Array", &SA5_access}, | 170 | {0xFFFF103C, "Unknown Smart Array", &SA5_access}, |
147 | }; | 171 | }; |
148 | 172 | ||