diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-06-09 14:06:58 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 07:04:51 -0400 |
commit | dd047c8e2bca22856050dbe0378a37cf44eecc97 (patch) | |
tree | 5dab5c46acd144024f8cc961a34ae8374343a5d9 /drivers/scsi/isci/isci.h | |
parent | ac668c69709c7d927015c5cf3d9e87bf4eaaf57d (diff) |
isci: cleanup tag macros
A tag is a 16 bit number where the upper four bits is a sequence number
and the remainder is the task context index (tci). Sanitize the macro
names and shave 256-bytes out of scic_sds_controller by reducing the size of
io_request_sequence.
scic_sds_io_tag_construct --> ISCI_TAG
scic_sds_io_tag_get_sequence --> ISCI_TAG_SEQ
scic_sds_io_tag_get_index() --> ISCI_TAG_TCI
scic_sds_io_sequence_increment() [delete / open code]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/isci.h')
-rw-r--r-- | drivers/scsi/isci/isci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/isci/isci.h b/drivers/scsi/isci/isci.h index 84ba533ca51e..81bade421b96 100644 --- a/drivers/scsi/isci/isci.h +++ b/drivers/scsi/isci/isci.h | |||
@@ -83,6 +83,7 @@ enum sci_controller_mode { | |||
83 | #define SCI_MAX_SMP_PHYS (384) /* not silicon constrained */ | 83 | #define SCI_MAX_SMP_PHYS (384) /* not silicon constrained */ |
84 | #define SCI_MAX_REMOTE_DEVICES (256UL) | 84 | #define SCI_MAX_REMOTE_DEVICES (256UL) |
85 | #define SCI_MAX_IO_REQUESTS (256UL) | 85 | #define SCI_MAX_IO_REQUESTS (256UL) |
86 | #define SCI_MAX_SEQ (16) | ||
86 | #define SCI_MAX_MSIX_MESSAGES (2) | 87 | #define SCI_MAX_MSIX_MESSAGES (2) |
87 | #define SCI_MAX_SCATTER_GATHER_ELEMENTS 130 /* not silicon constrained */ | 88 | #define SCI_MAX_SCATTER_GATHER_ELEMENTS 130 /* not silicon constrained */ |
88 | #define SCI_MAX_CONTROLLERS 2 | 89 | #define SCI_MAX_CONTROLLERS 2 |
@@ -113,6 +114,7 @@ static inline void check_sizes(void) | |||
113 | BUILD_BUG_ON_NOT_POWER_OF_2(SCU_MAX_COMPLETION_QUEUE_ENTRIES); | 114 | BUILD_BUG_ON_NOT_POWER_OF_2(SCU_MAX_COMPLETION_QUEUE_ENTRIES); |
114 | BUILD_BUG_ON(SCU_MAX_UNSOLICITED_FRAMES > SCU_ABSOLUTE_MAX_UNSOLICITED_FRAMES); | 115 | BUILD_BUG_ON(SCU_MAX_UNSOLICITED_FRAMES > SCU_ABSOLUTE_MAX_UNSOLICITED_FRAMES); |
115 | BUILD_BUG_ON_NOT_POWER_OF_2(SCI_MAX_IO_REQUESTS); | 116 | BUILD_BUG_ON_NOT_POWER_OF_2(SCI_MAX_IO_REQUESTS); |
117 | BUILD_BUG_ON_NOT_POWER_OF_2(SCI_MAX_SEQ); | ||
116 | } | 118 | } |
117 | 119 | ||
118 | /** | 120 | /** |