aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/isci/phy.c2
-rw-r--r--drivers/scsi/isci/probe_roms.c7
-rw-r--r--drivers/scsi/isci/remote_device.c2
-rw-r--r--drivers/scsi/isci/request.h4
-rw-r--r--drivers/scsi/isci/task.c71
5 files changed, 44 insertions, 42 deletions
diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c
index d8f893ee7d03..79313a7a2356 100644
--- a/drivers/scsi/isci/phy.c
+++ b/drivers/scsi/isci/phy.c
@@ -197,7 +197,7 @@ sci_phy_link_layer_initialization(struct isci_phy *iphy,
197 llctl = SCU_SAS_LLCTL_GEN_VAL(NO_OUTBOUND_TASK_TIMEOUT, 197 llctl = SCU_SAS_LLCTL_GEN_VAL(NO_OUTBOUND_TASK_TIMEOUT,
198 (u8)ihost->user_parameters.no_outbound_task_timeout); 198 (u8)ihost->user_parameters.no_outbound_task_timeout);
199 199
200 switch(phy_user->max_speed_generation) { 200 switch (phy_user->max_speed_generation) {
201 case SCIC_SDS_PARM_GEN3_SPEED: 201 case SCIC_SDS_PARM_GEN3_SPEED:
202 link_rate = SCU_SAS_LINK_LAYER_CONTROL_MAX_LINK_RATE_GEN3; 202 link_rate = SCU_SAS_LINK_LAYER_CONTROL_MAX_LINK_RATE_GEN3;
203 break; 203 break;
diff --git a/drivers/scsi/isci/probe_roms.c b/drivers/scsi/isci/probe_roms.c
index 4b9d813c63b1..b5f4341de243 100644
--- a/drivers/scsi/isci/probe_roms.c
+++ b/drivers/scsi/isci/probe_roms.c
@@ -34,8 +34,9 @@
34#include "task.h" 34#include "task.h"
35#include "probe_roms.h" 35#include "probe_roms.h"
36 36
37static efi_char16_t isci_efivar_name[] = 37static efi_char16_t isci_efivar_name[] = {
38 {'R', 's', 't', 'S', 'c', 'u', 'O'}; 38 'R', 's', 't', 'S', 'c', 'u', 'O'
39};
39 40
40struct isci_orom *isci_request_oprom(struct pci_dev *pdev) 41struct isci_orom *isci_request_oprom(struct pci_dev *pdev)
41{ 42{
@@ -182,7 +183,7 @@ struct isci_orom *isci_get_efi_var(struct pci_dev *pdev)
182 struct isci_oem_hdr *oem_hdr; 183 struct isci_oem_hdr *oem_hdr;
183 u8 *tmp, sum; 184 u8 *tmp, sum;
184 int j; 185 int j;
185 ssize_t data_len; 186 unsigned long data_len;
186 u8 *efi_data; 187 u8 *efi_data;
187 u32 efi_attrib = 0; 188 u32 efi_attrib = 0;
188 189
diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index 85e54f542075..b6e6368c2665 100644
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -73,7 +73,7 @@
73static void isci_remote_device_not_ready(struct isci_host *ihost, 73static void isci_remote_device_not_ready(struct isci_host *ihost,
74 struct isci_remote_device *idev, u32 reason) 74 struct isci_remote_device *idev, u32 reason)
75{ 75{
76 struct isci_request * ireq; 76 struct isci_request *ireq;
77 77
78 dev_dbg(&ihost->pdev->dev, 78 dev_dbg(&ihost->pdev->dev,
79 "%s: isci_device = %p\n", __func__, idev); 79 "%s: isci_device = %p\n", __func__, idev);
diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h
index 11bc279457aa..7a1d5a9778eb 100644
--- a/drivers/scsi/isci/request.h
+++ b/drivers/scsi/isci/request.h
@@ -440,8 +440,8 @@ void sci_smp_request_copy_response(struct isci_request *ireq);
440static inline int isci_task_is_ncq_recovery(struct sas_task *task) 440static inline int isci_task_is_ncq_recovery(struct sas_task *task)
441{ 441{
442 return (sas_protocol_ata(task->task_proto) && 442 return (sas_protocol_ata(task->task_proto) &&
443 task->ata_task.fis.command == ATA_CMD_READ_LOG_EXT && 443 task->ata_task.fis.command == ATA_CMD_READ_LOG_EXT &&
444 task->ata_task.fis.lbal == ATA_LOG_SATA_NCQ); 444 task->ata_task.fis.lbal == ATA_LOG_SATA_NCQ);
445 445
446} 446}
447 447
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index 2df45c57fc60..d6bcdd013dc9 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -88,44 +88,45 @@ static void isci_task_refuse(struct isci_host *ihost, struct sas_task *task,
88 * function should not be completed to the host in the regular path. 88 * function should not be completed to the host in the regular path.
89 */ 89 */
90 switch (disposition) { 90 switch (disposition) {
91 case isci_perform_normal_io_completion: 91 case isci_perform_normal_io_completion:
92 /* Normal notification (task_done) */ 92 /* Normal notification (task_done) */
93 dev_dbg(&ihost->pdev->dev, 93 dev_dbg(&ihost->pdev->dev,
94 "%s: Normal - task = %p, response=%d, " 94 "%s: Normal - task = %p, response=%d, "
95 "status=%d\n", 95 "status=%d\n",
96 __func__, task, response, status); 96 __func__, task, response, status);
97 97
98 task->lldd_task = NULL; 98 task->lldd_task = NULL;
99 99
100 isci_execpath_callback(ihost, task, task->task_done); 100 isci_execpath_callback(ihost, task, task->task_done);
101 break; 101 break;
102 102
103 case isci_perform_aborted_io_completion: 103 case isci_perform_aborted_io_completion:
104 /* No notification because this request is already in the 104 /*
105 * abort path. 105 * No notification because this request is already in the
106 */ 106 * abort path.
107 dev_dbg(&ihost->pdev->dev, 107 */
108 "%s: Aborted - task = %p, response=%d, " 108 dev_dbg(&ihost->pdev->dev,
109 "status=%d\n", 109 "%s: Aborted - task = %p, response=%d, "
110 __func__, task, response, status); 110 "status=%d\n",
111 break; 111 __func__, task, response, status);
112 break;
112 113
113 case isci_perform_error_io_completion: 114 case isci_perform_error_io_completion:
114 /* Use sas_task_abort */ 115 /* Use sas_task_abort */
115 dev_dbg(&ihost->pdev->dev, 116 dev_dbg(&ihost->pdev->dev,
116 "%s: Error - task = %p, response=%d, " 117 "%s: Error - task = %p, response=%d, "
117 "status=%d\n", 118 "status=%d\n",
118 __func__, task, response, status); 119 __func__, task, response, status);
119 120
120 isci_execpath_callback(ihost, task, sas_task_abort); 121 isci_execpath_callback(ihost, task, sas_task_abort);
121 break; 122 break;
122 123
123 default: 124 default:
124 dev_dbg(&ihost->pdev->dev, 125 dev_dbg(&ihost->pdev->dev,
125 "%s: isci task notification default case!", 126 "%s: isci task notification default case!",
126 __func__); 127 __func__);
127 sas_task_abort(task); 128 sas_task_abort(task);
128 break; 129 break;
129 } 130 }
130} 131}
131 132
@@ -1056,7 +1057,7 @@ int isci_task_abort_task(struct sas_task *task)
1056 dev_dbg(&isci_host->pdev->dev, 1057 dev_dbg(&isci_host->pdev->dev,
1057 "%s: old_request == %p\n", __func__, old_request); 1058 "%s: old_request == %p\n", __func__, old_request);
1058 1059
1059 any_dev_reset = isci_device_is_reset_pending(isci_host,isci_device); 1060 any_dev_reset = isci_device_is_reset_pending(isci_host, isci_device);
1060 1061
1061 spin_lock_irqsave(&task->task_state_lock, flags); 1062 spin_lock_irqsave(&task->task_state_lock, flags);
1062 1063
@@ -1115,9 +1116,9 @@ int isci_task_abort_task(struct sas_task *task)
1115 __func__, task); 1116 __func__, task);
1116 } 1117 }
1117 goto out; 1118 goto out;
1118 } 1119 } else {
1119 else
1120 spin_unlock_irqrestore(&task->task_state_lock, flags); 1120 spin_unlock_irqrestore(&task->task_state_lock, flags);
1121 }
1121 1122
1122 spin_lock_irqsave(&isci_host->scic_lock, flags); 1123 spin_lock_irqsave(&isci_host->scic_lock, flags);
1123 1124