diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2020-07-29 11:22:40 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-07-29 11:22:40 -0600 |
| commit | a9e8e18aaf914bf273ed63480c4c3d8dd626c95f (patch) | |
| tree | 4193e82a579b4c627ad5139f1b87258bd9d2e44d /include | |
| parent | bcache: use disk_{start,end}_io_acct() to count I/O for bcache device (diff) | |
| parent | nvme-loop: remove extra variable in create ctrl (diff) | |
| download | linux-dev-a9e8e18aaf914bf273ed63480c4c3d8dd626c95f.tar.xz linux-dev-a9e8e18aaf914bf273ed63480c4c3d8dd626c95f.zip | |
Merge branch 'nvme-5.9' of git://git.infradead.org/nvme into for-5.9/drivers
Pull NVMe updates from Christoph.
* 'nvme-5.9' of git://git.infradead.org/nvme: (30 commits)
nvme-loop: remove extra variable in create ctrl
nvme-loop: set ctrl state connecting after init
nvme-multipath: do not fall back to __nvme_find_path() for non-optimized paths
nvme-multipath: fix logic for non-optimized paths
nvme-rdma: fix controller reset hang during traffic
nvme-tcp: fix controller reset hang during traffic
nvmet: introduce the passthru Kconfig option
nvmet: introduce the passthru configfs interface
nvmet: Add passthru enable/disable helpers
nvmet: add passthru code to process commands
nvme: export nvme_find_get_ns() and nvme_put_ns()
nvme: introduce nvme_ctrl_get_by_path()
nvme: introduce nvme_execute_passthru_rq to call nvme_passthru_[start|end]()
nvme: create helper function to obtain command effects
nvme: clear any SGL flags in passthru commands
nvmet-fc: remove redundant del_work_active flag
nvmet-fc: check successful reference in nvmet_fc_find_target_assoc
nvme-fc: set max_segments to lldd max value
nvme-fc: drop a duplicated word in a comment
nvme-hwmon: log the controller device name
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nvme-fc-driver.h | 2 | ||||
| -rw-r--r-- | include/linux/nvme.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/nvme-fc-driver.h b/include/linux/nvme-fc-driver.h index 41e7795a3ee4..2a38f2b477a5 100644 --- a/include/linux/nvme-fc-driver.h +++ b/include/linux/nvme-fc-driver.h @@ -672,7 +672,7 @@ enum { * Values set by the LLDD indicating completion status of the FCP operation. * Must be set prior to calling the done() callback. * @transferred_length: amount of DATA_OUT payload data received by a - * a WRITEDATA operation. If not a WRITEDATA operation, value must + * WRITEDATA operation. If not a WRITEDATA operation, value must * be set to 0. Should equal transfer_length on success. * @fcp_error: status of the FCP operation. Must be 0 on success; on failure * must be a NVME_SC_FC_xxxx value. diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 1643005d21e3..d92535997687 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -312,6 +312,7 @@ enum { NVME_CTRL_ONCS_WRITE_UNCORRECTABLE = 1 << 1, NVME_CTRL_ONCS_DSM = 1 << 2, NVME_CTRL_ONCS_WRITE_ZEROES = 1 << 3, + NVME_CTRL_ONCS_RESERVATIONS = 1 << 5, NVME_CTRL_ONCS_TIMESTAMP = 1 << 6, NVME_CTRL_VWC_PRESENT = 1 << 0, NVME_CTRL_OACS_SEC_SUPP = 1 << 0, @@ -982,6 +983,7 @@ enum nvme_admin_opcode { nvme_admin_security_recv = 0x82, nvme_admin_sanitize_nvm = 0x84, nvme_admin_get_lba_status = 0x86, + nvme_admin_vendor_start = 0xC0, }; #define nvme_admin_opcode_name(opcode) { opcode, #opcode } @@ -1045,6 +1047,8 @@ enum { NVME_FEAT_RESV_MASK = 0x82, NVME_FEAT_RESV_PERSIST = 0x83, NVME_FEAT_WRITE_PROTECT = 0x84, + NVME_FEAT_VENDOR_START = 0xC0, + NVME_FEAT_VENDOR_END = 0xFF, NVME_LOG_ERROR = 0x01, NVME_LOG_SMART = 0x02, NVME_LOG_FW_SLOT = 0x03, |