diff options
author | Kashyap, Desai <kashyap.desai@lsi.com> | 2009-09-23 07:54:27 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2009-10-29 13:03:09 -0400 |
commit | db27136a89d061bf9dceb28953a61a8ef862ca7f (patch) | |
tree | 677193c7e9fc47ed40c17035112d3379e969f751 /drivers/scsi/mpt2sas | |
parent | 9982f59450930138eb0bf9a4ebf865e8c06ba705 (diff) |
[SCSI] mpt2sas: New device SAS2208 support is added
Added device ids range for { 0x80 - 87 } , modified mpi/mpi2_cnfg.h containing
MPI2_MFGPAGE_DEVID_SAS2208_X.
Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: Eric Moore <Eric.moore@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/mpt2sas')
-rw-r--r-- | drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 8 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_scsih.c | 18 |
2 files changed, 26 insertions, 0 deletions
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h index ab47c4679640..5af66dbe3239 100644 --- a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h +++ b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | |||
@@ -348,6 +348,14 @@ typedef struct _MPI2_CONFIG_REPLY | |||
348 | #define MPI2_MFGPAGE_DEVID_SAS2108_3 (0x0077) | 348 | #define MPI2_MFGPAGE_DEVID_SAS2108_3 (0x0077) |
349 | #define MPI2_MFGPAGE_DEVID_SAS2116_1 (0x0064) | 349 | #define MPI2_MFGPAGE_DEVID_SAS2116_1 (0x0064) |
350 | #define MPI2_MFGPAGE_DEVID_SAS2116_2 (0x0065) | 350 | #define MPI2_MFGPAGE_DEVID_SAS2116_2 (0x0065) |
351 | #define MPI2_MFGPAGE_DEVID_SAS2208_1 (0x0080) | ||
352 | #define MPI2_MFGPAGE_DEVID_SAS2208_2 (0x0081) | ||
353 | #define MPI2_MFGPAGE_DEVID_SAS2208_3 (0x0082) | ||
354 | #define MPI2_MFGPAGE_DEVID_SAS2208_4 (0x0083) | ||
355 | #define MPI2_MFGPAGE_DEVID_SAS2208_5 (0x0084) | ||
356 | #define MPI2_MFGPAGE_DEVID_SAS2208_6 (0x0085) | ||
357 | #define MPI2_MFGPAGE_DEVID_SAS2208_7 (0x0086) | ||
358 | #define MPI2_MFGPAGE_DEVID_SAS2208_8 (0x0087) | ||
351 | 359 | ||
352 | 360 | ||
353 | /* Manufacturing Page 0 */ | 361 | /* Manufacturing Page 0 */ |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index efb6270cf261..91d61154a46c 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c | |||
@@ -196,10 +196,28 @@ static struct pci_device_id scsih_pci_table[] = { | |||
196 | PCI_ANY_ID, PCI_ANY_ID }, | 196 | PCI_ANY_ID, PCI_ANY_ID }, |
197 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2108_3, | 197 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2108_3, |
198 | PCI_ANY_ID, PCI_ANY_ID }, | 198 | PCI_ANY_ID, PCI_ANY_ID }, |
199 | /* Meteor ~ 2116 */ | ||
199 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_1, | 200 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_1, |
200 | PCI_ANY_ID, PCI_ANY_ID }, | 201 | PCI_ANY_ID, PCI_ANY_ID }, |
201 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2, | 202 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2, |
202 | PCI_ANY_ID, PCI_ANY_ID }, | 203 | PCI_ANY_ID, PCI_ANY_ID }, |
204 | /* Thunderbolt ~ 2208 */ | ||
205 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1, | ||
206 | PCI_ANY_ID, PCI_ANY_ID }, | ||
207 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_2, | ||
208 | PCI_ANY_ID, PCI_ANY_ID }, | ||
209 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_3, | ||
210 | PCI_ANY_ID, PCI_ANY_ID }, | ||
211 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_4, | ||
212 | PCI_ANY_ID, PCI_ANY_ID }, | ||
213 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_5, | ||
214 | PCI_ANY_ID, PCI_ANY_ID }, | ||
215 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_6, | ||
216 | PCI_ANY_ID, PCI_ANY_ID }, | ||
217 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_7, | ||
218 | PCI_ANY_ID, PCI_ANY_ID }, | ||
219 | { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_8, | ||
220 | PCI_ANY_ID, PCI_ANY_ID }, | ||
203 | {0} /* Terminating entry */ | 221 | {0} /* Terminating entry */ |
204 | }; | 222 | }; |
205 | MODULE_DEVICE_TABLE(pci, scsih_pci_table); | 223 | MODULE_DEVICE_TABLE(pci, scsih_pci_table); |