diff options
author | nagalakshmi.nandigama@lsi.com <nagalakshmi.nandigama@lsi.com> | 2011-11-30 21:13:37 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-12-15 01:57:32 -0500 |
commit | c1bc0704e52f200bc747c6bddb970a3686e230ab (patch) | |
tree | 74dff33cef4d108ddc2cd3f208436bcc439cca06 /drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | |
parent | 70e73f9945f80a5ad469d4d21b32209218aa51ac (diff) |
[SCSI] mpt2sas: MPI next revision header update
1) Added product specific range of ImageType macros for the Extended
Image Header.
2) Added Flags field and related defines to
MPI2_TOOLBOX_ISTWI_READ_WRITE_REQUEST to support automatic
reserve/release and page addressing.
Signed-off-by: Nagalakshmi Nandigama <nagalakshmi.nandigama@lsi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h')
-rw-r--r-- | drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h index cfd95b4e3004..d237ab8028c8 100644 --- a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h +++ b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * Title: MPI Configuration messages and pages | 6 | * Title: MPI Configuration messages and pages |
7 | * Creation Date: November 10, 2006 | 7 | * Creation Date: November 10, 2006 |
8 | * | 8 | * |
9 | * mpi2_cnfg.h Version: 02.00.19 | 9 | * mpi2_cnfg.h Version: 02.00.20 |
10 | * | 10 | * |
11 | * Version History | 11 | * Version History |
12 | * --------------- | 12 | * --------------- |
@@ -140,6 +140,7 @@ | |||
140 | * Added SASNotifyPrimitiveMasks field to | 140 | * Added SASNotifyPrimitiveMasks field to |
141 | * MPI2_CONFIG_PAGE_IOC_7. | 141 | * MPI2_CONFIG_PAGE_IOC_7. |
142 | * 03-09-11 02.00.19 Fixed IO Unit Page 10 (to match the spec). | 142 | * 03-09-11 02.00.19 Fixed IO Unit Page 10 (to match the spec). |
143 | * 05-25-11 02.00.20 Cleaned up a few comments. | ||
143 | * -------------------------------------------------------------------------- | 144 | * -------------------------------------------------------------------------- |
144 | */ | 145 | */ |
145 | 146 | ||
@@ -2321,13 +2322,12 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1 | |||
2321 | 2322 | ||
2322 | /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */ | 2323 | /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */ |
2323 | 2324 | ||
2324 | /* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */ | ||
2325 | |||
2326 | /* values for SAS Expander Page 1 DiscoveryInfo field */ | 2325 | /* values for SAS Expander Page 1 DiscoveryInfo field */ |
2327 | #define MPI2_SAS_EXPANDER1_DISCINFO_BAD_PHY_DISABLED (0x04) | 2326 | #define MPI2_SAS_EXPANDER1_DISCINFO_BAD_PHY_DISABLED (0x04) |
2328 | #define MPI2_SAS_EXPANDER1_DISCINFO_LINK_STATUS_CHANGE (0x02) | 2327 | #define MPI2_SAS_EXPANDER1_DISCINFO_LINK_STATUS_CHANGE (0x02) |
2329 | #define MPI2_SAS_EXPANDER1_DISCINFO_NO_ROUTING_ENTRIES (0x01) | 2328 | #define MPI2_SAS_EXPANDER1_DISCINFO_NO_ROUTING_ENTRIES (0x01) |
2330 | 2329 | ||
2330 | /* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */ | ||
2331 | 2331 | ||
2332 | /**************************************************************************** | 2332 | /**************************************************************************** |
2333 | * SAS Device Config Pages | 2333 | * SAS Device Config Pages |
@@ -2447,6 +2447,8 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0 | |||
2447 | 2447 | ||
2448 | #define MPI2_SASPHY0_PAGEVERSION (0x03) | 2448 | #define MPI2_SASPHY0_PAGEVERSION (0x03) |
2449 | 2449 | ||
2450 | /* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */ | ||
2451 | |||
2450 | /* use MPI2_SAS_PRATE_ defines for the ProgrammedLinkRate field */ | 2452 | /* use MPI2_SAS_PRATE_ defines for the ProgrammedLinkRate field */ |
2451 | 2453 | ||
2452 | /* use MPI2_SAS_HWRATE_ defines for the HwLinkRate field */ | 2454 | /* use MPI2_SAS_HWRATE_ defines for the HwLinkRate field */ |
@@ -2454,12 +2456,10 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0 | |||
2454 | /* values for SAS PHY Page 0 Flags field */ | 2456 | /* values for SAS PHY Page 0 Flags field */ |
2455 | #define MPI2_SAS_PHY0_FLAGS_SGPIO_DIRECT_ATTACH_ENC (0x01) | 2457 | #define MPI2_SAS_PHY0_FLAGS_SGPIO_DIRECT_ATTACH_ENC (0x01) |
2456 | 2458 | ||
2457 | /* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */ | 2459 | /* use MPI2_SAS_PHYINFO_ for the PhyInfo field */ |
2458 | 2460 | ||
2459 | /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */ | 2461 | /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */ |
2460 | 2462 | ||
2461 | /* use MPI2_SAS_PHYINFO_ for the PhyInfo field */ | ||
2462 | |||
2463 | 2463 | ||
2464 | /* SAS PHY Page 1 */ | 2464 | /* SAS PHY Page 1 */ |
2465 | 2465 | ||