diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 13:48:12 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 13:48:12 -0700 |
| commit | 19ac97ff701ae3c0eda09dd88f590806f1c4eb2d (patch) | |
| tree | 62bb6b6358783dc9d6c26f480fa378843abb0235 /drivers/scsi/mpt2sas/mpi/mpi2.h | |
| parent | 24c20f10583647e30afe87b6f6d5e14bc7b1cbc6 (diff) | |
| parent | e785060ea3a1c8e37a8bc1449c79e36bff2b5b13 (diff) | |
| download | linux-19ac97ff701ae3c0eda09dd88f590806f1c4eb2d.tar.gz linux-19ac97ff701ae3c0eda09dd88f590806f1c4eb2d.tar.bz2 linux-19ac97ff701ae3c0eda09dd88f590806f1c4eb2d.zip | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-linus
Diffstat (limited to 'drivers/scsi/mpt2sas/mpi/mpi2.h')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpi/mpi2.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2.h b/drivers/scsi/mpt2sas/mpi/mpi2.h index 7b14a015c903..088eefa67da8 100644 --- a/drivers/scsi/mpt2sas/mpi/mpi2.h +++ b/drivers/scsi/mpt2sas/mpi/mpi2.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2013 LSI Corporation. + * Copyright (c) 2000-2014 LSI Corporation. * * * Name: mpi2.h @@ -8,7 +8,7 @@ * scatter/gather formats. * Creation Date: June 21, 2006 * - * mpi2.h Version: 02.00.28 + * mpi2.h Version: 02.00.32 * * Version History * --------------- @@ -78,6 +78,11 @@ * 07-10-12 02.00.26 Bumped MPI2_HEADER_VERSION_UNIT. * 07-26-12 02.00.27 Bumped MPI2_HEADER_VERSION_UNIT. * 11-27-12 02.00.28 Bumped MPI2_HEADER_VERSION_UNIT. + * 12-20-12 02.00.29 Bumped MPI2_HEADER_VERSION_UNIT. + * Added MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET. + * 04-09-13 02.00.30 Bumped MPI2_HEADER_VERSION_UNIT. + * 04-17-13 02.00.31 Bumped MPI2_HEADER_VERSION_UNIT. + * 08-19-13 02.00.32 Bumped MPI2_HEADER_VERSION_UNIT. * -------------------------------------------------------------------------- */ @@ -103,7 +108,7 @@ #define MPI2_VERSION_02_00 (0x0200) /* versioning for this MPI header set */ -#define MPI2_HEADER_VERSION_UNIT (0x1C) +#define MPI2_HEADER_VERSION_UNIT (0x20) #define MPI2_HEADER_VERSION_DEV (0x00) #define MPI2_HEADER_VERSION_UNIT_MASK (0xFF00) #define MPI2_HEADER_VERSION_UNIT_SHIFT (8) @@ -263,6 +268,7 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_REPLY_POST_HOST_INDEX_MASK (0x00FFFFFF) #define MPI2_RPHI_MSIX_INDEX_MASK (0xFF000000) #define MPI2_RPHI_MSIX_INDEX_SHIFT (24) +#define MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET (0x0000030C) /* MPI v2.5 only */ /* * Defines for the HCBSize and address |