diff options
author | Dave Jiang <dave.jiang@intel.com> | 2011-03-26 20:14:07 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 07:00:36 -0400 |
commit | de728b7d72089330603819a74255a0469780fd0e (patch) | |
tree | c732f6ab8f103752cd62c3aa928dc0f98c3b2852 | |
parent | 2828dc0b55da8937439121eaa82e9ee80c520f53 (diff) |
isci: Remove "screaming" data types
Converting the all CAPS data types to lower case.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
24 files changed, 167 insertions, 174 deletions
diff --git a/drivers/scsi/isci/core/sati_translator_sequence.h b/drivers/scsi/isci/core/sati_translator_sequence.h index 592570d50ebd..915724c380d9 100644 --- a/drivers/scsi/isci/core/sati_translator_sequence.h +++ b/drivers/scsi/isci/core/sati_translator_sequence.h | |||
@@ -67,7 +67,7 @@ | |||
67 | #include "sati_device.h" | 67 | #include "sati_device.h" |
68 | 68 | ||
69 | /** | 69 | /** |
70 | * enum _SATI_TRANSLATOR_SEQUENCE_TYPE - This enumeration defines the possible | 70 | * enum _sati_translator_sequence_type - This enumeration defines the possible |
71 | * sequence types for the translator. | 71 | * sequence types for the translator. |
72 | * | 72 | * |
73 | * | 73 | * |
@@ -172,7 +172,7 @@ enum sati_translator_sequence_type { | |||
172 | * | 172 | * |
173 | * | 173 | * |
174 | */ | 174 | */ |
175 | typedef struct SATI_MODE_SELECT_PROCESSING_STATE { | 175 | struct sati_mode_select_processing_state { |
176 | u8 *mode_pages; | 176 | u8 *mode_pages; |
177 | u32 mode_page_offset; | 177 | u32 mode_page_offset; |
178 | u32 mode_pages_size; | 178 | u32 mode_pages_size; |
@@ -180,11 +180,10 @@ typedef struct SATI_MODE_SELECT_PROCESSING_STATE { | |||
180 | u32 total_ata_command_sent; | 180 | u32 total_ata_command_sent; |
181 | u32 ata_command_sent_for_cmp; /* cmp: current mode page */ | 181 | u32 ata_command_sent_for_cmp; /* cmp: current mode page */ |
182 | bool current_mode_page_processed; | 182 | bool current_mode_page_processed; |
183 | 183 | }; | |
184 | } SATI_MODE_SELECT_PROCESSING_STATE_T; | ||
185 | 184 | ||
186 | 185 | ||
187 | enum SATI_REASSIGN_BLOCKS_ATA_COMMAND_STATUS { | 186 | enum sati_reassign_blocks_ata_command_status { |
188 | SATI_REASSIGN_BLOCKS_READY_TO_SEND, | 187 | SATI_REASSIGN_BLOCKS_READY_TO_SEND, |
189 | SATI_REASSIGN_BLOCKS_COMMAND_FAIL, | 188 | SATI_REASSIGN_BLOCKS_COMMAND_FAIL, |
190 | SATI_REASSIGN_BLOCKS_COMMAND_SUCCESS, | 189 | SATI_REASSIGN_BLOCKS_COMMAND_SUCCESS, |
@@ -204,7 +203,7 @@ struct sati_reassign_blocks_processing_state { | |||
204 | u32 size_of_data_processed; | 203 | u32 size_of_data_processed; |
205 | u32 ata_command_sent_for_current_lba; | 204 | u32 ata_command_sent_for_current_lba; |
206 | bool current_lba_processed; | 205 | bool current_lba_processed; |
207 | enum SATI_REASSIGN_BLOCKS_ATA_COMMAND_STATUS ata_command_status; | 206 | enum sati_reassign_blocks_ata_command_status ata_command_status; |
208 | 207 | ||
209 | }; | 208 | }; |
210 | 209 | ||
@@ -291,8 +290,9 @@ struct sati_translator_sequence { | |||
291 | u32 translated_command; | 290 | u32 translated_command; |
292 | u32 move_sector_count; | 291 | u32 move_sector_count; |
293 | u32 scratch; | 292 | u32 scratch; |
294 | struct sati_reassign_blocks_processing_state reassign_blocks_process_state; | 293 | struct sati_reassign_blocks_processing_state |
295 | SATI_MODE_SELECT_PROCESSING_STATE_T process_state; | 294 | reassign_blocks_process_state; |
295 | struct sati_mode_select_processing_state process_state; | ||
296 | struct sati_atapi_data sati_atapi_data; | 296 | struct sati_atapi_data sati_atapi_data; |
297 | } command_specific_data; | 297 | } command_specific_data; |
298 | 298 | ||
diff --git a/drivers/scsi/isci/core/sci_base_port.h b/drivers/scsi/isci/core/sci_base_port.h index b931c3c2cdf9..252d48c1ab65 100644 --- a/drivers/scsi/isci/core/sci_base_port.h +++ b/drivers/scsi/isci/core/sci_base_port.h | |||
@@ -128,19 +128,16 @@ struct sci_base_port { | |||
128 | 128 | ||
129 | struct sci_base_phy; | 129 | struct sci_base_phy; |
130 | 130 | ||
131 | typedef enum sci_status (*SCI_BASE_PORT_HANDLER_T)( | 131 | typedef enum sci_status (*sci_base_port_handler_t) ( |
132 | struct sci_base_port * | 132 | struct sci_base_port *); |
133 | ); | ||
134 | 133 | ||
135 | typedef enum sci_status (*SCI_BASE_PORT_PHY_HANDLER_T)( | 134 | typedef enum sci_status (*sci_base_port_phy_handler_t) ( |
136 | struct sci_base_port *, | 135 | struct sci_base_port *, |
137 | struct sci_base_phy * | 136 | struct sci_base_phy *); |
138 | ); | ||
139 | 137 | ||
140 | typedef enum sci_status (*SCI_BASE_PORT_RESET_HANDLER_T)( | 138 | typedef enum sci_status (*sci_base_port_reset_handler_t) ( |
141 | struct sci_base_port *, | 139 | struct sci_base_port *, |
142 | u32 timeout | 140 | u32 timeout); |
143 | ); | ||
144 | 141 | ||
145 | /** | 142 | /** |
146 | * struct sci_base_port_state_handler - This structure contains all of the | 143 | * struct sci_base_port_state_handler - This structure contains all of the |
@@ -152,40 +149,39 @@ typedef enum sci_status (*SCI_BASE_PORT_RESET_HANDLER_T)( | |||
152 | */ | 149 | */ |
153 | struct sci_base_port_state_handler { | 150 | struct sci_base_port_state_handler { |
154 | /** | 151 | /** |
155 | * The start_handler specifies the method invoked when a user attempts to | 152 | * The start_handler specifies the method invoked when a user |
156 | * start a port. | 153 | * attempts to start a port. |
157 | */ | 154 | */ |
158 | SCI_BASE_PORT_HANDLER_T start_handler; | 155 | sci_base_port_handler_t start_handler; |
159 | 156 | ||
160 | /** | 157 | /** |
161 | * The stop_handler specifies the method invoked when a user attempts to | 158 | * The stop_handler specifies the method invoked when a user |
162 | * stop a port. | 159 | * attempts to stop a port. |
163 | */ | 160 | */ |
164 | SCI_BASE_PORT_HANDLER_T stop_handler; | 161 | sci_base_port_handler_t stop_handler; |
165 | 162 | ||
166 | /** | 163 | /** |
167 | * The destruct_handler specifies the method invoked when attempting to | 164 | * The destruct_handler specifies the method invoked when attempting to |
168 | * destruct a port. | 165 | * destruct a port. |
169 | */ | 166 | */ |
170 | SCI_BASE_PORT_HANDLER_T destruct_handler; | 167 | sci_base_port_handler_t destruct_handler; |
171 | 168 | ||
172 | /** | 169 | /** |
173 | * The reset_handler specifies the method invoked when a user attempts to | 170 | * The reset_handler specifies the method invoked when a user |
174 | * hard reset a port. | 171 | * attempts to hard reset a port. |
175 | */ | 172 | */ |
176 | SCI_BASE_PORT_RESET_HANDLER_T reset_handler; | 173 | sci_base_port_reset_handler_t reset_handler; |
177 | 174 | ||
178 | /** | 175 | /** |
179 | * The add_phy_handler specifies the method invoked when a user attempts to | 176 | * The add_phy_handler specifies the method invoked when a user |
180 | * add another phy into the port. | 177 | * attempts to add another phy into the port. |
181 | */ | 178 | */ |
182 | SCI_BASE_PORT_PHY_HANDLER_T add_phy_handler; | 179 | sci_base_port_phy_handler_t add_phy_handler; |
183 | 180 | ||
184 | /** | 181 | /** |
185 | * The remove_phy_handler specifies the method invoked when a user | 182 | * The remove_phy_handler specifies the method invoked when a user |
186 | * attempts to remove a phy from the port. | 183 | * attempts to remove a phy from the port. |
187 | */ | 184 | */ |
188 | SCI_BASE_PORT_PHY_HANDLER_T remove_phy_handler; | 185 | sci_base_port_phy_handler_t remove_phy_handler; |
189 | |||
190 | }; | 186 | }; |
191 | #endif /* _SCI_BASE_PORT_H_ */ | 187 | #endif /* _SCI_BASE_PORT_H_ */ |
diff --git a/drivers/scsi/isci/core/sci_base_request.h b/drivers/scsi/isci/core/sci_base_request.h index d1b2195b228a..223aa4c5f757 100644 --- a/drivers/scsi/isci/core/sci_base_request.h +++ b/drivers/scsi/isci/core/sci_base_request.h | |||
@@ -129,7 +129,7 @@ struct sci_base_request { | |||
129 | struct sci_base_state_machine state_machine; | 129 | struct sci_base_state_machine state_machine; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | typedef enum sci_status (*SCI_BASE_REQUEST_HANDLER_T)( | 132 | typedef enum sci_status (*sci_base_request_handler_t)( |
133 | struct sci_base_request *this_request | 133 | struct sci_base_request *this_request |
134 | ); | 134 | ); |
135 | 135 | ||
@@ -146,25 +146,25 @@ struct sci_base_request_state_handler { | |||
146 | * The start_handler specifies the method invoked when a user attempts to | 146 | * The start_handler specifies the method invoked when a user attempts to |
147 | * start a request. | 147 | * start a request. |
148 | */ | 148 | */ |
149 | SCI_BASE_REQUEST_HANDLER_T start_handler; | 149 | sci_base_request_handler_t start_handler; |
150 | 150 | ||
151 | /** | 151 | /** |
152 | * The abort_handler specifies the method invoked when a user attempts to | 152 | * The abort_handler specifies the method invoked when a user attempts to |
153 | * abort a request. | 153 | * abort a request. |
154 | */ | 154 | */ |
155 | SCI_BASE_REQUEST_HANDLER_T abort_handler; | 155 | sci_base_request_handler_t abort_handler; |
156 | 156 | ||
157 | /** | 157 | /** |
158 | * The complete_handler specifies the method invoked when a user attempts to | 158 | * The complete_handler specifies the method invoked when a user attempts to |
159 | * complete a request. | 159 | * complete a request. |
160 | */ | 160 | */ |
161 | SCI_BASE_REQUEST_HANDLER_T complete_handler; | 161 | sci_base_request_handler_t complete_handler; |
162 | 162 | ||
163 | /** | 163 | /** |
164 | * The destruct_handler specifies the method invoked when a user attempts to | 164 | * The destruct_handler specifies the method invoked when a user attempts to |
165 | * destruct a request. | 165 | * destruct a request. |
166 | */ | 166 | */ |
167 | SCI_BASE_REQUEST_HANDLER_T destruct_handler; | 167 | sci_base_request_handler_t destruct_handler; |
168 | 168 | ||
169 | }; | 169 | }; |
170 | 170 | ||
diff --git a/drivers/scsi/isci/core/sci_base_state.h b/drivers/scsi/isci/core/sci_base_state.h index d6b9c1a951b1..4272a6f116de 100644 --- a/drivers/scsi/isci/core/sci_base_state.h +++ b/drivers/scsi/isci/core/sci_base_state.h | |||
@@ -58,11 +58,11 @@ | |||
58 | 58 | ||
59 | #include "sci_object.h" | 59 | #include "sci_object.h" |
60 | 60 | ||
61 | typedef void (*SCI_BASE_STATE_HANDLER_T)( | 61 | typedef void (*sci_base_state_handler_t)( |
62 | void | 62 | void |
63 | ); | 63 | ); |
64 | 64 | ||
65 | typedef void (*SCI_STATE_TRANSITION_T)( | 65 | typedef void (*sci_state_transition_t)( |
66 | struct sci_base_object *base_object | 66 | struct sci_base_object *base_object |
67 | ); | 67 | ); |
68 | 68 | ||
@@ -77,13 +77,13 @@ struct sci_base_state { | |||
77 | * This field is a function pointer that defines the method to be | 77 | * This field is a function pointer that defines the method to be |
78 | * invoked when the state is entered. | 78 | * invoked when the state is entered. |
79 | */ | 79 | */ |
80 | SCI_STATE_TRANSITION_T enter_state; | 80 | sci_state_transition_t enter_state; |
81 | 81 | ||
82 | /** | 82 | /** |
83 | * This field is a function pointer that defines the method to be | 83 | * This field is a function pointer that defines the method to be |
84 | * invoked when the state is exited. | 84 | * invoked when the state is exited. |
85 | */ | 85 | */ |
86 | SCI_STATE_TRANSITION_T exit_state; | 86 | sci_state_transition_t exit_state; |
87 | 87 | ||
88 | }; | 88 | }; |
89 | 89 | ||
diff --git a/drivers/scsi/isci/core/sci_base_state_machine.c b/drivers/scsi/isci/core/sci_base_state_machine.c index 5b1e8da55fe6..bc416d504d7e 100644 --- a/drivers/scsi/isci/core/sci_base_state_machine.c +++ b/drivers/scsi/isci/core/sci_base_state_machine.c | |||
@@ -65,7 +65,7 @@ | |||
65 | static void sci_state_machine_exit_state(struct sci_base_state_machine *sm) | 65 | static void sci_state_machine_exit_state(struct sci_base_state_machine *sm) |
66 | { | 66 | { |
67 | u32 state = sm->current_state_id; | 67 | u32 state = sm->current_state_id; |
68 | SCI_STATE_TRANSITION_T exit = sm->state_table[state].exit_state; | 68 | sci_state_transition_t exit = sm->state_table[state].exit_state; |
69 | 69 | ||
70 | if (exit) | 70 | if (exit) |
71 | exit(sm->state_machine_owner); | 71 | exit(sm->state_machine_owner); |
@@ -74,7 +74,7 @@ static void sci_state_machine_exit_state(struct sci_base_state_machine *sm) | |||
74 | static void sci_state_machine_enter_state(struct sci_base_state_machine *sm) | 74 | static void sci_state_machine_enter_state(struct sci_base_state_machine *sm) |
75 | { | 75 | { |
76 | u32 state = sm->current_state_id; | 76 | u32 state = sm->current_state_id; |
77 | SCI_STATE_TRANSITION_T enter = sm->state_table[state].enter_state; | 77 | sci_state_transition_t enter = sm->state_table[state].enter_state; |
78 | 78 | ||
79 | if (enter) | 79 | if (enter) |
80 | enter(sm->state_machine_owner); | 80 | enter(sm->state_machine_owner); |
diff --git a/drivers/scsi/isci/core/sci_status.h b/drivers/scsi/isci/core/sci_status.h index 72b61081c28d..8b66619022cf 100644 --- a/drivers/scsi/isci/core/sci_status.h +++ b/drivers/scsi/isci/core/sci_status.h | |||
@@ -65,7 +65,7 @@ | |||
65 | 65 | ||
66 | 66 | ||
67 | /** | 67 | /** |
68 | * enum _SCI_STATUS - This is the general return status enumeration for non-IO, | 68 | * enum sci_status - This is the general return status enumeration for non-IO, |
69 | * non-task management related SCI interface methods. | 69 | * non-task management related SCI interface methods. |
70 | * | 70 | * |
71 | * | 71 | * |
@@ -347,7 +347,7 @@ enum sci_status { | |||
347 | }; | 347 | }; |
348 | 348 | ||
349 | /** | 349 | /** |
350 | * enum _SCI_IO_STATUS - This enumeration depicts all of the possible IO | 350 | * enum sci_io_status - This enumeration depicts all of the possible IO |
351 | * completion status values. Each value in this enumeration maps directly | 351 | * completion status values. Each value in this enumeration maps directly |
352 | * to a value in the enum sci_status enumeration. Please refer to that | 352 | * to a value in the enum sci_status enumeration. Please refer to that |
353 | * enumeration for detailed comments concerning what the status represents. | 353 | * enumeration for detailed comments concerning what the status represents. |
@@ -380,7 +380,7 @@ enum sci_io_status { | |||
380 | }; | 380 | }; |
381 | 381 | ||
382 | /** | 382 | /** |
383 | * enum _SCI_TASK_STATUS - This enumeration depicts all of the possible task | 383 | * enum sci_task_status - This enumeration depicts all of the possible task |
384 | * completion status values. Each value in this enumeration maps directly | 384 | * completion status values. Each value in this enumeration maps directly |
385 | * to a value in the enum sci_status enumeration. Please refer to that | 385 | * to a value in the enum sci_status enumeration. Please refer to that |
386 | * enumeration for detailed comments concerning what the status represents. | 386 | * enumeration for detailed comments concerning what the status represents. |
diff --git a/drivers/scsi/isci/core/scic_port.h b/drivers/scsi/isci/core/scic_port.h index 582953343237..56d05073f9c5 100644 --- a/drivers/scsi/isci/core/scic_port.h +++ b/drivers/scsi/isci/core/scic_port.h | |||
@@ -61,7 +61,7 @@ | |||
61 | 61 | ||
62 | struct scic_sds_port; | 62 | struct scic_sds_port; |
63 | 63 | ||
64 | enum SCIC_PORT_NOT_READY_REASON_CODE { | 64 | enum scic_port_not_ready_reason_code { |
65 | SCIC_PORT_NOT_READY_NO_ACTIVE_PHYS, | 65 | SCIC_PORT_NOT_READY_NO_ACTIVE_PHYS, |
66 | SCIC_PORT_NOT_READY_HARD_RESET_REQUESTED, | 66 | SCIC_PORT_NOT_READY_HARD_RESET_REQUESTED, |
67 | SCIC_PORT_NOT_READY_INVALID_PORT_CONFIGURATION, | 67 | SCIC_PORT_NOT_READY_INVALID_PORT_CONFIGURATION, |
diff --git a/drivers/scsi/isci/core/scic_sds_controller.c b/drivers/scsi/isci/core/scic_sds_controller.c index f20d0eb9bda6..9266fbee79e7 100644 --- a/drivers/scsi/isci/core/scic_sds_controller.c +++ b/drivers/scsi/isci/core/scic_sds_controller.c | |||
@@ -705,7 +705,7 @@ static enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller | |||
705 | 705 | ||
706 | for (index = 0; index < scic->logical_port_entries; index++) { | 706 | for (index = 0; index < scic->logical_port_entries; index++) { |
707 | struct scic_sds_port *sci_port = &scic->port_table[index]; | 707 | struct scic_sds_port *sci_port = &scic->port_table[index]; |
708 | SCI_BASE_PORT_HANDLER_T stop; | 708 | sci_base_port_handler_t stop; |
709 | 709 | ||
710 | stop = sci_port->state_handlers->parent.stop_handler; | 710 | stop = sci_port->state_handlers->parent.stop_handler; |
711 | port_status = stop(&sci_port->parent); | 711 | port_status = stop(&sci_port->parent); |
diff --git a/drivers/scsi/isci/core/scic_sds_controller.h b/drivers/scsi/isci/core/scic_sds_controller.h index 22b5f2c24a02..fd78148d93d9 100644 --- a/drivers/scsi/isci/core/scic_sds_controller.h +++ b/drivers/scsi/isci/core/scic_sds_controller.h | |||
@@ -90,12 +90,12 @@ struct scic_sds_controller; | |||
90 | #define SCU_COMPLETION_RAM_ALIGNMENT (64) | 90 | #define SCU_COMPLETION_RAM_ALIGNMENT (64) |
91 | 91 | ||
92 | /** | 92 | /** |
93 | * enum SCIC_SDS_CONTROLLER_MEMORY_DESCRIPTORS - | 93 | * enum scic_sds_controller_memory_descriptors - |
94 | * | 94 | * |
95 | * This enumeration depects the types of MDEs that are going to be created for | 95 | * This enumeration depects the types of MDEs that are going to be created for |
96 | * the controller object. | 96 | * the controller object. |
97 | */ | 97 | */ |
98 | enum SCIC_SDS_CONTROLLER_MEMORY_DESCRIPTORS { | 98 | enum scic_sds_controller_memory_descriptors { |
99 | /** | 99 | /** |
100 | * Completion queue MDE entry | 100 | * Completion queue MDE entry |
101 | */ | 101 | */ |
diff --git a/drivers/scsi/isci/core/scic_sds_phy.h b/drivers/scsi/isci/core/scic_sds_phy.h index 4745a791f15b..7f7a04542031 100644 --- a/drivers/scsi/isci/core/scic_sds_phy.h +++ b/drivers/scsi/isci/core/scic_sds_phy.h | |||
@@ -92,11 +92,11 @@ struct scic_sds_port; | |||
92 | #define SCIC_SDS_SATA_LINK_TRAINING_TIMEOUT 250 | 92 | #define SCIC_SDS_SATA_LINK_TRAINING_TIMEOUT 250 |
93 | 93 | ||
94 | /** | 94 | /** |
95 | * enum SCIC_SDS_PHY_STARTING_SUBSTATES - | 95 | * enum scic_sds_phy_starting_substates - |
96 | * | 96 | * |
97 | * | 97 | * |
98 | */ | 98 | */ |
99 | enum SCIC_SDS_PHY_STARTING_SUBSTATES { | 99 | enum scic_sds_phy_starting_substates { |
100 | /** | 100 | /** |
101 | * Initial state | 101 | * Initial state |
102 | */ | 102 | */ |
@@ -156,7 +156,7 @@ struct scic_sds_controller; | |||
156 | * | 156 | * |
157 | * | 157 | * |
158 | */ | 158 | */ |
159 | enum SCIC_SDS_PHY_PROTOCOL { | 159 | enum scic_sds_phy_protocol { |
160 | /** | 160 | /** |
161 | * This is an unknown phy type since there is either nothing on the other | 161 | * This is an unknown phy type since there is either nothing on the other |
162 | * end or we have not detected the phy type as yet. | 162 | * end or we have not detected the phy type as yet. |
@@ -202,7 +202,7 @@ struct scic_sds_phy { | |||
202 | * field contains a legitamite value once the PHY has link trained with | 202 | * field contains a legitamite value once the PHY has link trained with |
203 | * a remote phy. | 203 | * a remote phy. |
204 | */ | 204 | */ |
205 | enum SCIC_SDS_PHY_PROTOCOL protocol; | 205 | enum scic_sds_phy_protocol protocol; |
206 | 206 | ||
207 | /** | 207 | /** |
208 | * This field specifies the index with which this phy is associated (0-3). | 208 | * This field specifies the index with which this phy is associated (0-3). |
diff --git a/drivers/scsi/isci/core/scic_sds_port.c b/drivers/scsi/isci/core/scic_sds_port.c index 0a95f649c04f..88b892de5de4 100644 --- a/drivers/scsi/isci/core/scic_sds_port.c +++ b/drivers/scsi/isci/core/scic_sds_port.c | |||
@@ -620,15 +620,12 @@ enum sci_status scic_port_get_properties( | |||
620 | } | 620 | } |
621 | 621 | ||
622 | /** | 622 | /** |
623 | * scic_port_hard_reset() - This method will request the SCI implementation to | 623 | * scic_port_hard_reset() - perform port hard reset |
624 | * perform a HARD RESET on the SAS Port. If/When the HARD RESET completes | ||
625 | * the SCI user will be notified via an SCI OS callback indicating a direct | ||
626 | * attached device was found. | ||
627 | * @port: a handle corresponding to the SAS port to be hard reset. | 624 | * @port: a handle corresponding to the SAS port to be hard reset. |
628 | * @reset_timeout: This parameter specifies the number of milliseconds in which | 625 | * @reset_timeout: This parameter specifies the number of milliseconds in which |
629 | * the port reset operation should complete. | 626 | * the port reset operation should complete. |
630 | * | 627 | * |
631 | * The SCI User callback in SCIC_USER_CALLBACKS_T will only be called once for | 628 | * The SCI User callback in scic_user_callbacks_t will only be called once for |
632 | * each phy in the SAS Port at completion of the hard reset sequence. Return a | 629 | * each phy in the SAS Port at completion of the hard reset sequence. Return a |
633 | * status indicating whether the hard reset started successfully. SCI_SUCCESS | 630 | * status indicating whether the hard reset started successfully. SCI_SUCCESS |
634 | * This value is returned if the hard reset operation started successfully. | 631 | * This value is returned if the hard reset operation started successfully. |
diff --git a/drivers/scsi/isci/core/scic_sds_port.h b/drivers/scsi/isci/core/scic_sds_port.h index 8167f5e3be3d..a5aa9e102242 100644 --- a/drivers/scsi/isci/core/scic_sds_port.h +++ b/drivers/scsi/isci/core/scic_sds_port.h | |||
@@ -84,21 +84,23 @@ | |||
84 | * This enumeration depicts all of the states for the core port ready substate | 84 | * This enumeration depicts all of the states for the core port ready substate |
85 | * machine. | 85 | * machine. |
86 | */ | 86 | */ |
87 | enum SCIC_SDS_PORT_READY_SUBSTATES { | 87 | enum scic_sds_port_ready_substates { |
88 | /** | 88 | /** |
89 | * The substate where the port is started and ready but has no active phys. | 89 | * The substate where the port is started and ready but has no |
90 | * active phys. | ||
90 | */ | 91 | */ |
91 | SCIC_SDS_PORT_READY_SUBSTATE_WAITING, | 92 | SCIC_SDS_PORT_READY_SUBSTATE_WAITING, |
92 | 93 | ||
93 | /** | 94 | /** |
94 | * The substate where the port is started and ready and there is at least one | 95 | * The substate where the port is started and ready and there is |
95 | * phy operational. | 96 | * at least one phy operational. |
96 | */ | 97 | */ |
97 | SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL, | 98 | SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL, |
98 | 99 | ||
99 | /** | 100 | /** |
100 | * The substate where the port is started and there was an add/remove phy | 101 | * The substate where the port is started and there was an |
101 | * event. This state is only used in Automatic Port Configuration Mode (APC) | 102 | * add/remove phy event. This state is only used in Automatic |
103 | * Port Configuration Mode (APC) | ||
102 | */ | 104 | */ |
103 | SCIC_SDS_PORT_READY_SUBSTATE_CONFIGURING, | 105 | SCIC_SDS_PORT_READY_SUBSTATE_CONFIGURING, |
104 | 106 | ||
@@ -122,9 +124,9 @@ struct scic_sds_port { | |||
122 | struct sci_base_port parent; | 124 | struct sci_base_port parent; |
123 | 125 | ||
124 | /** | 126 | /** |
125 | * This field is the port index that is reported to the SCI USER. This allows | 127 | * This field is the port index that is reported to the SCI USER. |
126 | * the actual hardware physical port to change without the SCI USER getting a | 128 | * This allows the actual hardware physical port to change without |
127 | * different answer for the get port index. | 129 | * the SCI USER getting a different answer for the get port index. |
128 | */ | 130 | */ |
129 | u8 logical_port_index; | 131 | u8 logical_port_index; |
130 | 132 | ||
@@ -134,9 +136,9 @@ struct scic_sds_port { | |||
134 | u8 physical_port_index; | 136 | u8 physical_port_index; |
135 | 137 | ||
136 | /** | 138 | /** |
137 | * This field contains the active phy mask for the port. This mask is used in | 139 | * This field contains the active phy mask for the port. |
138 | * conjunction with the phy state to determine which phy to select for some | 140 | * This mask is used in conjunction with the phy state to determine |
139 | * port operations. | 141 | * which phy to select for some port operations. |
140 | */ | 142 | */ |
141 | u8 active_phy_mask; | 143 | u8 active_phy_mask; |
142 | 144 | ||
@@ -150,8 +152,8 @@ struct scic_sds_port { | |||
150 | u32 started_request_count; | 152 | u32 started_request_count; |
151 | 153 | ||
152 | /** | 154 | /** |
153 | * This field contains the number of devices assigned to this port. It is | 155 | * This field contains the number of devices assigned to this port. |
154 | * used to control port start requests. | 156 | * It is used to control port start requests. |
155 | */ | 157 | */ |
156 | u32 assigned_device_count; | 158 | u32 assigned_device_count; |
157 | 159 | ||
@@ -167,7 +169,8 @@ struct scic_sds_port { | |||
167 | struct scic_sds_phy *phy_table[SCI_MAX_PHYS]; | 169 | struct scic_sds_phy *phy_table[SCI_MAX_PHYS]; |
168 | 170 | ||
169 | /** | 171 | /** |
170 | * This field is a pointer back to the controller that owns this port object. | 172 | * This field is a pointer back to the controller that owns this |
173 | * port object. | ||
171 | */ | 174 | */ |
172 | struct scic_sds_controller *owning_controller; | 175 | struct scic_sds_controller *owning_controller; |
173 | 176 | ||
@@ -178,8 +181,8 @@ struct scic_sds_port { | |||
178 | 181 | ||
179 | /** | 182 | /** |
180 | * This field points to the current set of state handlers for this port | 183 | * This field points to the current set of state handlers for this port |
181 | * object. These state handlers are assigned at each enter state of the state | 184 | * object. These state handlers are assigned at each enter state of |
182 | * machine. | 185 | * the state machine. |
183 | */ | 186 | */ |
184 | struct scic_sds_port_state_handler *state_handlers; | 187 | struct scic_sds_port_state_handler *state_handlers; |
185 | 188 | ||
@@ -191,17 +194,18 @@ struct scic_sds_port { | |||
191 | /* / Memory mapped hardware register space */ | 194 | /* / Memory mapped hardware register space */ |
192 | 195 | ||
193 | /** | 196 | /** |
194 | * This field is the pointer to the port task scheduler registers for the SCU | 197 | * This field is the pointer to the port task scheduler registers |
195 | * hardware. | 198 | * for the SCU hardware. |
196 | */ | 199 | */ |
197 | struct scu_port_task_scheduler_registers __iomem *port_task_scheduler_registers; | 200 | struct scu_port_task_scheduler_registers __iomem |
201 | *port_task_scheduler_registers; | ||
198 | 202 | ||
199 | /** | 203 | /** |
200 | * This field is identical for all port objects and points to the port task | 204 | * This field is identical for all port objects and points to the port |
201 | * scheduler group PE configuration registers. It is used to assign PEs to a | 205 | * task scheduler group PE configuration registers. |
202 | * port. | 206 | * It is used to assign PEs to a port. |
203 | */ | 207 | */ |
204 | SCU_PORT_PE_CONFIGURATION_REGISTER_T *port_pe_configuration_register; | 208 | u32 *port_pe_configuration_register; |
205 | 209 | ||
206 | /** | 210 | /** |
207 | * This field is the VIIT register space for ths port object. | 211 | * This field is the VIIT register space for ths port object. |
@@ -211,13 +215,13 @@ struct scic_sds_port { | |||
211 | }; | 215 | }; |
212 | 216 | ||
213 | 217 | ||
214 | typedef enum sci_status (*SCIC_SDS_PORT_EVENT_HANDLER_T)(struct scic_sds_port *, u32); | 218 | typedef enum sci_status (*scic_sds_port_event_handler_t)(struct scic_sds_port *, u32); |
215 | 219 | ||
216 | typedef enum sci_status (*SCIC_SDS_PORT_FRAME_HANDLER_T)(struct scic_sds_port *, u32); | 220 | typedef enum sci_status (*scic_sds_port_frame_handler_t)(struct scic_sds_port *, u32); |
217 | 221 | ||
218 | typedef void (*SCIC_SDS_PORT_LINK_HANDLER_T)(struct scic_sds_port *, struct scic_sds_phy *); | 222 | typedef void (*scic_sds_port_link_handler_t)(struct scic_sds_port *, struct scic_sds_phy *); |
219 | 223 | ||
220 | typedef enum sci_status (*SCIC_SDS_PORT_IO_REQUEST_HANDLER_T)( | 224 | typedef enum sci_status (*scic_sds_port_io_request_handler_t)( |
221 | struct scic_sds_port *, | 225 | struct scic_sds_port *, |
222 | struct scic_sds_remote_device *, | 226 | struct scic_sds_remote_device *, |
223 | struct scic_sds_request *); | 227 | struct scic_sds_request *); |
@@ -225,14 +229,14 @@ typedef enum sci_status (*SCIC_SDS_PORT_IO_REQUEST_HANDLER_T)( | |||
225 | struct scic_sds_port_state_handler { | 229 | struct scic_sds_port_state_handler { |
226 | struct sci_base_port_state_handler parent; | 230 | struct sci_base_port_state_handler parent; |
227 | 231 | ||
228 | SCIC_SDS_PORT_FRAME_HANDLER_T frame_handler; | 232 | scic_sds_port_frame_handler_t frame_handler; |
229 | SCIC_SDS_PORT_EVENT_HANDLER_T event_handler; | 233 | scic_sds_port_event_handler_t event_handler; |
230 | 234 | ||
231 | SCIC_SDS_PORT_LINK_HANDLER_T link_up_handler; | 235 | scic_sds_port_link_handler_t link_up_handler; |
232 | SCIC_SDS_PORT_LINK_HANDLER_T link_down_handler; | 236 | scic_sds_port_link_handler_t link_down_handler; |
233 | 237 | ||
234 | SCIC_SDS_PORT_IO_REQUEST_HANDLER_T start_io_handler; | 238 | scic_sds_port_io_request_handler_t start_io_handler; |
235 | SCIC_SDS_PORT_IO_REQUEST_HANDLER_T complete_io_handler; | 239 | scic_sds_port_io_request_handler_t complete_io_handler; |
236 | 240 | ||
237 | }; | 241 | }; |
238 | 242 | ||
diff --git a/drivers/scsi/isci/core/scic_sds_port_configuration_agent.c b/drivers/scsi/isci/core/scic_sds_port_configuration_agent.c index d2d3f5293b2c..22703b372c64 100644 --- a/drivers/scsi/isci/core/scic_sds_port_configuration_agent.c +++ b/drivers/scsi/isci/core/scic_sds_port_configuration_agent.c | |||
@@ -820,7 +820,7 @@ enum sci_status scic_sds_port_configuration_agent_initialize( | |||
820 | struct scic_sds_port_configuration_agent *port_agent) | 820 | struct scic_sds_port_configuration_agent *port_agent) |
821 | { | 821 | { |
822 | enum sci_status status = SCI_SUCCESS; | 822 | enum sci_status status = SCI_SUCCESS; |
823 | enum SCIC_PORT_CONFIGURATION_MODE mode; | 823 | enum scic_port_configuration_mode mode; |
824 | struct isci_host *ihost = sci_object_get_association(scic); | 824 | struct isci_host *ihost = sci_object_get_association(scic); |
825 | 825 | ||
826 | mode = scic->oem_parameters.sds1.controller.mode_type; | 826 | mode = scic->oem_parameters.sds1.controller.mode_type; |
diff --git a/drivers/scsi/isci/core/scic_sds_port_configuration_agent.h b/drivers/scsi/isci/core/scic_sds_port_configuration_agent.h index 4146735ffc32..56a40a712589 100644 --- a/drivers/scsi/isci/core/scic_sds_port_configuration_agent.h +++ b/drivers/scsi/isci/core/scic_sds_port_configuration_agent.h | |||
@@ -71,7 +71,7 @@ struct scic_sds_port_configuration_agent; | |||
71 | struct scic_sds_port; | 71 | struct scic_sds_port; |
72 | struct scic_sds_phy; | 72 | struct scic_sds_phy; |
73 | 73 | ||
74 | typedef void (*SCIC_SDS_PORT_CONFIGURATION_AGENT_PHY_HANDLER_T)( | 74 | typedef void (*scic_sds_port_configuration_agent_phy_handler_t)( |
75 | struct scic_sds_controller *, | 75 | struct scic_sds_controller *, |
76 | struct scic_sds_port_configuration_agent *, | 76 | struct scic_sds_port_configuration_agent *, |
77 | struct scic_sds_port *, | 77 | struct scic_sds_port *, |
@@ -91,8 +91,8 @@ struct scic_sds_port_configuration_agent { | |||
91 | 91 | ||
92 | bool timer_pending; | 92 | bool timer_pending; |
93 | 93 | ||
94 | SCIC_SDS_PORT_CONFIGURATION_AGENT_PHY_HANDLER_T link_up_handler; | 94 | scic_sds_port_configuration_agent_phy_handler_t link_up_handler; |
95 | SCIC_SDS_PORT_CONFIGURATION_AGENT_PHY_HANDLER_T link_down_handler; | 95 | scic_sds_port_configuration_agent_phy_handler_t link_down_handler; |
96 | 96 | ||
97 | void *timer; | 97 | void *timer; |
98 | 98 | ||
diff --git a/drivers/scsi/isci/core/scic_sds_remote_node_context.h b/drivers/scsi/isci/core/scic_sds_remote_node_context.h index eccad55ea571..e21abe2c6523 100644 --- a/drivers/scsi/isci/core/scic_sds_remote_node_context.h +++ b/drivers/scsi/isci/core/scic_sds_remote_node_context.h | |||
@@ -213,7 +213,7 @@ enum scis_sds_remote_node_context_states { | |||
213 | * This enumeration is used to define the end destination state for the remote | 213 | * This enumeration is used to define the end destination state for the remote |
214 | * node context. | 214 | * node context. |
215 | */ | 215 | */ |
216 | enum SCIC_SDS_REMOTE_NODE_CONTEXT_DESTINATION_STATE { | 216 | enum scic_sds_remote_node_context_destination_state { |
217 | SCIC_SDS_REMOTE_NODE_DESTINATION_STATE_UNSPECIFIED, | 217 | SCIC_SDS_REMOTE_NODE_DESTINATION_STATE_UNSPECIFIED, |
218 | SCIC_SDS_REMOTE_NODE_DESTINATION_STATE_READY, | 218 | SCIC_SDS_REMOTE_NODE_DESTINATION_STATE_READY, |
219 | SCIC_SDS_REMOTE_NODE_DESTINATION_STATE_FINAL | 219 | SCIC_SDS_REMOTE_NODE_DESTINATION_STATE_FINAL |
@@ -257,7 +257,7 @@ struct scic_sds_remote_node_context { | |||
257 | * state. This can cause an automatic resume on receiving a suspension | 257 | * state. This can cause an automatic resume on receiving a suspension |
258 | * notification. | 258 | * notification. |
259 | */ | 259 | */ |
260 | enum SCIC_SDS_REMOTE_NODE_CONTEXT_DESTINATION_STATE destination_state; | 260 | enum scic_sds_remote_node_context_destination_state destination_state; |
261 | 261 | ||
262 | /** | 262 | /** |
263 | * This field contains the callback function that the user requested to be | 263 | * This field contains the callback function that the user requested to be |
diff --git a/drivers/scsi/isci/core/scic_sds_request.h b/drivers/scsi/isci/core/scic_sds_request.h index c54d8ef79ed8..286b74943d68 100644 --- a/drivers/scsi/isci/core/scic_sds_request.h +++ b/drivers/scsi/isci/core/scic_sds_request.h | |||
@@ -74,7 +74,7 @@ struct scic_sds_remote_device; | |||
74 | struct scic_sds_io_request_state_handler; | 74 | struct scic_sds_io_request_state_handler; |
75 | 75 | ||
76 | /** | 76 | /** |
77 | * enum _SCIC_SDS_IO_REQUEST_STARTED_TASK_MGMT_SUBSTATES - This enumeration | 77 | * enum _scic_sds_io_request_started_task_mgmt_substates - This enumeration |
78 | * depicts all of the substates for a task management request to be | 78 | * depicts all of the substates for a task management request to be |
79 | * performed in the STARTED super-state. | 79 | * performed in the STARTED super-state. |
80 | * | 80 | * |
@@ -98,7 +98,7 @@ enum scic_sds_raw_request_started_task_mgmt_substates { | |||
98 | 98 | ||
99 | 99 | ||
100 | /** | 100 | /** |
101 | * enum _SCIC_SDS_SMP_REQUEST_STARTED_SUBSTATES - This enumeration depicts all | 101 | * enum _scic_sds_smp_request_started_substates - This enumeration depicts all |
102 | * of the substates for a SMP request to be performed in the STARTED | 102 | * of the substates for a SMP request to be performed in the STARTED |
103 | * super-state. | 103 | * super-state. |
104 | * | 104 | * |
@@ -120,7 +120,7 @@ enum scic_sds_smp_request_started_substates { | |||
120 | }; | 120 | }; |
121 | 121 | ||
122 | /** | 122 | /** |
123 | * struct SCIC_SDS_IO_REQUEST - This structure contains or references all of | 123 | * struct scic_sds_request - This structure contains or references all of |
124 | * the data necessary to process a task management or normal IO request. | 124 | * the data necessary to process a task management or normal IO request. |
125 | * | 125 | * |
126 | * | 126 | * |
@@ -328,7 +328,7 @@ extern const struct sci_base_state scic_sds_io_request_started_task_mgmt_substat | |||
328 | * scic_sds_io_request_tc_completion() - | 328 | * scic_sds_io_request_tc_completion() - |
329 | * | 329 | * |
330 | * This macro invokes the core state task completion handler for the | 330 | * This macro invokes the core state task completion handler for the |
331 | * SCIC_SDS_IO_REQUEST_T object. | 331 | * struct scic_sds_io_request object. |
332 | */ | 332 | */ |
333 | #define scic_sds_io_request_tc_completion(this_request, completion_code) \ | 333 | #define scic_sds_io_request_tc_completion(this_request, completion_code) \ |
334 | { \ | 334 | { \ |
diff --git a/drivers/scsi/isci/core/scic_sds_stp_packet_request.c b/drivers/scsi/isci/core/scic_sds_stp_packet_request.c index 97dc9bfa7b9c..9635b37fad16 100644 --- a/drivers/scsi/isci/core/scic_sds_stp_packet_request.c +++ b/drivers/scsi/isci/core/scic_sds_stp_packet_request.c | |||
@@ -146,7 +146,7 @@ void scu_stp_packet_request_command_phase_construct_task_context( | |||
146 | } | 146 | } |
147 | 147 | ||
148 | /* sata header */ | 148 | /* sata header */ |
149 | memset(&(task_context->type.stp), 0, sizeof(struct STP_TASK_CONTEXT)); | 149 | memset(&(task_context->type.stp), 0, sizeof(struct stp_task_context)); |
150 | task_context->type.stp.fis_type = SATA_FIS_TYPE_DATA; | 150 | task_context->type.stp.fis_type = SATA_FIS_TYPE_DATA; |
151 | 151 | ||
152 | /* | 152 | /* |
@@ -213,7 +213,7 @@ void scu_stp_packet_request_command_phase_reconstruct_raw_frame_task_context( | |||
213 | memset(this_request->command_buffer, 0, sizeof(struct sata_fis_reg_h2d)); | 213 | memset(this_request->command_buffer, 0, sizeof(struct sata_fis_reg_h2d)); |
214 | memcpy(((u8 *)this_request->command_buffer + sizeof(u32)), atapi_cdb, atapi_cdb_length); | 214 | memcpy(((u8 *)this_request->command_buffer + sizeof(u32)), atapi_cdb, atapi_cdb_length); |
215 | 215 | ||
216 | memset(&(task_context->type.stp), 0, sizeof(struct STP_TASK_CONTEXT)); | 216 | memset(&(task_context->type.stp), 0, sizeof(struct stp_task_context)); |
217 | task_context->type.stp.fis_type = SATA_FIS_TYPE_DATA; | 217 | task_context->type.stp.fis_type = SATA_FIS_TYPE_DATA; |
218 | 218 | ||
219 | /* | 219 | /* |
diff --git a/drivers/scsi/isci/core/scic_sds_stp_packet_request.h b/drivers/scsi/isci/core/scic_sds_stp_packet_request.h index 2a7aec922dee..eebfff32216b 100644 --- a/drivers/scsi/isci/core/scic_sds_stp_packet_request.h +++ b/drivers/scsi/isci/core/scic_sds_stp_packet_request.h | |||
@@ -70,7 +70,7 @@ | |||
70 | * | 70 | * |
71 | * This is the enumeration of the SATA PIO DATA IN started substate machine. | 71 | * This is the enumeration of the SATA PIO DATA IN started substate machine. |
72 | */ | 72 | */ |
73 | enum _SCIC_SDS_STP_PACKET_REQUEST_STARTED_SUBSTATES { | 73 | enum _scic_sds_stp_packet_request_started_substates { |
74 | /** | 74 | /** |
75 | * While in this state the IO request object is waiting for the TC completion | 75 | * While in this state the IO request object is waiting for the TC completion |
76 | * notification for the H2D Register FIS | 76 | * notification for the H2D Register FIS |
diff --git a/drivers/scsi/isci/core/scic_sds_stp_pio_request.h b/drivers/scsi/isci/core/scic_sds_stp_pio_request.h index d4dc118f2deb..d0ae5909aee2 100644 --- a/drivers/scsi/isci/core/scic_sds_stp_pio_request.h +++ b/drivers/scsi/isci/core/scic_sds_stp_pio_request.h | |||
@@ -72,7 +72,7 @@ | |||
72 | * | 72 | * |
73 | * This is the enumeration of the SATA PIO DATA IN started substate machine. | 73 | * This is the enumeration of the SATA PIO DATA IN started substate machine. |
74 | */ | 74 | */ |
75 | enum _SCIC_SDS_STP_REQUEST_STARTED_PIO_SUBSTATES { | 75 | enum _scic_sds_stp_request_started_pio_substates { |
76 | /** | 76 | /** |
77 | * While in this state the IO request object is waiting for the TC completion | 77 | * While in this state the IO request object is waiting for the TC completion |
78 | * notification for the H2D Register FIS | 78 | * notification for the H2D Register FIS |
diff --git a/drivers/scsi/isci/core/scic_sds_stp_request.h b/drivers/scsi/isci/core/scic_sds_stp_request.h index 107487978f06..cb4d2d626639 100644 --- a/drivers/scsi/isci/core/scic_sds_stp_request.h +++ b/drivers/scsi/isci/core/scic_sds_stp_request.h | |||
@@ -134,36 +134,36 @@ struct scic_sds_stp_request { | |||
134 | }; | 134 | }; |
135 | 135 | ||
136 | /** | 136 | /** |
137 | * enum SCIC_SDS_STP_REQUEST_STARTED_UDMA_SUBSTATES - This enumeration depicts | 137 | * enum scic_sds_stp_request_started_udma_substates - This enumeration depicts |
138 | * the various sub-states associated with a SATA/STP UDMA protocol operation. | 138 | * the various sub-states associated with a SATA/STP UDMA protocol operation. |
139 | * | 139 | * |
140 | * | 140 | * |
141 | */ | 141 | */ |
142 | enum SCIC_SDS_STP_REQUEST_STARTED_UDMA_SUBSTATES { | 142 | enum scic_sds_stp_request_started_udma_substates { |
143 | SCIC_SDS_STP_REQUEST_STARTED_UDMA_AWAIT_TC_COMPLETION_SUBSTATE, | 143 | SCIC_SDS_STP_REQUEST_STARTED_UDMA_AWAIT_TC_COMPLETION_SUBSTATE, |
144 | SCIC_SDS_STP_REQUEST_STARTED_UDMA_AWAIT_D2H_REG_FIS_SUBSTATE, | 144 | SCIC_SDS_STP_REQUEST_STARTED_UDMA_AWAIT_D2H_REG_FIS_SUBSTATE, |
145 | }; | 145 | }; |
146 | 146 | ||
147 | /** | 147 | /** |
148 | * enum SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_SUBSTATES - This enumeration | 148 | * enum scic_sds_stp_request_started_non_data_substates - This enumeration |
149 | * depicts the various sub-states associated with a SATA/STP non-data | 149 | * depicts the various sub-states associated with a SATA/STP non-data |
150 | * protocol operation. | 150 | * protocol operation. |
151 | * | 151 | * |
152 | * | 152 | * |
153 | */ | 153 | */ |
154 | enum SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_SUBSTATES { | 154 | enum scic_sds_stp_request_started_non_data_substates { |
155 | SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_AWAIT_H2D_COMPLETION_SUBSTATE, | 155 | SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_AWAIT_H2D_COMPLETION_SUBSTATE, |
156 | SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_AWAIT_D2H_SUBSTATE, | 156 | SCIC_SDS_STP_REQUEST_STARTED_NON_DATA_AWAIT_D2H_SUBSTATE, |
157 | }; | 157 | }; |
158 | 158 | ||
159 | /** | 159 | /** |
160 | * enum SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_SUBSTATES - THis enumeration | 160 | * enum scic_sds_stp_request_started_soft_reset_substates - THis enumeration |
161 | * depicts the various sub-states associated with a SATA/STP soft reset | 161 | * depicts the various sub-states associated with a SATA/STP soft reset |
162 | * operation. | 162 | * operation. |
163 | * | 163 | * |
164 | * | 164 | * |
165 | */ | 165 | */ |
166 | enum SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_SUBSTATES { | 166 | enum scic_sds_stp_request_started_soft_reset_substates { |
167 | SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_H2D_ASSERTED_COMPLETION_SUBSTATE, | 167 | SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_H2D_ASSERTED_COMPLETION_SUBSTATE, |
168 | SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_H2D_DIAGNOSTIC_COMPLETION_SUBSTATE, | 168 | SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_H2D_DIAGNOSTIC_COMPLETION_SUBSTATE, |
169 | SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_D2H_RESPONSE_FRAME_SUBSTATE, | 169 | SCIC_SDS_STP_REQUEST_STARTED_SOFT_RESET_AWAIT_D2H_RESPONSE_FRAME_SUBSTATE, |
diff --git a/drivers/scsi/isci/core/scic_sds_unsolicited_frame_control.h b/drivers/scsi/isci/core/scic_sds_unsolicited_frame_control.h index 49db83faac37..a0204aa7128a 100644 --- a/drivers/scsi/isci/core/scic_sds_unsolicited_frame_control.h +++ b/drivers/scsi/isci/core/scic_sds_unsolicited_frame_control.h | |||
@@ -69,13 +69,13 @@ | |||
69 | #include "sci_status.h" | 69 | #include "sci_status.h" |
70 | 70 | ||
71 | /** | 71 | /** |
72 | * enum UNSOLICITED_FRAME_STATE - | 72 | * enum unsolicited_frame_state - |
73 | * | 73 | * |
74 | * This enumeration represents the current unsolicited frame state. The | 74 | * This enumeration represents the current unsolicited frame state. The |
75 | * controller object can not updtate the hardware unsolicited frame put pointer | 75 | * controller object can not updtate the hardware unsolicited frame put pointer |
76 | * unless it has already processed the priror unsolicited frames. | 76 | * unless it has already processed the priror unsolicited frames. |
77 | */ | 77 | */ |
78 | enum UNSOLICITED_FRAME_STATE { | 78 | enum unsolicited_frame_state { |
79 | /** | 79 | /** |
80 | * This state is when the frame is empty and not in use. It is | 80 | * This state is when the frame is empty and not in use. It is |
81 | * different from the released state in that the hardware could DMA | 81 | * different from the released state in that the hardware could DMA |
@@ -110,7 +110,7 @@ struct scic_sds_unsolicited_frame { | |||
110 | /** | 110 | /** |
111 | * This field contains the current frame state | 111 | * This field contains the current frame state |
112 | */ | 112 | */ |
113 | enum UNSOLICITED_FRAME_STATE state; | 113 | enum unsolicited_frame_state state; |
114 | 114 | ||
115 | /** | 115 | /** |
116 | * This field points to the frame header data. | 116 | * This field points to the frame header data. |
diff --git a/drivers/scsi/isci/core/scu_registers.h b/drivers/scsi/isci/core/scu_registers.h index 05a141181844..12f2bacc9c09 100644 --- a/drivers/scsi/isci/core/scu_registers.h +++ b/drivers/scsi/isci/core/scu_registers.h | |||
@@ -1423,7 +1423,7 @@ struct scu_sgpio_registers { | |||
1423 | * ***************************************************************************** */ | 1423 | * ***************************************************************************** */ |
1424 | #define SCU_VIIT_BASE 0x1c00 | 1424 | #define SCU_VIIT_BASE 0x1c00 |
1425 | 1425 | ||
1426 | struct SCU_VIIT_REGISTERS { | 1426 | struct scu_viit_registers { |
1427 | u32 registers[256]; | 1427 | u32 registers[256]; |
1428 | }; | 1428 | }; |
1429 | 1429 | ||
@@ -1463,8 +1463,6 @@ struct scu_port_task_scheduler_registers { | |||
1463 | u32 status; | 1463 | u32 status; |
1464 | }; | 1464 | }; |
1465 | 1465 | ||
1466 | typedef u32 SCU_PORT_PE_CONFIGURATION_REGISTER_T; | ||
1467 | |||
1468 | /** | 1466 | /** |
1469 | * struct scu_port_task_scheduler_group_registers - These are the PORT Task | 1467 | * struct scu_port_task_scheduler_group_registers - These are the PORT Task |
1470 | * Scheduler registers | 1468 | * Scheduler registers |
@@ -1495,7 +1493,7 @@ struct scu_port_task_scheduler_group_registers { | |||
1495 | * 0x0034 PCSPE1CR | 1493 | * 0x0034 PCSPE1CR |
1496 | * 0x0038 PCSPE2CR | 1494 | * 0x0038 PCSPE2CR |
1497 | * 0x003C PCSPE3CR */ | 1495 | * 0x003C PCSPE3CR */ |
1498 | SCU_PORT_PE_CONFIGURATION_REGISTER_T protocol_engine[4]; | 1496 | u32 protocol_engine[4]; |
1499 | /* 0x0040 ETMTSCCR */ | 1497 | /* 0x0040 ETMTSCCR */ |
1500 | u32 tc_scanning_interval_control; | 1498 | u32 tc_scanning_interval_control; |
1501 | /* 0x0044 ETMRNSCCR */ | 1499 | /* 0x0044 ETMRNSCCR */ |
@@ -1684,12 +1682,12 @@ struct scu_afe_registers { | |||
1684 | u32 reserved_0c00_0ffc[0x0100]; | 1682 | u32 reserved_0c00_0ffc[0x0100]; |
1685 | }; | 1683 | }; |
1686 | 1684 | ||
1687 | struct SCU_PROTOCOL_ENGINE_GROUP_REGISTERS { | 1685 | struct scu_protocol_engine_group_registers { |
1688 | u32 table[0xE0]; | 1686 | u32 table[0xE0]; |
1689 | }; | 1687 | }; |
1690 | 1688 | ||
1691 | 1689 | ||
1692 | struct SCU_VIIT_IIT { | 1690 | struct scu_viit_iit { |
1693 | u32 table[256]; | 1691 | u32 table[256]; |
1694 | }; | 1692 | }; |
1695 | 1693 | ||
@@ -1699,7 +1697,7 @@ struct SCU_VIIT_IIT { | |||
1699 | * | 1697 | * |
1700 | * | 1698 | * |
1701 | */ | 1699 | */ |
1702 | struct SCU_ZONE_PARTITION_TABLE { | 1700 | struct scu_zone_partition_table { |
1703 | u32 table[2048]; | 1701 | u32 table[2048]; |
1704 | }; | 1702 | }; |
1705 | 1703 | ||
@@ -1709,7 +1707,7 @@ struct SCU_ZONE_PARTITION_TABLE { | |||
1709 | * | 1707 | * |
1710 | * | 1708 | * |
1711 | */ | 1709 | */ |
1712 | struct SCU_COMPLETION_RAM { | 1710 | struct scu_completion_ram { |
1713 | u32 ram[128]; | 1711 | u32 ram[128]; |
1714 | }; | 1712 | }; |
1715 | 1713 | ||
@@ -1719,19 +1717,19 @@ struct SCU_COMPLETION_RAM { | |||
1719 | * | 1717 | * |
1720 | * | 1718 | * |
1721 | */ | 1719 | */ |
1722 | struct SCU_FRAME_BUFFER_RAM { | 1720 | struct scu_frame_buffer_ram { |
1723 | u32 ram[128]; | 1721 | u32 ram[128]; |
1724 | }; | 1722 | }; |
1725 | 1723 | ||
1726 | #define SCU_SCRATCH_RAM_SIZE_IN_DWORDS 256 | 1724 | #define scu_scratch_ram_SIZE_IN_DWORDS 256 |
1727 | 1725 | ||
1728 | /** | 1726 | /** |
1729 | * Placeholder for the scratch RAM registers. | 1727 | * Placeholder for the scratch RAM registers. |
1730 | * | 1728 | * |
1731 | * | 1729 | * |
1732 | */ | 1730 | */ |
1733 | struct SCU_SCRATCH_RAM { | 1731 | struct scu_scratch_ram { |
1734 | u32 ram[SCU_SCRATCH_RAM_SIZE_IN_DWORDS]; | 1732 | u32 ram[scu_scratch_ram_SIZE_IN_DWORDS]; |
1735 | }; | 1733 | }; |
1736 | 1734 | ||
1737 | /** | 1735 | /** |
@@ -1739,7 +1737,7 @@ struct SCU_SCRATCH_RAM { | |||
1739 | * | 1737 | * |
1740 | * | 1738 | * |
1741 | */ | 1739 | */ |
1742 | struct NOA_PROTOCOL_ENGINE_PARTITION { | 1740 | struct noa_protocol_engine_partition { |
1743 | u32 reserved[64]; | 1741 | u32 reserved[64]; |
1744 | }; | 1742 | }; |
1745 | 1743 | ||
@@ -1748,7 +1746,7 @@ struct NOA_PROTOCOL_ENGINE_PARTITION { | |||
1748 | * | 1746 | * |
1749 | * | 1747 | * |
1750 | */ | 1748 | */ |
1751 | struct NOA_HUB_PARTITION { | 1749 | struct noa_hub_partition { |
1752 | u32 reserved[64]; | 1750 | u32 reserved[64]; |
1753 | }; | 1751 | }; |
1754 | 1752 | ||
@@ -1757,38 +1755,38 @@ struct NOA_HUB_PARTITION { | |||
1757 | * | 1755 | * |
1758 | * | 1756 | * |
1759 | */ | 1757 | */ |
1760 | struct NOA_HOST_INTERFACE_PARTITION { | 1758 | struct noa_host_interface_partition { |
1761 | u32 reserved[64]; | 1759 | u32 reserved[64]; |
1762 | }; | 1760 | }; |
1763 | 1761 | ||
1764 | /** | 1762 | /** |
1765 | * struct TRANSPORT_LINK_LAYER_PAIR - The SCU Hardware pairs up the TL | 1763 | * struct transport_link_layer_pair - The SCU Hardware pairs up the TL |
1766 | * registers with the LL registers so we must place them adjcent to make the | 1764 | * registers with the LL registers so we must place them adjcent to make the |
1767 | * array of registers in the PEG. | 1765 | * array of registers in the PEG. |
1768 | * | 1766 | * |
1769 | * | 1767 | * |
1770 | */ | 1768 | */ |
1771 | struct TRANSPORT_LINK_LAYER_PAIR { | 1769 | struct transport_link_layer_pair { |
1772 | struct scu_transport_layer_registers tl; | 1770 | struct scu_transport_layer_registers tl; |
1773 | struct scu_link_layer_registers ll; | 1771 | struct scu_link_layer_registers ll; |
1774 | }; | 1772 | }; |
1775 | 1773 | ||
1776 | /** | 1774 | /** |
1777 | * struct SCU_PEG_REGISTERS - SCU Protocol Engine Memory mapped register space. | 1775 | * struct scu_peg_registers - SCU Protocol Engine Memory mapped register space. |
1778 | * These registers are unique to each protocol engine group. There can be | 1776 | * These registers are unique to each protocol engine group. There can be |
1779 | * at most two PEG for a single SCU part. | 1777 | * at most two PEG for a single SCU part. |
1780 | * | 1778 | * |
1781 | * | 1779 | * |
1782 | */ | 1780 | */ |
1783 | struct SCU_PEG_REGISTERS { | 1781 | struct scu_peg_registers { |
1784 | struct TRANSPORT_LINK_LAYER_PAIR pe[4]; | 1782 | struct transport_link_layer_pair pe[4]; |
1785 | struct scu_port_task_scheduler_group_registers ptsg; | 1783 | struct scu_port_task_scheduler_group_registers ptsg; |
1786 | struct SCU_PROTOCOL_ENGINE_GROUP_REGISTERS peg; | 1784 | struct scu_protocol_engine_group_registers peg; |
1787 | struct scu_sgpio_registers sgpio; | 1785 | struct scu_sgpio_registers sgpio; |
1788 | u32 reserved_01500_1BFF[0x1C0]; | 1786 | u32 reserved_01500_1BFF[0x1C0]; |
1789 | struct scu_viit_entry viit[64]; | 1787 | struct scu_viit_entry viit[64]; |
1790 | struct SCU_ZONE_PARTITION_TABLE zpt0; | 1788 | struct scu_zone_partition_table zpt0; |
1791 | struct SCU_ZONE_PARTITION_TABLE zpt1; | 1789 | struct scu_zone_partition_table zpt1; |
1792 | }; | 1790 | }; |
1793 | 1791 | ||
1794 | /** | 1792 | /** |
@@ -1800,20 +1798,20 @@ struct SCU_PEG_REGISTERS { | |||
1800 | */ | 1798 | */ |
1801 | struct scu_registers { | 1799 | struct scu_registers { |
1802 | /* 0x0000 - PEG 0 */ | 1800 | /* 0x0000 - PEG 0 */ |
1803 | struct SCU_PEG_REGISTERS peg0; | 1801 | struct scu_peg_registers peg0; |
1804 | 1802 | ||
1805 | /* 0x6000 - SDMA and Miscellaneous */ | 1803 | /* 0x6000 - SDMA and Miscellaneous */ |
1806 | struct scu_sdma_registers sdma; | 1804 | struct scu_sdma_registers sdma; |
1807 | struct SCU_COMPLETION_RAM cram; | 1805 | struct scu_completion_ram cram; |
1808 | struct SCU_FRAME_BUFFER_RAM fbram; | 1806 | struct scu_frame_buffer_ram fbram; |
1809 | u32 reserved_6800_69FF[0x80]; | 1807 | u32 reserved_6800_69FF[0x80]; |
1810 | struct NOA_PROTOCOL_ENGINE_PARTITION noa_pe; | 1808 | struct noa_protocol_engine_partition noa_pe; |
1811 | struct NOA_HUB_PARTITION noa_hub; | 1809 | struct noa_hub_partition noa_hub; |
1812 | struct NOA_HOST_INTERFACE_PARTITION noa_if; | 1810 | struct noa_host_interface_partition noa_if; |
1813 | u32 reserved_6d00_7fff[0x4c0]; | 1811 | u32 reserved_6d00_7fff[0x4c0]; |
1814 | 1812 | ||
1815 | /* 0x8000 - PEG 1 */ | 1813 | /* 0x8000 - PEG 1 */ |
1816 | struct SCU_PEG_REGISTERS peg1; | 1814 | struct scu_peg_registers peg1; |
1817 | 1815 | ||
1818 | /* 0xE000 - AFE Registers */ | 1816 | /* 0xE000 - AFE Registers */ |
1819 | struct scu_afe_registers afe; | 1817 | struct scu_afe_registers afe; |
@@ -1822,9 +1820,7 @@ struct scu_registers { | |||
1822 | u32 reserved_f000_211fff[0x80c00]; | 1820 | u32 reserved_f000_211fff[0x80c00]; |
1823 | 1821 | ||
1824 | /* 0x212000 - scratch RAM */ | 1822 | /* 0x212000 - scratch RAM */ |
1825 | struct SCU_SCRATCH_RAM scratch_ram; | 1823 | struct scu_scratch_ram scratch_ram; |
1826 | |||
1827 | }; | 1824 | }; |
1828 | 1825 | ||
1829 | |||
1830 | #endif /* _SCU_REGISTERS_HEADER_ */ | 1826 | #endif /* _SCU_REGISTERS_HEADER_ */ |
diff --git a/drivers/scsi/isci/core/scu_task_context.h b/drivers/scsi/isci/core/scu_task_context.h index 818a575298d3..7df87d923285 100644 --- a/drivers/scsi/isci/core/scu_task_context.h +++ b/drivers/scsi/isci/core/scu_task_context.h | |||
@@ -65,7 +65,7 @@ | |||
65 | 65 | ||
66 | 66 | ||
67 | /** | 67 | /** |
68 | * enum SCU_SSP_TASK_TYPE - This enumberation defines the various SSP task | 68 | * enum scu_ssp_task_type - This enumberation defines the various SSP task |
69 | * types the SCU hardware will accept. The definition for the various task | 69 | * types the SCU hardware will accept. The definition for the various task |
70 | * types the SCU hardware will accept can be found in the DS specification. | 70 | * types the SCU hardware will accept can be found in the DS specification. |
71 | * | 71 | * |
@@ -78,10 +78,10 @@ typedef enum { | |||
78 | SCU_TASK_TYPE_RESPONSE, /* /< Driver generated response frame (targt mode) */ | 78 | SCU_TASK_TYPE_RESPONSE, /* /< Driver generated response frame (targt mode) */ |
79 | SCU_TASK_TYPE_RAW_FRAME, /* /< Raw frame request type */ | 79 | SCU_TASK_TYPE_RAW_FRAME, /* /< Raw frame request type */ |
80 | SCU_TASK_TYPE_PRIMITIVE /* /< Request for a primitive to be transmitted */ | 80 | SCU_TASK_TYPE_PRIMITIVE /* /< Request for a primitive to be transmitted */ |
81 | } SCU_SSP_TASK_TYPE; | 81 | } scu_ssp_task_type; |
82 | 82 | ||
83 | /** | 83 | /** |
84 | * enum SCU_SATA_TASK_TYPE - This enumeration defines the various SATA task | 84 | * enum scu_sata_task_type - This enumeration defines the various SATA task |
85 | * types the SCU hardware will accept. The definition for the various task | 85 | * types the SCU hardware will accept. The definition for the various task |
86 | * types the SCU hardware will accept can be found in the DS specification. | 86 | * types the SCU hardware will accept can be found in the DS specification. |
87 | * | 87 | * |
@@ -99,7 +99,7 @@ typedef enum { | |||
99 | SCU_TASK_TYPE_DMA_OUT, /* /< Write request */ | 99 | SCU_TASK_TYPE_DMA_OUT, /* /< Write request */ |
100 | SCU_TASK_TYPE_FPDMAQ_WRITE, /* /< NCQ write Request */ | 100 | SCU_TASK_TYPE_FPDMAQ_WRITE, /* /< NCQ write Request */ |
101 | SCU_TASK_TYPE_PACKET_DMA_OUT /* /< Packet write request */ | 101 | SCU_TASK_TYPE_PACKET_DMA_OUT /* /< Packet write request */ |
102 | } SCU_SATA_TASK_TYPE; | 102 | } scu_sata_task_type; |
103 | 103 | ||
104 | 104 | ||
105 | /** | 105 | /** |
@@ -290,12 +290,12 @@ typedef enum { | |||
290 | #define SCU_TASK_CONTEXT_PROTOCOL_NONE 0x07 | 290 | #define SCU_TASK_CONTEXT_PROTOCOL_NONE 0x07 |
291 | 291 | ||
292 | /** | 292 | /** |
293 | * struct SSP_TASK_CONTEXT - This is the SCU hardware definition for an SSP | 293 | * struct ssp_task_context - This is the SCU hardware definition for an SSP |
294 | * request. | 294 | * request. |
295 | * | 295 | * |
296 | * | 296 | * |
297 | */ | 297 | */ |
298 | struct SSP_TASK_CONTEXT { | 298 | struct ssp_task_context { |
299 | /* OFFSET 0x18 */ | 299 | /* OFFSET 0x18 */ |
300 | u32 reserved00:24; | 300 | u32 reserved00:24; |
301 | u32 frame_type:8; | 301 | u32 frame_type:8; |
@@ -324,12 +324,12 @@ struct SSP_TASK_CONTEXT { | |||
324 | }; | 324 | }; |
325 | 325 | ||
326 | /** | 326 | /** |
327 | * struct STP_TASK_CONTEXT - This is the SCU hardware definition for an STP | 327 | * struct stp_task_context - This is the SCU hardware definition for an STP |
328 | * request. | 328 | * request. |
329 | * | 329 | * |
330 | * | 330 | * |
331 | */ | 331 | */ |
332 | struct STP_TASK_CONTEXT { | 332 | struct stp_task_context { |
333 | /* OFFSET 0x18 */ | 333 | /* OFFSET 0x18 */ |
334 | u32 fis_type:8; | 334 | u32 fis_type:8; |
335 | u32 pm_port:4; | 335 | u32 pm_port:4; |
@@ -356,12 +356,12 @@ struct STP_TASK_CONTEXT { | |||
356 | }; | 356 | }; |
357 | 357 | ||
358 | /** | 358 | /** |
359 | * struct SMP_TASK_CONTEXT - This is the SCU hardware definition for an SMP | 359 | * struct smp_task_context - This is the SCU hardware definition for an SMP |
360 | * request. | 360 | * request. |
361 | * | 361 | * |
362 | * | 362 | * |
363 | */ | 363 | */ |
364 | struct SMP_TASK_CONTEXT { | 364 | struct smp_task_context { |
365 | /* OFFSET 0x18 */ | 365 | /* OFFSET 0x18 */ |
366 | u32 response_length:8; | 366 | u32 response_length:8; |
367 | u32 function_result:8; | 367 | u32 function_result:8; |
@@ -386,12 +386,12 @@ struct SMP_TASK_CONTEXT { | |||
386 | }; | 386 | }; |
387 | 387 | ||
388 | /** | 388 | /** |
389 | * struct PRIMITIVE_TASK_CONTEXT - This is the SCU hardware definition used | 389 | * struct primitive_task_context - This is the SCU hardware definition used |
390 | * when the driver wants to send a primitive on the link. | 390 | * when the driver wants to send a primitive on the link. |
391 | * | 391 | * |
392 | * | 392 | * |
393 | */ | 393 | */ |
394 | struct PRIMITIVE_TASK_CONTEXT { | 394 | struct primitive_task_context { |
395 | /* OFFSET 0x18 */ | 395 | /* OFFSET 0x18 */ |
396 | /** | 396 | /** |
397 | * This field is the control word and it must be 0. | 397 | * This field is the control word and it must be 0. |
@@ -421,13 +421,13 @@ struct PRIMITIVE_TASK_CONTEXT { | |||
421 | * The union of the protocols that can be selected in the SCU task context | 421 | * The union of the protocols that can be selected in the SCU task context |
422 | * field. | 422 | * field. |
423 | * | 423 | * |
424 | * PROTOCOL_CONTEXT | 424 | * protocol_context |
425 | */ | 425 | */ |
426 | union PROTOCOL_CONTEXT { | 426 | union protocol_context { |
427 | struct SSP_TASK_CONTEXT ssp; | 427 | struct ssp_task_context ssp; |
428 | struct STP_TASK_CONTEXT stp; | 428 | struct stp_task_context stp; |
429 | struct SMP_TASK_CONTEXT smp; | 429 | struct smp_task_context smp; |
430 | struct PRIMITIVE_TASK_CONTEXT primitive; | 430 | struct primitive_task_context primitive; |
431 | u32 words[6]; | 431 | u32 words[6]; |
432 | }; | 432 | }; |
433 | 433 | ||
@@ -502,13 +502,13 @@ struct scu_sgl_element_pair { | |||
502 | }; | 502 | }; |
503 | 503 | ||
504 | /** | 504 | /** |
505 | * struct TRANSPORT_SNAPSHOT - This structure is the SCU hardware scratch area | 505 | * struct transport_snapshot - This structure is the SCU hardware scratch area |
506 | * for the task context. This is set to 0 by the driver but can be read by | 506 | * for the task context. This is set to 0 by the driver but can be read by |
507 | * issuing a dump TC request to the SCU. | 507 | * issuing a dump TC request to the SCU. |
508 | * | 508 | * |
509 | * | 509 | * |
510 | */ | 510 | */ |
511 | struct TRANSPORT_SNAPSHOT { | 511 | struct transport_snapshot { |
512 | /* OFFSET 0x48 */ | 512 | /* OFFSET 0x48 */ |
513 | u32 xfer_rdy_write_data_length; | 513 | u32 xfer_rdy_write_data_length; |
514 | 514 | ||
@@ -639,7 +639,7 @@ struct scu_task_context { | |||
639 | /** | 639 | /** |
640 | * This field is programmed with one of the following command type codes | 640 | * This field is programmed with one of the following command type codes |
641 | * | 641 | * |
642 | * For SAS requests use the SCU_SSP_TASK_TYPE | 642 | * For SAS requests use the scu_ssp_task_type |
643 | * - SCU_TASK_TYPE_IOREAD | 643 | * - SCU_TASK_TYPE_IOREAD |
644 | * - SCU_TASK_TYPE_IOWRITE | 644 | * - SCU_TASK_TYPE_IOWRITE |
645 | * - SCU_TASK_TYPE_SMP_REQUEST | 645 | * - SCU_TASK_TYPE_SMP_REQUEST |
@@ -647,7 +647,7 @@ struct scu_task_context { | |||
647 | * - SCU_TASK_TYPE_RAW_FRAME | 647 | * - SCU_TASK_TYPE_RAW_FRAME |
648 | * - SCU_TASK_TYPE_PRIMITIVE | 648 | * - SCU_TASK_TYPE_PRIMITIVE |
649 | * | 649 | * |
650 | * For SATA requests use the SCU_SATA_TASK_TYPE | 650 | * For SATA requests use the scu_sata_task_type |
651 | * - SCU_TASK_TYPE_DMA_IN | 651 | * - SCU_TASK_TYPE_DMA_IN |
652 | * - SCU_TASK_TYPE_FPDMAQ_READ | 652 | * - SCU_TASK_TYPE_FPDMAQ_READ |
653 | * - SCU_TASK_TYPE_PACKET_DMA_IN | 653 | * - SCU_TASK_TYPE_PACKET_DMA_IN |
@@ -787,7 +787,7 @@ struct scu_task_context { | |||
787 | /** | 787 | /** |
788 | * This union provides for the protocol specif part of the SCU Task Context. | 788 | * This union provides for the protocol specif part of the SCU Task Context. |
789 | */ | 789 | */ |
790 | union PROTOCOL_CONTEXT type; | 790 | union protocol_context type; |
791 | 791 | ||
792 | /* OFFSET 0x30-0x34 */ | 792 | /* OFFSET 0x30-0x34 */ |
793 | /** | 793 | /** |
@@ -863,7 +863,7 @@ struct scu_task_context { | |||
863 | u32 write_data_length; /* read only set to 0 */ | 863 | u32 write_data_length; /* read only set to 0 */ |
864 | 864 | ||
865 | /* OFFSET 0x48-0x58 */ | 865 | /* OFFSET 0x48-0x58 */ |
866 | struct TRANSPORT_SNAPSHOT snapshot; /* read only set to 0 */ | 866 | struct transport_snapshot snapshot; /* read only set to 0 */ |
867 | 867 | ||
868 | /* OFFSET 0x5C */ | 868 | /* OFFSET 0x5C */ |
869 | u32 block_protection_enable:1; | 869 | u32 block_protection_enable:1; |
diff --git a/drivers/scsi/isci/probe_roms.h b/drivers/scsi/isci/probe_roms.h index c2162cf12056..f07935844bbd 100644 --- a/drivers/scsi/isci/probe_roms.h +++ b/drivers/scsi/isci/probe_roms.h | |||
@@ -111,7 +111,7 @@ struct isci_oem_hdr { | |||
111 | * A PORT_PHY mask that assigns just a single PHY to a port and no other PHYs | 111 | * A PORT_PHY mask that assigns just a single PHY to a port and no other PHYs |
112 | * being assigned is sufficient to declare manual PORT configuration. | 112 | * being assigned is sufficient to declare manual PORT configuration. |
113 | */ | 113 | */ |
114 | enum SCIC_PORT_CONFIGURATION_MODE { | 114 | enum scic_port_configuration_mode { |
115 | SCIC_PORT_MANUAL_CONFIGURATION_MODE = 0, | 115 | SCIC_PORT_MANUAL_CONFIGURATION_MODE = 0, |
116 | SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE = 1 | 116 | SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE = 1 |
117 | }; | 117 | }; |