diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-05 18:53:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-05 18:53:26 -0500 |
commit | 8352650a5c1a3cd75476a25aaae8b1c6ade1c3f8 (patch) | |
tree | 85abee4f2216f5f5d806a76c35def6e90be45d82 /include | |
parent | 71c27a8c67e85b216f150696b04f698bff9256fa (diff) | |
parent | 9ac27090f61ea6735a62b0a98c7669c833bcdc09 (diff) |
Merge git://git.infradead.org/users/willy/linux-nvme
Pull NVMe driver update from Matthew Wilcox:
"Looks like I missed the merge window ... but these are almost all
bugfixes anyway (the ones that aren't have been baking for months)"
* git://git.infradead.org/users/willy/linux-nvme:
NVMe: Namespace use after free on surprise removal
NVMe: Correct uses of INIT_WORK
NVMe: Include device and queue numbers in interrupt name
NVMe: Add a pci_driver shutdown method
NVMe: Disable admin queue on init failure
NVMe: Dynamically allocate partition numbers
NVMe: Async IO queue deletion
NVMe: Surprise removal handling
NVMe: Abort timed out commands
NVMe: Schedule reset for failed controllers
NVMe: Device resume error handling
NVMe: Cache dev->pci_dev in a local pointer
NVMe: Fix lockdep warnings
NVMe: compat SG_IO ioctl
NVMe: remove deprecated IRQF_DISABLED
NVMe: Avoid shift operation when writing cq head doorbell
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nvme.h | 6 | ||||
-rw-r--r-- | include/uapi/linux/nvme.h | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 26ebcf41c213..69ae03f6eb15 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h | |||
@@ -80,13 +80,14 @@ struct nvme_dev { | |||
80 | struct dma_pool *prp_small_pool; | 80 | struct dma_pool *prp_small_pool; |
81 | int instance; | 81 | int instance; |
82 | int queue_count; | 82 | int queue_count; |
83 | int db_stride; | 83 | u32 db_stride; |
84 | u32 ctrl_config; | 84 | u32 ctrl_config; |
85 | struct msix_entry *entry; | 85 | struct msix_entry *entry; |
86 | struct nvme_bar __iomem *bar; | 86 | struct nvme_bar __iomem *bar; |
87 | struct list_head namespaces; | 87 | struct list_head namespaces; |
88 | struct kref kref; | 88 | struct kref kref; |
89 | struct miscdevice miscdev; | 89 | struct miscdevice miscdev; |
90 | struct work_struct reset_work; | ||
90 | char name[12]; | 91 | char name[12]; |
91 | char serial[20]; | 92 | char serial[20]; |
92 | char model[40]; | 93 | char model[40]; |
@@ -94,6 +95,8 @@ struct nvme_dev { | |||
94 | u32 max_hw_sectors; | 95 | u32 max_hw_sectors; |
95 | u32 stripe_size; | 96 | u32 stripe_size; |
96 | u16 oncs; | 97 | u16 oncs; |
98 | u16 abort_limit; | ||
99 | u8 initialized; | ||
97 | }; | 100 | }; |
98 | 101 | ||
99 | /* | 102 | /* |
@@ -165,6 +168,7 @@ int nvme_set_features(struct nvme_dev *dev, unsigned fid, unsigned dword11, | |||
165 | struct sg_io_hdr; | 168 | struct sg_io_hdr; |
166 | 169 | ||
167 | int nvme_sg_io(struct nvme_ns *ns, struct sg_io_hdr __user *u_hdr); | 170 | int nvme_sg_io(struct nvme_ns *ns, struct sg_io_hdr __user *u_hdr); |
171 | int nvme_sg_io32(struct nvme_ns *ns, unsigned long arg); | ||
168 | int nvme_sg_get_version_num(int __user *ip); | 172 | int nvme_sg_get_version_num(int __user *ip); |
169 | 173 | ||
170 | #endif /* _LINUX_NVME_H */ | 174 | #endif /* _LINUX_NVME_H */ |
diff --git a/include/uapi/linux/nvme.h b/include/uapi/linux/nvme.h index 989c04e0c563..e5ab62201119 100644 --- a/include/uapi/linux/nvme.h +++ b/include/uapi/linux/nvme.h | |||
@@ -350,6 +350,16 @@ struct nvme_delete_queue { | |||
350 | __u32 rsvd11[5]; | 350 | __u32 rsvd11[5]; |
351 | }; | 351 | }; |
352 | 352 | ||
353 | struct nvme_abort_cmd { | ||
354 | __u8 opcode; | ||
355 | __u8 flags; | ||
356 | __u16 command_id; | ||
357 | __u32 rsvd1[9]; | ||
358 | __le16 sqid; | ||
359 | __u16 cid; | ||
360 | __u32 rsvd11[5]; | ||
361 | }; | ||
362 | |||
353 | struct nvme_download_firmware { | 363 | struct nvme_download_firmware { |
354 | __u8 opcode; | 364 | __u8 opcode; |
355 | __u8 flags; | 365 | __u8 flags; |
@@ -384,6 +394,7 @@ struct nvme_command { | |||
384 | struct nvme_download_firmware dlfw; | 394 | struct nvme_download_firmware dlfw; |
385 | struct nvme_format_cmd format; | 395 | struct nvme_format_cmd format; |
386 | struct nvme_dsm_cmd dsm; | 396 | struct nvme_dsm_cmd dsm; |
397 | struct nvme_abort_cmd abort; | ||
387 | }; | 398 | }; |
388 | }; | 399 | }; |
389 | 400 | ||