Skip to content

Commit

Permalink
[SCSI] isci: fix sata response handling
Browse files Browse the repository at this point in the history
A bug (likely copy/paste) that has been carried from the original
implementation.  The unsolicited frame handling structure returns the
d2h fis in the isci_request.stp.rsp buffer.

Cc: <stable@kernel.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
  • Loading branch information
Dan Williams authored and James Bottomley committed Aug 24, 2011
1 parent ba8f318 commit 1a87828
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions drivers/scsi/isci/request.c
Original file line number Diff line number Diff line change
Expand Up @@ -2399,22 +2399,19 @@ static void isci_task_save_for_upper_layer_completion(
}
}

static void isci_request_process_stp_response(struct sas_task *task,
void *response_buffer)
static void isci_process_stp_response(struct sas_task *task, struct dev_to_host_fis *fis)
{
struct dev_to_host_fis *d2h_reg_fis = response_buffer;
struct task_status_struct *ts = &task->task_status;
struct ata_task_resp *resp = (void *)&ts->buf[0];

resp->frame_len = le16_to_cpu(*(__le16 *)(response_buffer + 6));
memcpy(&resp->ending_fis[0], response_buffer + 16, 24);
resp->frame_len = sizeof(*fis);
memcpy(resp->ending_fis, fis, sizeof(*fis));
ts->buf_valid_size = sizeof(*resp);

/**
* If the device fault bit is set in the status register, then
/* If the device fault bit is set in the status register, then
* set the sense data and return.
*/
if (d2h_reg_fis->status & ATA_DF)
if (fis->status & ATA_DF)
ts->stat = SAS_PROTO_RESPONSE;
else
ts->stat = SAM_STAT_GOOD;
Expand All @@ -2428,7 +2425,6 @@ static void isci_request_io_request_complete(struct isci_host *ihost,
{
struct sas_task *task = isci_request_access_task(request);
struct ssp_response_iu *resp_iu;
void *resp_buf;
unsigned long task_flags;
struct isci_remote_device *idev = isci_lookup_device(task->dev);
enum service_response response = SAS_TASK_UNDELIVERED;
Expand Down Expand Up @@ -2565,9 +2561,7 @@ static void isci_request_io_request_complete(struct isci_host *ihost,
task);

if (sas_protocol_ata(task->task_proto)) {
resp_buf = &request->stp.rsp;
isci_request_process_stp_response(task,
resp_buf);
isci_process_stp_response(task, &request->stp.rsp);
} else if (SAS_PROTOCOL_SSP == task->task_proto) {

/* crack the iu response buffer. */
Expand Down

0 comments on commit 1a87828

Please sign in to comment.