Unverified Commit 516534e8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2360 scsi: hisi_sas: Handle the NCQ error returned by D2H frame 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xingui Yang <yangxingui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZV7WOHHKZJUWVUNAJC7HG75IGHHSRUVP/ 
 
https://gitee.com/openeuler/kernel/issues/I86GWG 
 
Link:https://gitee.com/openeuler/kernel/pulls/2360

 

Reviewed-by: default avatarYihang Li <liyihang9@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents c6bc56d3 7d982bef

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+9 −1
Original line number Diff line number Diff line
@@ -2341,7 +2341,15 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task, 
	case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:

		if ((dw0 & CMPLT_HDR_RSPNS_XFRD_MSK) &&

			(sipc_rx_err_type & RX_FIS_STATUS_ERR_MSK)) {

			if (task->ata_task.use_ncq) {

				struct domain_device *device = task->dev;

				struct hisi_sas_device *sas_dev =

						device->lldd_dev;

				sas_dev->dev_status = HISI_SAS_DEV_NCQ_ERR;

				slot->abort = 1;

			} else {

				ts->stat = SAS_PROTO_RESPONSE;

			}

		} else if ((dw3 & CMPLT_HDR_IO_IN_TARGET_MSK) ||

			(dw3 & SATA_DISK_IN_ERROR_STATUS)) {

			ts->stat = SAS_PHY_DOWN;