Skip to contentSkip to conversation

Introduce enums for SCSI status codes

PATCH Superseded Bart Van Assche 3 participants 8 messages May 18, 2021 – May 19, 2021

Subsystems (6)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover Introduce enums for SCSI status codes

Hi Martin,

This patch series introduces enums for the SAM, message, host and driver status codes and hence improves static type checking by the compiler. Please consider this patch series for kernel v5.14.

Thanks,

Bart.

Changes compared to v1:
- Modified the comment block at the start of the enum exec_status definition in libsas.h.
- Changed the __SAM_STAT_ prefix into SAS_STAT_ for the SAM status codes that are also used in the SAS code.
- Restored the reverse-Christmas tree style in two functions.
- Renamed enum host_status and driver_status into enum scsi_host_status and scsi_driver_status respectively.

Bart Van Assche (3):
libsas: Introduce more SAM status code aliases in enum exec_status Introduce enums for the SAM, message, host and driver status codes Change the type of the second argument of
scsi_host_complete_all_commands()

 drivers/scsi/aic94xx/aic94xx_task.c    |  2 +-
 drivers/scsi/constants.c               |  4 +-
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c |  8 +--
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c |  8 +--
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c |  8 +--
 drivers/scsi/hosts.c                   |  8 ++-
 drivers/scsi/isci/request.c            | 10 +--
 drivers/scsi/isci/task.c               |  2 +-
 drivers/scsi/libsas/sas_ata.c          |  7 +-
 drivers/scsi/libsas/sas_expander.c     |  2 +-
 drivers/scsi/libsas/sas_task.c         |  4 +-
 drivers/scsi/mvsas/mv_sas.c            | 10 +--
 drivers/scsi/pm8001/pm8001_hwi.c       | 16 ++---
 drivers/scsi/pm8001/pm8001_sas.c       |  4 +-
 drivers/scsi/pm8001/pm80xx_hwi.c       | 14 ++--
 drivers/target/target_core_pscsi.c     |  2 +-
 include/scsi/libsas.h                  | 12 +++-
 include/scsi/scsi.h                    | 81 +----------------------
 include/scsi/scsi_host.h               |  2 +-
 include/scsi/scsi_proto.h              | 24 +++----
 include/scsi/scsi_status.h             | 89 ++++++++++++++++++++++++++
 21 files changed, 170 insertions(+), 147 deletions(-)
 create mode 100644 include/scsi/scsi_status.h
#1 lore raw

PATCH v2 1/3 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.

Cc Hannes Reinecke <[email protected]>
Cc John Garry <[email protected]>
Cc Artur Paszkiewicz <[email protected]>
Cc Jack Wang <[email protected]>
Cc Jason Yan <[email protected]>
---
 drivers/scsi/aic94xx/aic94xx_task.c    |  2 +-
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c |  8 ++++----
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c |  8 ++++----
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c |  8 ++++----
 drivers/scsi/isci/request.c            | 10 +++++-----
 drivers/scsi/isci/task.c               |  2 +-
 drivers/scsi/libsas/sas_ata.c          |  7 ++++---
 drivers/scsi/libsas/sas_expander.c     |  2 +-
 drivers/scsi/libsas/sas_task.c         |  4 ++--
 drivers/scsi/mvsas/mv_sas.c            | 10 +++++-----
 drivers/scsi/pm8001/pm8001_hwi.c       | 16 ++++++++--------
 drivers/scsi/pm8001/pm8001_sas.c       |  4 ++--
 drivers/scsi/pm8001/pm80xx_hwi.c       | 14 +++++++-------
 include/scsi/libsas.h                  | 12 +++++++++---
 14 files changed, 57 insertions(+), 50 deletions(-)
drivers/scsi/aic94xx/aic94xx_task.c +1 -1
index 71d18f607dae..518ad4758a45 100644
@@ -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_STAT_GOOD;
 		break;
 	case TC_UNDERRUN:
 		ts->resp = SAS_TASK_COMPLETE;
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +4 -4
index 3e359ac752fd..9bb3ebd2a4e1 100644
@@ -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_STAT_CHECK_CONDITION;
 			break;
 		}
 		}
 	}
 		break;
 	case SAS_PROTOCOL_SMP:
-		ts->stat = SAM_STAT_CHECK_CONDITION;
+		ts->stat = SAS_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_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_STAT_CHECK_CONDITION;
 		break;
 	}
 
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +4 -4
index 46f60fc2a069..67d1a821edb6 100644
@@ -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_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_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_STAT_GOOD;
 		hisi_sas_sata_done(task, slot);
 		break;
 	}
 	default:
-		ts->stat = SAM_STAT_CHECK_CONDITION;
+		ts->stat = SAS_STAT_CHECK_CONDITION;
 		break;
 	}
 
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +4 -4
index 499c770d405c..35d58daa2729 100644
@@ -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_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_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_STAT_GOOD;
 		hisi_sas_sata_done(task, slot);
 		break;
 	default:
-		ts->stat = SAM_STAT_CHECK_CONDITION;
+		ts->stat = SAS_STAT_CHECK_CONDITION;
 		break;
 	}
 
drivers/scsi/isci/request.c +5 -5
index e7c6cb4c1556..83069d0f69b3 100644
@@ -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_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_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_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_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_STAT_TASK_ABORTED;
 
 		clear_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
 		break;
drivers/scsi/isci/task.c +1 -1
index 62062ed6cd9a..4ab33393d4ed 100644
@@ -160,7 +160,7 @@ int isci_task_execute_task(struct sas_task *task, gfp_t gfp_flags)
 
 			isci_task_refuse(ihost, task,
 					 SAS_TASK_UNDELIVERED,
-					 SAM_STAT_TASK_ABORTED);
+					 SAS_STAT_TASK_ABORTED);
 		} else {
 			task->task_state_flags |= SAS_TASK_AT_INITIATOR;
 			spin_unlock_irqrestore(&task->task_state_lock, flags);
drivers/scsi/libsas/sas_ata.c +4 -3
index e9a86128f1f1..fbdcf6fd7d85 100644
@@ -116,9 +116,10 @@ static void sas_ata_task_done(struct sas_task *task)
 		}
 	}
 
-	if (stat->stat == SAS_PROTO_RESPONSE || stat->stat == SAM_STAT_GOOD ||
-	    ((stat->stat == SAM_STAT_CHECK_CONDITION &&
-	      dev->sata_dev.class == ATA_DEV_ATAPI))) {
+	if (stat->stat == SAS_PROTO_RESPONSE ||
+	    stat->stat == SAS_STAT_GOOD ||
+	    (stat->stat == SAS_STAT_CHECK_CONDITION &&
+	      dev->sata_dev.class == ATA_DEV_ATAPI)) {
 		memcpy(dev->sata_dev.fis, resp->ending_fis, ATA_RESP_FIS_SIZE);
 
 		if (!link->sactive) {
drivers/scsi/libsas/sas_expander.c +1 -1
index 6d583e8c403a..bc8cbccb87cd 100644
@@ -101,7 +101,7 @@ static int smp_execute_task_sg(struct domain_device *dev,
 			}
 		}
 		if (task->task_status.resp == SAS_TASK_COMPLETE &&
-		    task->task_status.stat == SAM_STAT_GOOD) {
+		    task->task_status.stat == SAS_STAT_GOOD) {
 			res = 0;
 			break;
 		}
drivers/scsi/libsas/sas_task.c +2 -2
index e2d42593ce52..4e0c3ffd9aac 100644
@@ -20,7 +20,7 @@ void sas_ssp_task_response(struct device *dev, struct sas_task *task,
 	else if (iu->datapres == 1)
 		tstat->stat = iu->resp_data[3];
 	else if (iu->datapres == 2) {
-		tstat->stat = SAM_STAT_CHECK_CONDITION;
+		tstat->stat = SAS_STAT_CHECK_CONDITION;
 		tstat->buf_valid_size =
 			min_t(int, SAS_STATUS_BUF_SIZE,
 			      be32_to_cpu(iu->sense_data_len));
@@ -32,7 +32,7 @@ void sas_ssp_task_response(struct device *dev, struct sas_task *task,
 	}
 	else
 		/* when datapres contains corrupt/unknown value... */
-		tstat->stat = SAM_STAT_CHECK_CONDITION;
+		tstat->stat = SAS_STAT_CHECK_CONDITION;
 }
 EXPORT_SYMBOL_GPL(sas_ssp_task_response);
 
drivers/scsi/mvsas/mv_sas.c +5 -5
index 1acea528f27f..087c4f3acc81 100644
@@ -1314,7 +1314,7 @@ static int mvs_exec_internal_tmf_task(struct domain_device *dev,
 		}
 
 		if (task->task_status.resp == SAS_TASK_COMPLETE &&
-		    task->task_status.stat == SAM_STAT_GOOD) {
+		    task->task_status.stat == SAS_STAT_GOOD) {
 			res = TMF_RESP_FUNC_COMPLETE;
 			break;
 		}
@@ -1764,7 +1764,7 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
 	case SAS_PROTOCOL_SSP:
 		/* hw says status == 0, datapres == 0 */
 		if (rx_desc & RXQ_GOOD) {
-			tstat->stat = SAM_STAT_GOOD;
+			tstat->stat = SAS_STAT_GOOD;
 			tstat->resp = SAS_TASK_COMPLETE;
 		}
 		/* response frame present */
@@ -1773,12 +1773,12 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
 						sizeof(struct mvs_err_info);
 			sas_ssp_task_response(mvi->dev, task, iu);
 		} else
-			tstat->stat = SAM_STAT_CHECK_CONDITION;
+			tstat->stat = SAS_STAT_CHECK_CONDITION;
 		break;
 
 	case SAS_PROTOCOL_SMP: {
 			struct scatterlist *sg_resp = &task->smp_task.smp_resp;
-			tstat->stat = SAM_STAT_GOOD;
+			tstat->stat = SAS_STAT_GOOD;
 			to = kmap_atomic(sg_page(sg_resp));
 			memcpy(to + sg_resp->offset,
 				slot->response + sizeof(struct mvs_err_info),
@@ -1795,7 +1795,7 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
 		}
 
 	default:
-		tstat->stat = SAM_STAT_CHECK_CONDITION;
+		tstat->stat = SAS_STAT_CHECK_CONDITION;
 		break;
 	}
 	if (!slot->port->port_attached) {
drivers/scsi/pm8001/pm8001_hwi.c +8 -8
index ecd06d2d7e81..4740d7eee196 100644
@@ -1930,7 +1930,7 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
 			   param);
 		if (param == 0) {
 			ts->resp = SAS_TASK_COMPLETE;
-			ts->stat = SAM_STAT_GOOD;
+			ts->stat = SAS_STAT_GOOD;
 		} else {
 			ts->resp = SAS_TASK_COMPLETE;
 			ts->stat = SAS_PROTO_RESPONSE;
@@ -2390,7 +2390,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
 		pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
 		if (param == 0) {
 			ts->resp = SAS_TASK_COMPLETE;
-			ts->stat = SAM_STAT_GOOD;
+			ts->stat = SAS_STAT_GOOD;
 			/* check if response is for SEND READ LOG */
 			if (pm8001_dev &&
 				(pm8001_dev->id & NCQ_READ_LOG_FLAG)) {
@@ -2912,7 +2912,7 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
 	case IO_SUCCESS:
 		pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
 		ts->resp = SAS_TASK_COMPLETE;
-		ts->stat = SAM_STAT_GOOD;
+		ts->stat = SAS_STAT_GOOD;
 		if (pm8001_dev)
 			atomic_dec(&pm8001_dev->running_req);
 		break;
@@ -2939,17 +2939,17 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
 	case IO_ERROR_HW_TIMEOUT:
 		pm8001_dbg(pm8001_ha, IO, "IO_ERROR_HW_TIMEOUT\n");
 		ts->resp = SAS_TASK_COMPLETE;
-		ts->stat = SAM_STAT_BUSY;
+		ts->stat = SAS_STAT_BUSY;
 		break;
 	case IO_XFER_ERROR_BREAK:
 		pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_BREAK\n");
 		ts->resp = SAS_TASK_COMPLETE;
-		ts->stat = SAM_STAT_BUSY;
+		ts->stat = SAS_STAT_BUSY;
 		break;
 	case IO_XFER_ERROR_PHY_NOT_READY:
 		pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_PHY_NOT_READY\n");
 		ts->resp = SAS_TASK_COMPLETE;
-		ts->stat = SAM_STAT_BUSY;
+		ts->stat = SAS_STAT_BUSY;
 		break;
 	case IO_OPEN_CNX_ERROR_PROTOCOL_NOT_SUPPORTED:
 		pm8001_dbg(pm8001_ha, IO,
@@ -3710,7 +3710,7 @@ int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
 	case IO_SUCCESS:
 		pm8001_dbg(pm8001_ha, EH, "IO_SUCCESS\n");
 		ts->resp = SAS_TASK_COMPLETE;
-		ts->stat = SAM_STAT_GOOD;
+		ts->stat = SAS_STAT_GOOD;
 		break;
 	case IO_NOT_VALID:
 		pm8001_dbg(pm8001_ha, EH, "IO_NOT_VALID\n");
@@ -4355,7 +4355,7 @@ static int pm8001_chip_sata_req(struct pm8001_hba_info *pm8001_ha,
 
 			spin_lock_irqsave(&task->task_state_lock, flags);
 			ts->resp = SAS_TASK_COMPLETE;
-			ts->stat = SAM_STAT_GOOD;
+			ts->stat = SAS_STAT_GOOD;
 			task->task_state_flags &= ~SAS_TASK_STATE_PENDING;
 			task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
 			task->task_state_flags |= SAS_TASK_STATE_DONE;
drivers/scsi/pm8001/pm8001_sas.c +2 -2
index d28af413b93a..4367f4166704 100644
@@ -753,7 +753,7 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev,
 		}
 
 		if (task->task_status.resp == SAS_TASK_COMPLETE &&
-			task->task_status.stat == SAM_STAT_GOOD) {
+			task->task_status.stat == SAS_STAT_GOOD) {
 			res = TMF_RESP_FUNC_COMPLETE;
 			break;
 		}
@@ -838,7 +838,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,
 		}
 
 		if (task->task_status.resp == SAS_TASK_COMPLETE &&
-			task->task_status.stat == SAM_STAT_GOOD) {
+			task->task_status.stat == SAS_STAT_GOOD) {
 			res = TMF_RESP_FUNC_COMPLETE;
 			break;
 
drivers/scsi/pm8001/pm80xx_hwi.c +7 -7
index 4e980830f9f5..4aec0405288f 100644
@@ -1952,7 +1952,7 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
 			   param);
 		if (param == 0) {
 			ts->resp = SAS_TASK_COMPLETE;
-			ts->stat = SAM_STAT_GOOD;
+			ts->stat = SAS_STAT_GOOD;
 		} else {
 			ts->resp = SAS_TASK_COMPLETE;
 			ts->stat = SAS_PROTO_RESPONSE;
@@ -2487,7 +2487,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
 		pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
 		if (param == 0) {
 			ts->resp = SAS_TASK_COMPLETE;
-			ts->stat = SAM_STAT_GOOD;
+			ts->stat = SAS_STAT_GOOD;
 			/* check if response is for SEND READ LOG */
 			if (pm8001_dev &&
 				(pm8001_dev->id & NCQ_READ_LOG_FLAG)) {
@@ -3042,7 +3042,7 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
 	case IO_SUCCESS:
 		pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
 		ts->resp = SAS_TASK_COMPLETE;
-		ts->stat = SAM_STAT_GOOD;
+		ts->stat = SAS_STAT_GOOD;
 		if (pm8001_dev)
 			atomic_dec(&pm8001_dev->running_req);
 		if (pm8001_ha->smp_exp_mode == SMP_DIRECT) {
@@ -3084,17 +3084,17 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
 	case IO_ERROR_HW_TIMEOUT:
 		pm8001_dbg(pm8001_ha, IO, "IO_ERROR_HW_TIMEOUT\n");
 		ts->resp = SAS_TASK_COMPLETE;
-		ts->stat = SAM_STAT_BUSY;
+		ts->stat = SAS_STAT_BUSY;
 		break;
 	case IO_XFER_ERROR_BREAK:
 		pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_BREAK\n");
 		ts->resp = SAS_TASK_COMPLETE;
-		ts->stat = SAM_STAT_BUSY;
+		ts->stat = SAS_STAT_BUSY;
 		break;
 	case IO_XFER_ERROR_PHY_NOT_READY:
 		pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_PHY_NOT_READY\n");
 		ts->resp = SAS_TASK_COMPLETE;
-		ts->stat = SAM_STAT_BUSY;
+		ts->stat = SAS_STAT_BUSY;
 		break;
 	case IO_OPEN_CNX_ERROR_PROTOCOL_NOT_SUPPORTED:
 		pm8001_dbg(pm8001_ha, IO,
@@ -4699,7 +4699,7 @@ static int pm80xx_chip_sata_req(struct pm8001_hba_info *pm8001_ha,
 
 			spin_lock_irqsave(&task->task_state_lock, flags);
 			ts->resp = SAS_TASK_COMPLETE;
-			ts->stat = SAM_STAT_GOOD;
+			ts->stat = SAS_STAT_GOOD;
 			task->task_state_flags &= ~SAS_TASK_STATE_PENDING;
 			task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
 			task->task_state_flags |= SAS_TASK_STATE_DONE;
include/scsi/libsas.h +9 -3
index 9271d7a49b90..e68327fa4835 100644
@@ -474,10 +474,16 @@ enum service_response {
 };
 
 enum exec_status {
-	/* The SAM_STAT_.. codes fit in the lower 6 bits, alias some of
-	 * them here to silence 'case value not in enumerated type' warnings
+	/*
+	 * Values 0..0x7f are used to return the SAM_STAT_* codes.  To avoid
+	 * 'case value not in enumerated type' compiler warnings every value
+	 * returned through the exec_status enum needs an alias with the SAS_
+	 * prefix here.
 	 */
-	__SAM_STAT_CHECK_CONDITION = SAM_STAT_CHECK_CONDITION,
+	SAS_STAT_GOOD = SAM_STAT_GOOD,
+	SAS_STAT_BUSY = SAM_STAT_BUSY,
+	SAS_STAT_TASK_ABORTED = SAM_STAT_TASK_ABORTED,
+	SAS_STAT_CHECK_CONDITION = SAM_STAT_CHECK_CONDITION,
 
 	SAS_DEV_NO_RESPONSE = 0x80,
 	SAS_DATA_UNDERRUN,
Acked-by on v2 1/3
#2 lore raw

Re: [PATCH v2 1/3] libsas: Introduce more SAM status code aliases in enum exec_status

Quoted 11 lines · Bart Van Assche

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.

Cc Hannes Reinecke <[email protected]>
Cc John Garry <[email protected]>
Cc Artur Paszkiewicz <[email protected]>
Cc Jack Wang <[email protected]>
Cc Jason Yan <[email protected]>
Quoted 16 lines
---
 drivers/scsi/aic94xx/aic94xx_task.c    |  2 +-
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c |  8 ++++----
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c |  8 ++++----
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c |  8 ++++----
 drivers/scsi/isci/request.c            | 10 +++++-----
 drivers/scsi/isci/task.c               |  2 +-
 drivers/scsi/libsas/sas_ata.c          |  7 ++++---
 drivers/scsi/libsas/sas_expander.c     |  2 +-
 drivers/scsi/libsas/sas_task.c         |  4 ++--
 drivers/scsi/mvsas/mv_sas.c            | 10 +++++-----
 drivers/scsi/pm8001/pm8001_hwi.c       | 16 ++++++++--------
 drivers/scsi/pm8001/pm8001_sas.c       |  4 ++--
 drivers/scsi/pm8001/pm80xx_hwi.c       | 14 +++++++-------
 include/scsi/libsas.h                  | 12 +++++++++---
 14 files changed, 57 insertions(+), 50 deletions(-)

looks good to me, thanks Bart!

Quoted 464 lines
drivers/scsi/aic94xx/aic94xx_task.c +1 -1
index 71d18f607dae..518ad4758a45 100644
@@ -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_STAT_GOOD;
                break;
        case TC_UNDERRUN:
                ts->resp = SAS_TASK_COMPLETE;
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +4 -4
index 3e359ac752fd..9bb3ebd2a4e1 100644
@@ -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_STAT_CHECK_CONDITION;
                        break;
                }
                }
        }
                break;
        case SAS_PROTOCOL_SMP:
-               ts->stat = SAM_STAT_CHECK_CONDITION;
+               ts->stat = SAS_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_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_STAT_CHECK_CONDITION;
                break;
        }
 
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +4 -4
index 46f60fc2a069..67d1a821edb6 100644
@@ -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_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_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_STAT_GOOD;
                hisi_sas_sata_done(task, slot);
                break;
        }
        default:
-               ts->stat = SAM_STAT_CHECK_CONDITION;
+               ts->stat = SAS_STAT_CHECK_CONDITION;
                break;
        }
 
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +4 -4
index 499c770d405c..35d58daa2729 100644
@@ -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_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_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_STAT_GOOD;
                hisi_sas_sata_done(task, slot);
                break;
        default:
-               ts->stat = SAM_STAT_CHECK_CONDITION;
+               ts->stat = SAS_STAT_CHECK_CONDITION;
                break;
        }
 
drivers/scsi/isci/request.c +5 -5
index e7c6cb4c1556..83069d0f69b3 100644
@@ -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_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_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_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_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_STAT_TASK_ABORTED;
 
                clear_bit(IREQ_COMPLETE_IN_TARGET, &request->flags);
                break;
drivers/scsi/isci/task.c +1 -1
index 62062ed6cd9a..4ab33393d4ed 100644
@@ -160,7 +160,7 @@ int isci_task_execute_task(struct sas_task *task, gfp_t gfp_flags)
 
                        isci_task_refuse(ihost, task,
                                         SAS_TASK_UNDELIVERED,
-                                        SAM_STAT_TASK_ABORTED);
+                                        SAS_STAT_TASK_ABORTED);
                } else {
                        task->task_state_flags |= SAS_TASK_AT_INITIATOR;
                        spin_unlock_irqrestore(&task->task_state_lock, flags);
drivers/scsi/libsas/sas_ata.c +4 -3
index e9a86128f1f1..fbdcf6fd7d85 100644
@@ -116,9 +116,10 @@ static void sas_ata_task_done(struct sas_task *task)
                }
        }
 
-       if (stat->stat == SAS_PROTO_RESPONSE || stat->stat == SAM_STAT_GOOD ||
-           ((stat->stat == SAM_STAT_CHECK_CONDITION &&
-             dev->sata_dev.class == ATA_DEV_ATAPI))) {
+       if (stat->stat == SAS_PROTO_RESPONSE ||
+           stat->stat == SAS_STAT_GOOD ||
+           (stat->stat == SAS_STAT_CHECK_CONDITION &&
+             dev->sata_dev.class == ATA_DEV_ATAPI)) {
                memcpy(dev->sata_dev.fis, resp->ending_fis, ATA_RESP_FIS_SIZE);
 
                if (!link->sactive) {
drivers/scsi/libsas/sas_expander.c +1 -1
index 6d583e8c403a..bc8cbccb87cd 100644
@@ -101,7 +101,7 @@ static int smp_execute_task_sg(struct domain_device *dev,
                        }
                }
                if (task->task_status.resp == SAS_TASK_COMPLETE &&
-                   task->task_status.stat == SAM_STAT_GOOD) {
+                   task->task_status.stat == SAS_STAT_GOOD) {
                        res = 0;
                        break;
                }
drivers/scsi/libsas/sas_task.c +2 -2
index e2d42593ce52..4e0c3ffd9aac 100644
@@ -20,7 +20,7 @@ void sas_ssp_task_response(struct device *dev, struct sas_task *task,
        else if (iu->datapres == 1)
                tstat->stat = iu->resp_data[3];
        else if (iu->datapres == 2) {
-               tstat->stat = SAM_STAT_CHECK_CONDITION;
+               tstat->stat = SAS_STAT_CHECK_CONDITION;
                tstat->buf_valid_size =
                        min_t(int, SAS_STATUS_BUF_SIZE,
                              be32_to_cpu(iu->sense_data_len));
@@ -32,7 +32,7 @@ void sas_ssp_task_response(struct device *dev, struct sas_task *task,
        }
        else
                /* when datapres contains corrupt/unknown value... */
-               tstat->stat = SAM_STAT_CHECK_CONDITION;
+               tstat->stat = SAS_STAT_CHECK_CONDITION;
 }
 EXPORT_SYMBOL_GPL(sas_ssp_task_response);
 
drivers/scsi/mvsas/mv_sas.c +5 -5
index 1acea528f27f..087c4f3acc81 100644
@@ -1314,7 +1314,7 @@ static int mvs_exec_internal_tmf_task(struct domain_device *dev,
                }
 
                if (task->task_status.resp == SAS_TASK_COMPLETE &&
-                   task->task_status.stat == SAM_STAT_GOOD) {
+                   task->task_status.stat == SAS_STAT_GOOD) {
                        res = TMF_RESP_FUNC_COMPLETE;
                        break;
                }
@@ -1764,7 +1764,7 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
        case SAS_PROTOCOL_SSP:
                /* hw says status == 0, datapres == 0 */
                if (rx_desc & RXQ_GOOD) {
-                       tstat->stat = SAM_STAT_GOOD;
+                       tstat->stat = SAS_STAT_GOOD;
                        tstat->resp = SAS_TASK_COMPLETE;
                }
                /* response frame present */
@@ -1773,12 +1773,12 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
                                                sizeof(struct mvs_err_info);
                        sas_ssp_task_response(mvi->dev, task, iu);
                } else
-                       tstat->stat = SAM_STAT_CHECK_CONDITION;
+                       tstat->stat = SAS_STAT_CHECK_CONDITION;
                break;
 
        case SAS_PROTOCOL_SMP: {
                        struct scatterlist *sg_resp = &task->smp_task.smp_resp;
-                       tstat->stat = SAM_STAT_GOOD;
+                       tstat->stat = SAS_STAT_GOOD;
                        to = kmap_atomic(sg_page(sg_resp));
                        memcpy(to + sg_resp->offset,
                                slot->response + sizeof(struct mvs_err_info),
@@ -1795,7 +1795,7 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
                }
 
        default:
-               tstat->stat = SAM_STAT_CHECK_CONDITION;
+               tstat->stat = SAS_STAT_CHECK_CONDITION;
                break;
        }
        if (!slot->port->port_attached) {
drivers/scsi/pm8001/pm8001_hwi.c +8 -8
index ecd06d2d7e81..4740d7eee196 100644
@@ -1930,7 +1930,7 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
                           param);
                if (param == 0) {
                        ts->resp = SAS_TASK_COMPLETE;
-                       ts->stat = SAM_STAT_GOOD;
+                       ts->stat = SAS_STAT_GOOD;
                } else {
                        ts->resp = SAS_TASK_COMPLETE;
                        ts->stat = SAS_PROTO_RESPONSE;
@@ -2390,7 +2390,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
                pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
                if (param == 0) {
                        ts->resp = SAS_TASK_COMPLETE;
-                       ts->stat = SAM_STAT_GOOD;
+                       ts->stat = SAS_STAT_GOOD;
                        /* check if response is for SEND READ LOG */
                        if (pm8001_dev &&
                                (pm8001_dev->id & NCQ_READ_LOG_FLAG)) {
@@ -2912,7 +2912,7 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
        case IO_SUCCESS:
                pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
                ts->resp = SAS_TASK_COMPLETE;
-               ts->stat = SAM_STAT_GOOD;
+               ts->stat = SAS_STAT_GOOD;
                if (pm8001_dev)
                        atomic_dec(&pm8001_dev->running_req);
                break;
@@ -2939,17 +2939,17 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
        case IO_ERROR_HW_TIMEOUT:
                pm8001_dbg(pm8001_ha, IO, "IO_ERROR_HW_TIMEOUT\n");
                ts->resp = SAS_TASK_COMPLETE;
-               ts->stat = SAM_STAT_BUSY;
+               ts->stat = SAS_STAT_BUSY;
                break;
        case IO_XFER_ERROR_BREAK:
                pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_BREAK\n");
                ts->resp = SAS_TASK_COMPLETE;
-               ts->stat = SAM_STAT_BUSY;
+               ts->stat = SAS_STAT_BUSY;
                break;
        case IO_XFER_ERROR_PHY_NOT_READY:
                pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_PHY_NOT_READY\n");
                ts->resp = SAS_TASK_COMPLETE;
-               ts->stat = SAM_STAT_BUSY;
+               ts->stat = SAS_STAT_BUSY;
                break;
        case IO_OPEN_CNX_ERROR_PROTOCOL_NOT_SUPPORTED:
                pm8001_dbg(pm8001_ha, IO,
@@ -3710,7 +3710,7 @@ int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
        case IO_SUCCESS:
                pm8001_dbg(pm8001_ha, EH, "IO_SUCCESS\n");
                ts->resp = SAS_TASK_COMPLETE;
-               ts->stat = SAM_STAT_GOOD;
+               ts->stat = SAS_STAT_GOOD;
                break;
        case IO_NOT_VALID:
                pm8001_dbg(pm8001_ha, EH, "IO_NOT_VALID\n");
@@ -4355,7 +4355,7 @@ static int pm8001_chip_sata_req(struct pm8001_hba_info *pm8001_ha,
 
                        spin_lock_irqsave(&task->task_state_lock, flags);
                        ts->resp = SAS_TASK_COMPLETE;
-                       ts->stat = SAM_STAT_GOOD;
+                       ts->stat = SAS_STAT_GOOD;
                        task->task_state_flags &= ~SAS_TASK_STATE_PENDING;
                        task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
                        task->task_state_flags |= SAS_TASK_STATE_DONE;
drivers/scsi/pm8001/pm8001_sas.c +2 -2
index d28af413b93a..4367f4166704 100644
@@ -753,7 +753,7 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev,
                }
 
                if (task->task_status.resp == SAS_TASK_COMPLETE &&
-                       task->task_status.stat == SAM_STAT_GOOD) {
+                       task->task_status.stat == SAS_STAT_GOOD) {
                        res = TMF_RESP_FUNC_COMPLETE;
                        break;
                }
@@ -838,7 +838,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,
                }
 
                if (task->task_status.resp == SAS_TASK_COMPLETE &&
-                       task->task_status.stat == SAM_STAT_GOOD) {
+                       task->task_status.stat == SAS_STAT_GOOD) {
                        res = TMF_RESP_FUNC_COMPLETE;
                        break;
 
drivers/scsi/pm8001/pm80xx_hwi.c +7 -7
index 4e980830f9f5..4aec0405288f 100644
@@ -1952,7 +1952,7 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
                           param);
                if (param == 0) {
                        ts->resp = SAS_TASK_COMPLETE;
-                       ts->stat = SAM_STAT_GOOD;
+                       ts->stat = SAS_STAT_GOOD;
                } else {
                        ts->resp = SAS_TASK_COMPLETE;
                        ts->stat = SAS_PROTO_RESPONSE;
@@ -2487,7 +2487,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
                pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
                if (param == 0) {
                        ts->resp = SAS_TASK_COMPLETE;
-                       ts->stat = SAM_STAT_GOOD;
+                       ts->stat = SAS_STAT_GOOD;
                        /* check if response is for SEND READ LOG */
                        if (pm8001_dev &&
                                (pm8001_dev->id & NCQ_READ_LOG_FLAG)) {
@@ -3042,7 +3042,7 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
        case IO_SUCCESS:
                pm8001_dbg(pm8001_ha, IO, "IO_SUCCESS\n");
                ts->resp = SAS_TASK_COMPLETE;
-               ts->stat = SAM_STAT_GOOD;
+               ts->stat = SAS_STAT_GOOD;
                if (pm8001_dev)
                        atomic_dec(&pm8001_dev->running_req);
                if (pm8001_ha->smp_exp_mode == SMP_DIRECT) {
@@ -3084,17 +3084,17 @@ mpi_smp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
        case IO_ERROR_HW_TIMEOUT:
                pm8001_dbg(pm8001_ha, IO, "IO_ERROR_HW_TIMEOUT\n");
                ts->resp = SAS_TASK_COMPLETE;
-               ts->stat = SAM_STAT_BUSY;
+               ts->stat = SAS_STAT_BUSY;
                break;
        case IO_XFER_ERROR_BREAK:
                pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_BREAK\n");
                ts->resp = SAS_TASK_COMPLETE;
-               ts->stat = SAM_STAT_BUSY;
+               ts->stat = SAS_STAT_BUSY;
                break;
        case IO_XFER_ERROR_PHY_NOT_READY:
                pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_PHY_NOT_READY\n");
                ts->resp = SAS_TASK_COMPLETE;
-               ts->stat = SAM_STAT_BUSY;
+               ts->stat = SAS_STAT_BUSY;
                break;
        case IO_OPEN_CNX_ERROR_PROTOCOL_NOT_SUPPORTED:
                pm8001_dbg(pm8001_ha, IO,
@@ -4699,7 +4699,7 @@ static int pm80xx_chip_sata_req(struct pm8001_hba_info *pm8001_ha,
 
                        spin_lock_irqsave(&task->task_state_lock, flags);
                        ts->resp = SAS_TASK_COMPLETE;
-                       ts->stat = SAM_STAT_GOOD;
+                       ts->stat = SAS_STAT_GOOD;
                        task->task_state_flags &= ~SAS_TASK_STATE_PENDING;
                        task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
                        task->task_state_flags |= SAS_TASK_STATE_DONE;
include/scsi/libsas.h +9 -3
index 9271d7a49b90..e68327fa4835 100644
@@ -474,10 +474,16 @@ enum service_response {
 };
 
 enum exec_status {
-       /* The SAM_STAT_.. codes fit in the lower 6 bits, alias some of
-        * them here to silence 'case value not in enumerated type' warnings
+       /*
+        * Values 0..0x7f are used to return the SAM_STAT_* codes.  To avoid
+        * 'case value not in enumerated type' compiler warnings every value
+        * returned through the exec_status enum needs an alias with the SAS_
+        * prefix here.
         */
-       __SAM_STAT_CHECK_CONDITION = SAM_STAT_CHECK_CONDITION,
+       SAS_STAT_GOOD = SAM_STAT_GOOD,
+       SAS_STAT_BUSY = SAM_STAT_BUSY,
+       SAS_STAT_TASK_ABORTED = SAM_STAT_TASK_ABORTED,
+       SAS_STAT_CHECK_CONDITION = SAM_STAT_CHECK_CONDITION,
 
        SAS_DEV_NO_RESPONSE = 0x80,
        SAS_DATA_UNDERRUN,
Reviewed-by on v2 1/3
#3 lore raw

Re: [PATCH v2 1/3] libsas: Introduce more SAM status code aliases in enum exec_status

In reply to Bart Van Assche
Quoted 11 lines · Bart Van Assche

index 9271d7a49b90..e68327fa4835 100644

include/scsi/libsas.h +2 -2
@@ -474,10 +474,16 @@ enum service_response {
  };
 
  enum exec_status {
-	/* The SAM_STAT_.. codes fit in the lower 6 bits, alias some of
-	 * them here to silence 'case value not in enumerated type' warnings
+	/*
+	 * Values 0..0x7f are used to return the SAM_STAT_* codes.  To avoid

include/scsi/libsas.h enum service_response { · line 487

Quoted 10 lines
include/scsi/libsas.h +7 -1
+	 * 'case value not in enumerated type' compiler warnings every value
+	 * returned through the exec_status enum needs an alias with the SAS_
+	 * prefix here.
  	 */
-	__SAM_STAT_CHECK_CONDITION = SAM_STAT_CHECK_CONDITION,
+	SAS_STAT_GOOD = SAM_STAT_GOOD,
+	SAS_STAT_BUSY = SAM_STAT_BUSY,
+	SAS_STAT_TASK_ABORTED = SAM_STAT_TASK_ABORTED,
+	SAS_STAT_CHECK_CONDITION = SAM_STAT_CHECK_CONDITION,
 

Personally I prefer SAS_SAM_STAT_xxx, as Christoph mentioned in v1. This helps us know the SAS error codes are aliased from the SAM error codes. And only SAS_STAT_CHECK_CONDITION becomes long, with that suggestion.

I know that you did ask about this solution in v1 series, without reply - sorry.

Ignoring this preference, it looks ok:

#4 lore raw

PATCH v2 2/3 Introduce enums for the SAM, message, host and driver status codes

In reply to Bart Van Assche

Make it possible for the compiler to verify whether SAM, message, host and driver status codes are used correctly.

Cc Hannes Reinecke <[email protected]>
Cc John Garry <[email protected]>
---
 drivers/scsi/constants.c           |  4 +-
 drivers/target/target_core_pscsi.c |  2 +-
 include/scsi/scsi.h                | 81 +--------------------------
 include/scsi/scsi_proto.h          | 24 ++++----
 include/scsi/scsi_status.h         | 89 ++++++++++++++++++++++++++++++
 5 files changed, 107 insertions(+), 93 deletions(-)
 create mode 100644 include/scsi/scsi_status.h
drivers/scsi/constants.c +2 -2
index 84d73f57292b..28ef83868478 100644
@@ -412,8 +412,8 @@ static const char * const driverbyte_table[]={
 
 const char *scsi_hostbyte_string(int result)
 {
+	enum scsi_host_status hb = host_byte(result);
 	const char *hb_string = NULL;
-	int hb = host_byte(result);
 
 	if (hb < ARRAY_SIZE(hostbyte_table))
 		hb_string = hostbyte_table[hb];
@@ -423,8 +423,8 @@ EXPORT_SYMBOL(scsi_hostbyte_string);
 
 const char *scsi_driverbyte_string(int result)
 {
+	enum scsi_driver_status db = driver_byte(result);
 	const char *db_string = NULL;
-	int db = driver_byte(result);
 
 	if (db < ARRAY_SIZE(driverbyte_table))
 		db_string = driverbyte_table[db];
drivers/target/target_core_pscsi.c +1 -1
index f2a11414366d..6e08673dc583 100644
@@ -1044,7 +1044,7 @@ static void pscsi_req_done(struct request *req, blk_status_t status)
 	struct se_cmd *cmd = req->end_io_data;
 	struct pscsi_plugin_task *pt = cmd->priv;
 	int result = scsi_req(req)->result;
-	u8 scsi_status = status_byte(result) << 1;
+	enum sam_status scsi_status = status_byte(result) << 1;
 
 	if (scsi_status != SAM_STAT_GOOD) {
 		pr_debug("PSCSI Status Byte exception at cmd: %p CDB:"
include/scsi/scsi.h +2 -79

100 lines not on this page · raw message

include/scsi/scsi_proto.h +13 -11
index 5c106c4f249e..84d4a3a14963 100644
@@ -190,17 +190,19 @@ struct scsi_varlen_cdb_hdr {
  *  SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
  *  T10/1561-D Revision 4 Draft dated 7th November 2002.
  */
-#define SAM_STAT_GOOD            0x00
-#define SAM_STAT_CHECK_CONDITION 0x02
-#define SAM_STAT_CONDITION_MET   0x04
-#define SAM_STAT_BUSY            0x08
-#define SAM_STAT_INTERMEDIATE    0x10
-#define SAM_STAT_INTERMEDIATE_CONDITION_MET 0x14
-#define SAM_STAT_RESERVATION_CONFLICT 0x18
-#define SAM_STAT_COMMAND_TERMINATED 0x22	/* obsolete in SAM-3 */
-#define SAM_STAT_TASK_SET_FULL   0x28
-#define SAM_STAT_ACA_ACTIVE      0x30
-#define SAM_STAT_TASK_ABORTED    0x40
+enum sam_status {
+	SAM_STAT_GOOD				= 0x00,
+	SAM_STAT_CHECK_CONDITION		= 0x02,
+	SAM_STAT_CONDITION_MET			= 0x04,
+	SAM_STAT_BUSY				= 0x08,
+	SAM_STAT_INTERMEDIATE			= 0x10,
+	SAM_STAT_INTERMEDIATE_CONDITION_MET	= 0x14,
+	SAM_STAT_RESERVATION_CONFLICT		= 0x18,
+	SAM_STAT_COMMAND_TERMINATED		= 0x22,	/* obsolete in SAM-3 */
+	SAM_STAT_TASK_SET_FULL			= 0x28,
+	SAM_STAT_ACA_ACTIVE			= 0x30,
+	SAM_STAT_TASK_ABORTED			= 0x40,
+};
 
 /*
  *  Status codes. These are deprecated as they are shifted 1 bit right
include/scsi/scsi_status.h new file +89 -0

89 lines not on this page · raw message

Reviewed-by on v2 2/3
#5 lore raw

Re: [PATCH v2 2/3] Introduce enums for the SAM, message, host and driver status codes

Quoted 6 lines · Bart Van Assche

Make it possible for the compiler to verify whether SAM, message, host and driver status codes are used correctly.

Cc Hannes Reinecke <[email protected]>
Cc John Garry <[email protected]>

Changing to enums seems a sensible change, so, FWIW:

Do we have an example of where the compiler would catch an incorrect usage / mismatch?

#6 lore raw

Re: [PATCH v2 2/3] Introduce enums for the SAM, message, host and driver status codes

Quoted 2 lines · John Garry

Do we have an example of where the compiler would catch an incorrect usage / mismatch?

If I remember correctly some time ago Hannes fixed multiple LLDs that assigned incorrect values to scsi_cmd->result. I'd like to modify the type of struct scsi_cmnd.result such that the compiler can verify whether the proper enum type is assigned to each SCSI result subcomponent.

Bart.

#7 lore raw

PATCH v2 3/3 Change the type of the second argument of scsi_host_complete_all_commands()

In reply to Bart Van Assche

Allow the compiler to verify the type of the second argument passed to scsi_host_complete_all_commands().

Cc Hannes Reinecke <[email protected]>
Cc John Garry <[email protected]>
---
 drivers/scsi/hosts.c     | 8 +++++---
 include/scsi/scsi_host.h | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/scsi/hosts.c +5 -3
index ba72bd4202a2..145e5672397a 100644
@@ -652,10 +652,11 @@ EXPORT_SYMBOL_GPL(scsi_flush_work);
 static bool complete_all_cmds_iter(struct request *rq, void *data, bool rsvd)
 {
 	struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(rq);
-	int status = *(int *)data;
+	enum scsi_host_status status = *(enum scsi_host_status *)data;
 
 	scsi_dma_unmap(scmd);
-	scmd->result = status << 16;
+	scmd->result = 0;
+	set_host_byte(scmd, status);
 	scmd->scsi_done(scmd);
 	return true;
 }
@@ -670,7 +671,8 @@ static bool complete_all_cmds_iter(struct request *rq, void *data, bool rsvd)
  * caller to ensure that concurrent I/O submission and/or
  * completion is stopped when calling this function.
  */
-void scsi_host_complete_all_commands(struct Scsi_Host *shost, int status)
+void scsi_host_complete_all_commands(struct Scsi_Host *shost,
+				     enum scsi_host_status status)
 {
 	blk_mq_tagset_busy_iter(&shost->tag_set, complete_all_cmds_iter,
 				&status);
include/scsi/scsi_host.h +1 -1
index d0bf88d77f02..75363707b73f 100644
@@ -764,7 +764,7 @@ extern void scsi_host_put(struct Scsi_Host *t);
 extern struct Scsi_Host *scsi_host_lookup(unsigned short);
 extern const char *scsi_host_state_name(enum scsi_host_state);
 extern void scsi_host_complete_all_commands(struct Scsi_Host *shost,
-					    int status);
+					    enum scsi_host_status status);
 
 static inline int __must_check scsi_add_host(struct Scsi_Host *host,
 					     struct device *dev)