iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: Correct NVMF enum values to match NVMe-oF rev 1.0

Browse Source 
The enum values for QPTYPE, PRTYPE and CMS are off by 1 from the
values defined in figure 42 of the NVM Express over Fabrics 1.0:

    http://www.nvmexpress.org/wp-content/uploads/NVMe_over_Fabrics_1_0_Gold_20160605-1.pdf

Fix our enums to match the final spec.

Signed-off-by: Roland Dreier <roland@purestorage.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
This commit is contained in:
Roland Dreier 2017-03-01 18:22:01 -08:00 committed by Sagi Grimberg
parent ac77a0c463
commit bf17aa36c0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/linux/nvme.h
View File

@ -64,26 +64,26 @@ enum {
* RDMA_QPTYPE field * RDMA_QPTYPE field
*/ */
enum { enum {
NVMF_RDMA_QPTYPE_CONNECTED = 0, /* Reliable Connected */ NVMF_RDMA_QPTYPE_CONNECTED = 1, /* Reliable Connected */
NVMF_RDMA_QPTYPE_DATAGRAM = 1, /* Reliable Datagram */ NVMF_RDMA_QPTYPE_DATAGRAM = 2, /* Reliable Datagram */
}; };
/* RDMA QP Service Type codes for Discovery Log Page entry TSAS /* RDMA QP Service Type codes for Discovery Log Page entry TSAS
* RDMA_QPTYPE field * RDMA_QPTYPE field
*/ */
enum { enum {
NVMF_RDMA_PRTYPE_NOT_SPECIFIED = 0, /* No Provider Specified */ NVMF_RDMA_PRTYPE_NOT_SPECIFIED = 1, /* No Provider Specified */
NVMF_RDMA_PRTYPE_IB = 1, /* InfiniBand */ NVMF_RDMA_PRTYPE_IB = 2, /* InfiniBand */
NVMF_RDMA_PRTYPE_ROCE = 2, /* InfiniBand RoCE */ NVMF_RDMA_PRTYPE_ROCE = 3, /* InfiniBand RoCE */
NVMF_RDMA_PRTYPE_ROCEV2 = 3, /* InfiniBand RoCEV2 */ NVMF_RDMA_PRTYPE_ROCEV2 = 4, /* InfiniBand RoCEV2 */
NVMF_RDMA_PRTYPE_IWARP = 4, /* IWARP */ NVMF_RDMA_PRTYPE_IWARP = 5, /* IWARP */
}; };
/* RDMA Connection Management Service Type codes for Discovery Log Page /* RDMA Connection Management Service Type codes for Discovery Log Page
* entry TSAS RDMA_CMS field * entry TSAS RDMA_CMS field
*/ */
enum { enum {
NVMF_RDMA_CMS_RDMA_CM = 0, /* Sockets based enpoint addressing */ NVMF_RDMA_CMS_RDMA_CM = 1, /* Sockets based endpoint addressing */
}; };
#define NVMF_AQ_DEPTH 32 #define NVMF_AQ_DEPTH 32