Commit f0902095 authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Relocate DMA unmap of SMP task 

Currently SMP tasks are DMA unmapped only when cq of SMP I/O is returned
normally. If the cq of SMP I/O is returned with exception actually SMP TAS
is never unmapped. Relocate DMA unmap of SMP task to fix the issue.

Link: https://lore.kernel.org/r/1657823002-139010-4-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent bc22f9c0

drivers/scsi/hisi_sas/hisi_sas_main.c

+5 −1
Original line number Diff line number Diff line
@@ -219,11 +219,15 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task, 
		task->lldd_task = NULL;



		if (!sas_protocol_ata(task->task_proto)) {

			if (slot->n_elem)

			if (slot->n_elem) {

				if (task->task_proto & SAS_PROTOCOL_SSP)

					dma_unmap_sg(dev, task->scatter,

						     task->num_scatter,

						     task->data_dir);

				else

					dma_unmap_sg(dev, &task->smp_task.smp_req,

						     1, DMA_TO_DEVICE);

			}

			if (slot->n_elem_dif) {

				struct sas_ssp_task *ssp_task = &task->ssp_task;

				struct scsi_cmnd *scsi_cmnd = ssp_task->cmd;

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+0 −2
Original line number Diff line number Diff line
@@ -1282,8 +1282,6 @@ static void slot_complete_v1_hw(struct hisi_hba *hisi_hba, 


		ts->stat = SAS_SAM_STAT_GOOD;



		dma_unmap_sg(dev, &task->smp_task.smp_req, 1,

			     DMA_TO_DEVICE);

		memcpy(to + sg_resp->offset,

		       hisi_sas_status_buf_addr_mem(slot) +

		       sizeof(struct hisi_sas_err_record),

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+0 −2
Original line number Diff line number Diff line
@@ -2428,8 +2428,6 @@ static void slot_complete_v2_hw(struct hisi_hba *hisi_hba, 


		ts->stat = SAS_SAM_STAT_GOOD;



		dma_unmap_sg(dev, &task->smp_task.smp_req, 1,

			     DMA_TO_DEVICE);

		memcpy(to + sg_resp->offset,

		       hisi_sas_status_buf_addr_mem(slot) +

		       sizeof(struct hisi_sas_err_record),

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+0 −2
Original line number Diff line number Diff line
@@ -2311,8 +2311,6 @@ static void slot_complete_v3_hw(struct hisi_hba *hisi_hba, 


		ts->stat = SAS_SAM_STAT_GOOD;



		dma_unmap_sg(dev, &task->smp_task.smp_req, 1,

			     DMA_TO_DEVICE);

		memcpy(to + sg_resp->offset,

			hisi_sas_status_buf_addr_mem(slot) +

		       sizeof(struct hisi_sas_err_record),