diff options
| author | Keith Busch <keith.busch@intel.com> | 2015-02-19 23:42:14 +0300 |
|---|---|---|
| committer | Keith Busch <keith.busch@intel.com> | 2015-02-20 02:15:35 +0300 |
| commit | 4f1982b4e262c45475a91b4253e9bc7f7c991c13 (patch) | |
| tree | 3d58e5f342f0c1dc3a01e85ff565e3496f099d3a /include/linux/nvme.h | |
| parent | e1e5e5641e6f271321aec257ed26a72715e4a8c2 (diff) | |
| download | linux-4f1982b4e262c45475a91b4253e9bc7f7c991c13.tar.xz | |
NVMe: Update SCSI Inquiry VPD 83h translation
The original translation created collisions on Inquiry VPD 83 for many
existing devices. Newer specifications provide other ways to translate
based on the device's version can be used to create unique identifiers.
Version 1.1 provides an EUI64 field that uniquely identifies each
namespace, and 1.2 added the longer NGUID field for the same reason.
Both follow the IEEE EUI format and readily translate to the SCSI device
identification EUI designator type 2h. For devices implementing either,
the translation will use this type, defaulting to the EUI64 8-byte type if
implemented then NGUID's 16 byte version if not. If neither are provided,
the 1.0 translation is used, and is updated to use the SCSI String format
to guarantee a unique identifier.
Knowing when to use the new fields depends on the nvme controller's
revision. The NVME_VS macro was not decoding this correctly, so that is
fixed in this patch and moved to a more appropriate place.
Since the Identify Namespace structure required an update for the NGUID
field, this patch adds the remaining new 1.2 fields to the structure.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Diffstat (limited to 'include/linux/nvme.h')
| -rw-r--r-- | include/linux/nvme.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index cca264db2478..1f062a9e521d 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -62,8 +62,6 @@ enum { NVME_CSTS_SHST_MASK = 3 << 2, }; -#define NVME_VS(major, minor) (major << 16 | minor) - extern unsigned char nvme_io_timeout; #define NVME_IO_TIMEOUT (nvme_io_timeout * HZ) |