summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew.r.wilcox@intel.com>2011-01-26 10:01:21 -0500
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2011-11-04 15:52:52 -0400
commit7b4fe9b1cb4b9a6f4ae23a12ef96d08d96e2a5da (patch)
treec5e89185b80fe59e2b66a5425816cfa5d430170c /include
parent36c14ed9caa957c686d4a48fd598a5ec2aa0331b (diff)
NVMe: Make nvme_common_command more featureful
Add prp1, prp2 and the metadata prp to the common command, since the fields are generally used this way. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/nvme.h20
1 files changed, 12 insertions, 8 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 9ba53584f722..1c0b5ef08959 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -142,6 +142,18 @@ enum nvme_opcode {
nvme_cmd_dsm = 0x09,
};
+struct nvme_common_command {
+ __u8 opcode;
+ __u8 flags;
+ __u16 command_id;
+ __le32 nsid;
+ __u64 rsvd2;
+ __le64 metadata;
+ __le64 prp1;
+ __le64 prp2;
+ __u32 rsvd10[6];
+};
+
struct nvme_rw_command {
__u8 opcode;
__u8 flags;
@@ -284,14 +296,6 @@ struct nvme_delete_queue {
__le32 rsvd11[5];
};
-struct nvme_common_command {
- __u8 opcode;
- __u8 flags;
- __u16 command_id;
- __le32 nsid;
- __u32 rsvd2[14];
-};
-
struct nvme_command {
union {
struct nvme_common_command common;