Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c473a9d authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Christoph Hellwig
Browse files

nvme/scsi: Remove START STOP emulation 



Now that the broken power state control is gone, it appears to serve
no purpose.  Just delete it.  NVME devices don't have a concept of
started vs stopped anyway.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent ff13b39e

drivers/nvme/host/scsi.c

+0 −27
Original line number Diff line number Diff line
@@ -2160,30 +2160,6 @@ static int nvme_trans_synchronize_cache(struct nvme_ns *ns, 
	return nvme_trans_status_code(hdr, nvme_sc);

}



static int nvme_trans_start_stop(struct nvme_ns *ns, struct sg_io_hdr *hdr,

							u8 *cmd)

{

	u8 immed, no_flush;



	immed = cmd[1] & 0x01;

	no_flush = cmd[4] & 0x04;



	if (immed != 0) {

		return nvme_trans_completion(hdr, SAM_STAT_CHECK_CONDITION,

					ILLEGAL_REQUEST, SCSI_ASC_INVALID_CDB,

					SCSI_ASCQ_CAUSE_NOT_REPORTABLE);

	} else {

		if (no_flush == 0) {

			/* Issue NVME FLUSH command prior to START STOP UNIT */

			int res = nvme_trans_synchronize_cache(ns, hdr);

			if (res)

				return res;

		}



		return 0;

	}

}



static int nvme_trans_format_unit(struct nvme_ns *ns, struct sg_io_hdr *hdr,

							u8 *cmd)

{
@@ -2439,9 +2415,6 @@ static int nvme_scsi_translate(struct nvme_ns *ns, struct sg_io_hdr *hdr) 
	case SECURITY_PROTOCOL_OUT:

		retcode = nvme_trans_security_protocol(ns, hdr, cmd);

		break;

	case START_STOP:

		retcode = nvme_trans_start_stop(ns, hdr, cmd);

		break;

	case SYNCHRONIZE_CACHE:

		retcode = nvme_trans_synchronize_cache(ns, hdr);

		break;