Commit d377f415 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: libsas: Introduce more SAM status code aliases in enum exec_status 

This patch prepares for converting SAM status codes into an enum. Without
this patch converting SAM status codes into an enumeration type would
trigger complaints about enum type mismatches for the SAS code.

Link: https://lore.kernel.org/r/20210524025457.11299-2-bvanassche@acm.org


Cc: Hannes Reinecke <hare@suse.com>
Cc: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Cc: Jason Yan <yanaijie@huawei.com>
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Acked-by: default avatarJack Wang <jinpu.wang@ionos.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1ff28f22

drivers/scsi/aic94xx/aic94xx_task.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void asd_task_tasklet_complete(struct asd_ascb *ascb, 
	switch (opcode) {

	case TC_NO_ERROR:

		ts->resp = SAS_TASK_COMPLETE;

		ts->stat = SAM_STAT_GOOD;

		ts->stat = SAS_SAM_STAT_GOOD;

		break;

	case TC_UNDERRUN:

		ts->resp = SAS_TASK_COMPLETE;

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+4 −4
Original line number Diff line number Diff line
@@ -1152,14 +1152,14 @@ static void slot_err_v1_hw(struct hisi_hba *hisi_hba, 
		}

		default:

		{

			ts->stat = SAM_STAT_CHECK_CONDITION;

			ts->stat = SAS_SAM_STAT_CHECK_CONDITION;

			break;

		}

		}

	}

		break;

	case SAS_PROTOCOL_SMP:

		ts->stat = SAM_STAT_CHECK_CONDITION;

		ts->stat = SAS_SAM_STAT_CHECK_CONDITION;

		break;



	case SAS_PROTOCOL_SATA:
@@ -1281,7 +1281,7 @@ static void slot_complete_v1_hw(struct hisi_hba *hisi_hba, 
		struct scatterlist *sg_resp = &task->smp_task.smp_resp;

		void *to = page_address(sg_page(sg_resp));



		ts->stat = SAM_STAT_GOOD;

		ts->stat = SAS_SAM_STAT_GOOD;



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

			     DMA_TO_DEVICE);
@@ -1298,7 +1298,7 @@ static void slot_complete_v1_hw(struct hisi_hba *hisi_hba, 
		break;



	default:

		ts->stat = SAM_STAT_CHECK_CONDITION;

		ts->stat = SAS_SAM_STAT_CHECK_CONDITION;

		break;

	}

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+4 −4
Original line number Diff line number Diff line
@@ -2168,7 +2168,7 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba, 
	}

		break;

	case SAS_PROTOCOL_SMP:

		ts->stat = SAM_STAT_CHECK_CONDITION;

		ts->stat = SAS_SAM_STAT_CHECK_CONDITION;

		break;



	case SAS_PROTOCOL_SATA:
@@ -2427,7 +2427,7 @@ static void slot_complete_v2_hw(struct hisi_hba *hisi_hba, 
		struct scatterlist *sg_resp = &task->smp_task.smp_resp;

		void *to = page_address(sg_page(sg_resp));



		ts->stat = SAM_STAT_GOOD;

		ts->stat = SAS_SAM_STAT_GOOD;



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

			     DMA_TO_DEVICE);
@@ -2441,12 +2441,12 @@ static void slot_complete_v2_hw(struct hisi_hba *hisi_hba, 
	case SAS_PROTOCOL_STP:

	case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:

	{

		ts->stat = SAM_STAT_GOOD;

		ts->stat = SAS_SAM_STAT_GOOD;

		hisi_sas_sata_done(task, slot);

		break;

	}

	default:

		ts->stat = SAM_STAT_CHECK_CONDITION;

		ts->stat = SAS_SAM_STAT_CHECK_CONDITION;

		break;

	}

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+4 −4
Original line number Diff line number Diff line
@@ -2178,7 +2178,7 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task, 
		hisi_sas_sata_done(task, slot);

		break;

	case SAS_PROTOCOL_SMP:

		ts->stat = SAM_STAT_CHECK_CONDITION;

		ts->stat = SAS_SAM_STAT_CHECK_CONDITION;

		break;

	default:

		break;
@@ -2285,7 +2285,7 @@ static void slot_complete_v3_hw(struct hisi_hba *hisi_hba, 
		struct scatterlist *sg_resp = &task->smp_task.smp_resp;

		void *to = page_address(sg_page(sg_resp));



		ts->stat = SAM_STAT_GOOD;

		ts->stat = SAS_SAM_STAT_GOOD;



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

			     DMA_TO_DEVICE);
@@ -2298,11 +2298,11 @@ static void slot_complete_v3_hw(struct hisi_hba *hisi_hba, 
	case SAS_PROTOCOL_SATA:

	case SAS_PROTOCOL_STP:

	case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:

		ts->stat = SAM_STAT_GOOD;

		ts->stat = SAS_SAM_STAT_GOOD;

		hisi_sas_sata_done(task, slot);

		break;

	default:

		ts->stat = SAM_STAT_CHECK_CONDITION;

		ts->stat = SAS_SAM_STAT_CHECK_CONDITION;

		break;

	}

drivers/scsi/isci/request.c

+5 −5
Original line number Diff line number Diff line
@@ -2566,7 +2566,7 @@ static void isci_request_handle_controller_specific_errors( 
			if (!idev)

				*status_ptr = SAS_DEVICE_UNKNOWN;

			else

				*status_ptr = SAM_STAT_TASK_ABORTED;

				*status_ptr = SAS_SAM_STAT_TASK_ABORTED;



			clear_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);

		}
@@ -2696,7 +2696,7 @@ static void isci_request_handle_controller_specific_errors( 
	default:

		/* Task in the target is not done. */

		*response_ptr = SAS_TASK_UNDELIVERED;

		*status_ptr = SAM_STAT_TASK_ABORTED;

		*status_ptr = SAS_SAM_STAT_TASK_ABORTED;



		if (task->task_proto == SAS_PROTOCOL_SMP)

			set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
@@ -2719,7 +2719,7 @@ static void isci_process_stp_response(struct sas_task *task, struct dev_to_host_ 
	if (ac_err_mask(fis->status))

		ts->stat = SAS_PROTO_RESPONSE;

	else

		ts->stat = SAM_STAT_GOOD;

		ts->stat = SAS_SAM_STAT_GOOD;



	ts->resp = SAS_TASK_COMPLETE;

}
@@ -2782,7 +2782,7 @@ static void isci_request_io_request_complete(struct isci_host *ihost, 
	case SCI_IO_SUCCESS_IO_DONE_EARLY:



		response = SAS_TASK_COMPLETE;

		status   = SAM_STAT_GOOD;

		status   = SAS_SAM_STAT_GOOD;

		set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);



		if (completion_status == SCI_IO_SUCCESS_IO_DONE_EARLY) {
@@ -2852,7 +2852,7 @@ static void isci_request_io_request_complete(struct isci_host *ihost, 


		/* Fail the I/O. */

		response = SAS_TASK_UNDELIVERED;

		status = SAM_STAT_TASK_ABORTED;

		status = SAS_SAM_STAT_TASK_ABORTED;



		clear_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);

		break;