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

Commit f8ebf840 authored by Vishal Verma's avatar Vishal Verma Committed by Matthew Wilcox
Browse files

NVMe: Add definitions for format command 



The SCSI emulation has the ability to send format commands, so we need
to add the definition of the command.  Also add a missing error code.

Signed-off-by: default avatarVishal Verma <vishal.l.verma@intel.com>
Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
parent 13c3b0fc

drivers/block/nvme-core.c

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static inline void _nvme_check_size(void) 
	BUILD_BUG_ON(sizeof(struct nvme_create_sq) != 64);

	BUILD_BUG_ON(sizeof(struct nvme_delete_queue) != 64);

	BUILD_BUG_ON(sizeof(struct nvme_features) != 64);

	BUILD_BUG_ON(sizeof(struct nvme_format_cmd) != 64);

	BUILD_BUG_ON(sizeof(struct nvme_command) != 64);

	BUILD_BUG_ON(sizeof(struct nvme_id_ctrl) != 4096);

	BUILD_BUG_ON(sizeof(struct nvme_id_ns) != 4096);

include/linux/nvme.h

+12 −0
Original line number Diff line number Diff line
@@ -393,6 +393,16 @@ struct nvme_download_firmware { 
	__u32			rsvd12[4];

};



struct nvme_format_cmd {

	__u8			opcode;

	__u8			flags;

	__u16			command_id;

	__le32			nsid;

	__u64			rsvd2[4];

	__le32			cdw10;

	__u32			rsvd11[5];

};



struct nvme_command {

	union {

		struct nvme_common_command common;
@@ -403,6 +413,7 @@ struct nvme_command { 
		struct nvme_create_sq create_sq;

		struct nvme_delete_queue delete_queue;

		struct nvme_download_firmware dlfw;

		struct nvme_format_cmd format;

		struct nvme_dsm_cmd dsm;

	};

};
@@ -420,6 +431,7 @@ enum { 
	NVME_SC_FUSED_FAIL		= 0x9,

	NVME_SC_FUSED_MISSING		= 0xa,

	NVME_SC_INVALID_NS		= 0xb,

	NVME_SC_CMD_SEQ_ERROR		= 0xc,

	NVME_SC_LBA_RANGE		= 0x80,

	NVME_SC_CAP_EXCEEDED		= 0x81,

	NVME_SC_NS_NOT_READY		= 0x82,