Commit f2b1e9c6 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: core: Introduce scsi_build_sense() 

Introduce scsi_build_sense() as a wrapper around scsi_build_sense_buffer()
to format the buffer and set the correct SCSI status.

Link: https://lore.kernel.org/r/20210427083046.31620-8-hare@suse.de


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ced202f7

drivers/ata/libata-scsi.c

+2 −5
Original line number Diff line number Diff line
@@ -196,9 +196,7 @@ void ata_scsi_set_sense(struct ata_device *dev, struct scsi_cmnd *cmd, 
	if (!cmd)

		return;



	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;



	scsi_build_sense_buffer(d_sense, cmd->sense_buffer, sk, asc, ascq);

	scsi_build_sense(cmd, d_sense, sk, asc, ascq);

}



void ata_scsi_set_sense_information(struct ata_device *dev,
@@ -882,8 +880,7 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc) 
		 * ATA PASS-THROUGH INFORMATION AVAILABLE

		 * Always in descriptor format sense.

		 */

		scsi_build_sense_buffer(1, cmd->sense_buffer,

					RECOVERED_ERROR, 0, 0x1D);

		scsi_build_sense(cmd, 1, RECOVERED_ERROR, 0, 0x1D);

	}



	if ((cmd->sense_buffer[0] & 0x7f) >= 0x72) {

drivers/s390/scsi/zfcp_scsi.c

+1 −4
Original line number Diff line number Diff line
@@ -856,10 +856,7 @@ void zfcp_scsi_set_prot(struct zfcp_adapter *adapter) 
 */

void zfcp_scsi_dif_sense_error(struct scsi_cmnd *scmd, int ascq)

{

	scsi_build_sense_buffer(1, scmd->sense_buffer,

				ILLEGAL_REQUEST, 0x10, ascq);

	set_driver_byte(scmd, DRIVER_SENSE);

	scmd->result |= SAM_STAT_CHECK_CONDITION;

	scsi_build_sense(scmd, 1, ILLEGAL_REQUEST, 0x10, ascq);

	set_host_byte(scmd, DID_SOFT_ERROR);

}

drivers/scsi/3w-xxxx.c

+1 −1
Original line number Diff line number Diff line
@@ -1977,7 +1977,7 @@ static int tw_scsi_queue_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_c 
		printk(KERN_NOTICE "3w-xxxx: scsi%d: Unknown scsi opcode: 0x%x\n", tw_dev->host->host_no, *command);

		tw_dev->state[request_id] = TW_S_COMPLETED;

		tw_state_request_finish(tw_dev, request_id);

		scsi_build_sense_buffer(1, SCpnt->sense_buffer, ILLEGAL_REQUEST, 0x20, 0);

		scsi_build_sense(SCpnt, 1, ILLEGAL_REQUEST, 0x20, 0);

		done(SCpnt);

		retval = 0;

	}

drivers/scsi/libiscsi.c

+1 −4
Original line number Diff line number Diff line
@@ -829,10 +829,7 @@ static void iscsi_scsi_cmd_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 


		ascq = session->tt->check_protection(task, &sector);

		if (ascq) {

			sc->result = DRIVER_SENSE << 24 |

				     SAM_STAT_CHECK_CONDITION;

			scsi_build_sense_buffer(1, sc->sense_buffer,

						ILLEGAL_REQUEST, 0x10, ascq);

			scsi_build_sense(sc, 1, ILLEGAL_REQUEST, 0x10, ascq);

			scsi_set_sense_information(sc->sense_buffer,

						   SCSI_SENSE_BUFFERSIZE,

						   sector);

drivers/scsi/lpfc/lpfc_scsi.c

+18 −36
Original line number Diff line number Diff line
@@ -2896,10 +2896,8 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd) 
	}

out:

	if (err_type == BGS_GUARD_ERR_MASK) {

		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,

					0x10, 0x1);

		cmd->result = DRIVER_SENSE << 24 | DID_ABORT << 16 |

			      SAM_STAT_CHECK_CONDITION;

		scsi_build_sense(cmd, 1, ILLEGAL_REQUEST, 0x10, 0x1);

		set_host_byte(cmd, DID_ABORT);

		phba->bg_guard_err_cnt++;

		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG,

				"9069 BLKGRD: reftag %x grd_tag err %x != %x\n",
@@ -2907,10 +2905,8 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd) 
				sum, guard_tag);



	} else if (err_type == BGS_REFTAG_ERR_MASK) {

		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,

					0x10, 0x3);

		cmd->result = DRIVER_SENSE << 24 | DID_ABORT << 16 |

			      SAM_STAT_CHECK_CONDITION;

		scsi_build_sense(cmd, 1, ILLEGAL_REQUEST, 0x10, 0x3);

		set_host_byte(cmd, DID_ABORT);



		phba->bg_reftag_err_cnt++;

		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG,
@@ -2919,10 +2915,8 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd) 
				ref_tag, start_ref_tag);



	} else if (err_type == BGS_APPTAG_ERR_MASK) {

		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,

					0x10, 0x2);

		cmd->result = DRIVER_SENSE << 24 | DID_ABORT << 16 |

			      SAM_STAT_CHECK_CONDITION;

		scsi_build_sense(cmd, 1, ILLEGAL_REQUEST, 0x10, 0x2);

		set_host_byte(cmd, DID_ABORT);



		phba->bg_apptag_err_cnt++;

		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG,
@@ -2981,10 +2975,8 @@ lpfc_sli4_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd, 
	if (lpfc_bgs_get_guard_err(bgstat)) {

		ret = 1;



		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,

					0x10, 0x1);

		cmd->result = DRIVER_SENSE << 24 | DID_ABORT << 16 |

			      SAM_STAT_CHECK_CONDITION;

		scsi_build_sense(cmd, 1, ILLEGAL_REQUEST, 0x10, 0x1);

		set_host_byte(cmd, DID_ABORT);

		phba->bg_guard_err_cnt++;

		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG,

				"9059 BLKGRD: Guard Tag error in cmd"
@@ -2997,10 +2989,8 @@ lpfc_sli4_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd, 
	if (lpfc_bgs_get_reftag_err(bgstat)) {

		ret = 1;



		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,

					0x10, 0x3);

		cmd->result = DRIVER_SENSE << 24 | DID_ABORT << 16 |

			      SAM_STAT_CHECK_CONDITION;

		scsi_build_sense(cmd, 1, ILLEGAL_REQUEST, 0x10, 0x3);

		set_host_byte(cmd, DID_ABORT);



		phba->bg_reftag_err_cnt++;

		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG,
@@ -3014,10 +3004,8 @@ lpfc_sli4_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd, 
	if (lpfc_bgs_get_apptag_err(bgstat)) {

		ret = 1;



		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,

					0x10, 0x2);

		cmd->result = DRIVER_SENSE << 24 | DID_ABORT << 16 |

			      SAM_STAT_CHECK_CONDITION;

		scsi_build_sense(cmd, 1, ILLEGAL_REQUEST, 0x10, 0x2);

		set_host_byte(cmd, DID_ABORT);



		phba->bg_apptag_err_cnt++;

		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG,
@@ -3127,10 +3115,8 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd, 
	if (lpfc_bgs_get_guard_err(bgstat)) {

		ret = 1;



		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,

				0x10, 0x1);

		cmd->result = DRIVER_SENSE << 24 | DID_ABORT << 16 |

			      SAM_STAT_CHECK_CONDITION;

		scsi_build_sense(cmd, 1, ILLEGAL_REQUEST, 0x10, 0x1);

		set_host_byte(cmd, DID_ABORT);

		phba->bg_guard_err_cnt++;

		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG,

				"9055 BLKGRD: Guard Tag error in cmd "
@@ -3143,10 +3129,8 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd, 
	if (lpfc_bgs_get_reftag_err(bgstat)) {

		ret = 1;



		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,

				0x10, 0x3);

		cmd->result = DRIVER_SENSE << 24 | DID_ABORT << 16 |

			      SAM_STAT_CHECK_CONDITION;

		scsi_build_sense(cmd, 1, ILLEGAL_REQUEST, 0x10, 0x3);

		set_host_byte(cmd, DID_ABORT);



		phba->bg_reftag_err_cnt++;

		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG,
@@ -3160,10 +3144,8 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd, 
	if (lpfc_bgs_get_apptag_err(bgstat)) {

		ret = 1;



		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,

				0x10, 0x2);

		cmd->result = DRIVER_SENSE << 24 | DID_ABORT << 16 |

			      SAM_STAT_CHECK_CONDITION;

		scsi_build_sense(cmd, 1, ILLEGAL_REQUEST, 0x10, 0x2);

		set_host_byte(cmd, DID_ABORT);



		phba->bg_apptag_err_cnt++;

		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG,