diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-11-21 10:53:47 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-11-21 10:53:47 -0700 |
| commit | 866ca95da5e5c4fad59f1b08254168284bd6a911 (patch) | |
| tree | d5cc20b92cd390862c40619a0d702ce044fa3598 /include | |
| parent | ad512f2023b387d5c3c3624342c2b11de848b491 (diff) | |
| parent | 6c6aa2f26c6813af38d88718881c0307bb9a54c0 (diff) | |
| download | linux-866ca95da5e5c4fad59f1b08254168284bd6a911.tar.bz2 | |
Merge branch 'nvme-5.5' of git://git.infradead.org/nvme into for-5.5/drivers-post
Pull NVMe changes from Keith:
"- The only new feature is the optional hwmon support for nvme (Guenter
and Akinobu)
- A universal work-around for controllers reading discard payloads
beyond the range boundary (Eduard)
- Chaitanya graciously agreed to share the target driver maintenance"
* 'nvme-5.5' of git://git.infradead.org/nvme:
nvme: hwmon: add quirk to avoid changing temperature threshold
nvme: hwmon: provide temperature min and max values for each sensor
nvmet: add another maintainer
nvme: Discard workaround for non-conformant devices
nvme: Add hardware monitoring support
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nvme.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 3eca4f7d8510..3d5189f46cb1 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -804,6 +804,12 @@ struct nvme_write_zeroes_cmd { /* Features */ +enum { + NVME_TEMP_THRESH_MASK = 0xffff, + NVME_TEMP_THRESH_SELECT_SHIFT = 16, + NVME_TEMP_THRESH_TYPE_UNDER = 0x100000, +}; + struct nvme_feat_auto_pst { __le64 entries[32]; }; |