Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a878284 authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[SCSI] isci: fix sata response handling 



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: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent ba8f3184

drivers/scsi/isci/request.c

+6 −12
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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. */