| Message ID | 20200629182642.1170387-2-its@irrelevant.dk |
|---|---|
| State | New |
| Headers | show |
| Series | hw/block/nvme: bump to v1.3 | expand |
On Mon, 2020-06-29 at 20:26 +0200, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Add missing fields in the Identify Controller and Identify Namespace > data structures to bring them in line with NVMe v1.3. > > This also adds data structures and defines for SGL support which > requires a couple of trivial changes to the nvme block driver as well. > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > Acked-by: Fam Zheng <fam@euphon.net> > Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> > --- > block/nvme.c | 18 ++--- > hw/block/nvme.c | 12 ++-- > include/block/nvme.h | 154 ++++++++++++++++++++++++++++++++++++++----- > 3 files changed, 152 insertions(+), 32 deletions(-) > > diff --git a/block/nvme.c b/block/nvme.c > index eb2f54dd9dc9..29e90557c428 100644 > --- a/block/nvme.c > +++ b/block/nvme.c > @@ -446,7 +446,7 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp) > error_setg(errp, "Cannot map buffer for DMA"); > goto out; > } > - cmd.prp1 = cpu_to_le64(iova); > + cmd.dptr.prp1 = cpu_to_le64(iova); > > if (nvme_cmd_sync(bs, s->queues[0], &cmd)) { > error_setg(errp, "Failed to identify controller"); > @@ -545,7 +545,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) > } > cmd = (NvmeCmd) { > .opcode = NVME_ADM_CMD_CREATE_CQ, > - .prp1 = cpu_to_le64(q->cq.iova), > + .dptr.prp1 = cpu_to_le64(q->cq.iova), > .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | (n & 0xFFFF)), > .cdw11 = cpu_to_le32(0x3), > }; > @@ -556,7 +556,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) > } > cmd = (NvmeCmd) { > .opcode = NVME_ADM_CMD_CREATE_SQ, > - .prp1 = cpu_to_le64(q->sq.iova), > + .dptr.prp1 = cpu_to_le64(q->sq.iova), > .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | (n & 0xFFFF)), > .cdw11 = cpu_to_le32(0x1 | (n << 16)), > }; > @@ -904,16 +904,16 @@ try_map: > case 0: > abort(); > case 1: > - cmd->prp1 = pagelist[0]; > - cmd->prp2 = 0; > + cmd->dptr.prp1 = pagelist[0]; > + cmd->dptr.prp2 = 0; > break; > case 2: > - cmd->prp1 = pagelist[0]; > - cmd->prp2 = pagelist[1]; > + cmd->dptr.prp1 = pagelist[0]; > + cmd->dptr.prp2 = pagelist[1]; > break; > default: > - cmd->prp1 = pagelist[0]; > - cmd->prp2 = cpu_to_le64(req->prp_list_iova + sizeof(uint64_t)); > + cmd->dptr.prp1 = pagelist[0]; > + cmd->dptr.prp2 = cpu_to_le64(req->prp_list_iova + sizeof(uint64_t)); > break; > } > trace_nvme_cmd_map_qiov(s, cmd, req, qiov, entries); > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index 1aee042d4cb2..71b388aa0e20 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -397,8 +397,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, > NvmeRwCmd *rw = (NvmeRwCmd *)cmd; > uint32_t nlb = le32_to_cpu(rw->nlb) + 1; > uint64_t slba = le64_to_cpu(rw->slba); > - uint64_t prp1 = le64_to_cpu(rw->prp1); > - uint64_t prp2 = le64_to_cpu(rw->prp2); > + uint64_t prp1 = le64_to_cpu(rw->dptr.prp1); > + uint64_t prp2 = le64_to_cpu(rw->dptr.prp2); > > uint8_t lba_index = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); > uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds; > @@ -795,8 +795,8 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n) > > static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) > { > - uint64_t prp1 = le64_to_cpu(cmd->prp1); > - uint64_t prp2 = le64_to_cpu(cmd->prp2); > + uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); > + uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); > > uint64_t timestamp = nvme_get_timestamp(n); > > @@ -834,8 +834,8 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) > { > uint16_t ret; > uint64_t timestamp; > - uint64_t prp1 = le64_to_cpu(cmd->prp1); > - uint64_t prp2 = le64_to_cpu(cmd->prp2); > + uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); > + uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); > > ret = nvme_dma_write_prp(n, (uint8_t *)×tamp, > sizeof(timestamp), prp1, prp2); > diff --git a/include/block/nvme.h b/include/block/nvme.h > index 1720ee1d5158..6d1fa6ff2228 100644 > --- a/include/block/nvme.h > +++ b/include/block/nvme.h > @@ -377,15 +377,53 @@ enum NvmePmrmscMask { > #define NVME_PMRMSC_SET_CBA(pmrmsc, val) \ > (pmrmsc |= (uint64_t)(val & PMRMSC_CBA_MASK) << PMRMSC_CBA_SHIFT) > > +enum NvmeSglDescriptorType { > + NVME_SGL_DESCR_TYPE_DATA_BLOCK = 0x0, > + NVME_SGL_DESCR_TYPE_BIT_BUCKET = 0x1, > + NVME_SGL_DESCR_TYPE_SEGMENT = 0x2, > + NVME_SGL_DESCR_TYPE_LAST_SEGMENT = 0x3, > + NVME_SGL_DESCR_TYPE_KEYED_DATA_BLOCK = 0x4, > + > + NVME_SGL_DESCR_TYPE_VENDOR_SPECIFIC = 0xf, > +}; > + > +enum NvmeSglDescriptorSubtype { > + NVME_SGL_DESCR_SUBTYPE_ADDRESS = 0x0, > +}; > + > +typedef struct NvmeSglDescriptor { > + uint64_t addr; > + uint32_t len; > + uint8_t rsvd[3]; > + uint8_t type; > +} NvmeSglDescriptor; > + > +#define NVME_SGL_TYPE(type) ((type >> 4) & 0xf) > +#define NVME_SGL_SUBTYPE(type) (type & 0xf) > + > +typedef union NvmeCmdDptr { > + struct { > + uint64_t prp1; > + uint64_t prp2; > + }; > + > + NvmeSglDescriptor sgl; > +} NvmeCmdDptr; > + > +enum NvmePsdt { > + PSDT_PRP = 0x0, > + PSDT_SGL_MPTR_CONTIGUOUS = 0x1, > + PSDT_SGL_MPTR_SGL = 0x2, > +}; > + > typedef struct NvmeCmd { > uint8_t opcode; > - uint8_t fuse; > + uint8_t flags; > uint16_t cid; > uint32_t nsid; > uint64_t res1; > uint64_t mptr; > - uint64_t prp1; > - uint64_t prp2; > + NvmeCmdDptr dptr; > uint32_t cdw10; > uint32_t cdw11; > uint32_t cdw12; > @@ -394,6 +432,9 @@ typedef struct NvmeCmd { > uint32_t cdw15; > } NvmeCmd; > > +#define NVME_CMD_FLAGS_FUSE(flags) (flags & 0x3) > +#define NVME_CMD_FLAGS_PSDT(flags) ((flags >> 6) & 0x3) > + > enum NvmeAdminCommands { > NVME_ADM_CMD_DELETE_SQ = 0x00, > NVME_ADM_CMD_CREATE_SQ = 0x01, > @@ -493,8 +534,7 @@ typedef struct NvmeRwCmd { > uint32_t nsid; > uint64_t rsvd2; > uint64_t mptr; > - uint64_t prp1; > - uint64_t prp2; > + NvmeCmdDptr dptr; > uint64_t slba; > uint16_t nlb; > uint16_t control; > @@ -534,8 +574,7 @@ typedef struct NvmeDsmCmd { > uint16_t cid; > uint32_t nsid; > uint64_t rsvd2[2]; > - uint64_t prp1; > - uint64_t prp2; > + NvmeCmdDptr dptr; > uint32_t nr; > uint32_t attributes; > uint32_t rsvd12[4]; > @@ -599,6 +638,12 @@ enum NvmeStatusCodes { > NVME_CMD_ABORT_MISSING_FUSE = 0x000a, > NVME_INVALID_NSID = 0x000b, > NVME_CMD_SEQ_ERROR = 0x000c, > + NVME_INVALID_SGL_SEG_DESCR = 0x000d, > + NVME_INVALID_NUM_SGL_DESCRS = 0x000e, > + NVME_DATA_SGL_LEN_INVALID = 0x000f, > + NVME_MD_SGL_LEN_INVALID = 0x0010, > + NVME_SGL_DESCR_TYPE_INVALID = 0x0011, > + NVME_INVALID_USE_OF_CMB = 0x0012, > NVME_LBA_RANGE = 0x0080, > NVME_CAP_EXCEEDED = 0x0081, > NVME_NS_NOT_READY = 0x0082, > @@ -687,7 +732,7 @@ enum NvmeSmartWarn { > NVME_SMART_FAILED_VOLATILE_MEDIA = 1 << 4, > }; > > -enum LogIdentifier { > +enum NvmeLogIdentifier { > NVME_LOG_ERROR_INFO = 0x01, > NVME_LOG_SMART_INFO = 0x02, > NVME_LOG_FW_SLOT_INFO = 0x03, > @@ -711,6 +756,7 @@ enum { > NVME_ID_CNS_NS = 0x0, > NVME_ID_CNS_CTRL = 0x1, > NVME_ID_CNS_NS_ACTIVE_LIST = 0x2, > + NVME_ID_CNS_NS_DESCR_LIST = 0x3, > }; > > typedef struct NvmeIdCtrl { > @@ -723,7 +769,15 @@ typedef struct NvmeIdCtrl { > uint8_t ieee[3]; > uint8_t cmic; > uint8_t mdts; > - uint8_t rsvd255[178]; > + uint16_t cntlid; > + uint32_t ver; > + uint32_t rtd3r; > + uint32_t rtd3e; > + uint32_t oaes; > + uint32_t ctratt; > + uint8_t rsvd100[12]; > + uint8_t fguid[16]; > + uint8_t rsvd128[128]; > uint16_t oacs; > uint8_t acl; > uint8_t aerl; > @@ -731,10 +785,28 @@ typedef struct NvmeIdCtrl { > uint8_t lpa; > uint8_t elpe; > uint8_t npss; > - uint8_t rsvd511[248]; > + uint8_t avscc; > + uint8_t apsta; > + uint16_t wctemp; > + uint16_t cctemp; > + uint16_t mtfa; > + uint32_t hmpre; > + uint32_t hmmin; > + uint8_t tnvmcap[16]; > + uint8_t unvmcap[16]; > + uint32_t rpmbs; > + uint16_t edstt; > + uint8_t dsto; > + uint8_t fwug; > + uint16_t kas; > + uint16_t hctma; > + uint16_t mntmt; > + uint16_t mxtmt; > + uint32_t sanicap; > + uint8_t rsvd332[180]; > uint8_t sqes; > uint8_t cqes; > - uint16_t rsvd515; > + uint16_t maxcmd; > uint32_t nn; > uint16_t oncs; > uint16_t fuses; > @@ -742,8 +814,14 @@ typedef struct NvmeIdCtrl { > uint8_t vwc; > uint16_t awun; > uint16_t awupf; > - uint8_t rsvd703[174]; > - uint8_t rsvd2047[1344]; > + uint8_t nvscc; > + uint8_t rsvd531; > + uint16_t acwu; > + uint8_t rsvd534[2]; > + uint32_t sgls; > + uint8_t rsvd540[228]; > + uint8_t subnqn[256]; > + uint8_t rsvd1024[1024]; > NvmePSD psd[32]; > uint8_t vs[1024]; > } NvmeIdCtrl; > @@ -769,6 +847,16 @@ enum NvmeIdCtrlOncs { > #define NVME_CTRL_CQES_MIN(cqes) ((cqes) & 0xf) > #define NVME_CTRL_CQES_MAX(cqes) (((cqes) >> 4) & 0xf) > > +#define NVME_CTRL_SGLS_SUPPORTED_MASK (0x3 << 0) NVME_CTRL_SGL_SUPPORT_MASK? > +#define NVME_CTRL_SGLS_SUPPORTED_NO_ALIGNMENT (0x1 << 0) > +#define NVME_CTRL_SGLS_SUPPORTED_DWORD_ALIGNMENT (0x1 << 1) These could be shortened to ..._ALIGN/_NO_ALIGN > +#define NVME_CTRL_SGLS_KEYED (0x1 << 2) > +#define NVME_CTRL_SGLS_BITBUCKET (0x1 << 16) > +#define NVME_CTRL_SGLS_MPTR_CONTIGUOUS (0x1 << 17) > +#define NVME_CTRL_SGLS_EXCESS_LENGTH (0x1 << 18) > +#define NVME_CTRL_SGLS_MPTR_SGL (0x1 << 19) > +#define NVME_CTRL_SGLS_ADDR_OFFSET (0x1 << 20) > + > typedef struct NvmeFeatureVal { > uint32_t arbitration; > uint32_t power_mgmt; > @@ -791,6 +879,15 @@ typedef struct NvmeFeatureVal { > #define NVME_INTC_THR(intc) (intc & 0xff) > #define NVME_INTC_TIME(intc) ((intc >> 8) & 0xff) > > +#define NVME_TEMP_THSEL(temp) ((temp >> 20) & 0x3) > +#define NVME_TEMP_THSEL_OVER 0x0 > +#define NVME_TEMP_THSEL_UNDER 0x1 > + > +#define NVME_TEMP_TMPSEL(temp) ((temp >> 16) & 0xf) > +#define NVME_TEMP_TMPSEL_COMPOSITE 0x0 > + > +#define NVME_TEMP_TMPTH(temp) ((temp >> 0) & 0xffff) > + > enum NvmeFeatureIds { > NVME_ARBITRATION = 0x1, > NVME_POWER_MANAGEMENT = 0x2, > @@ -833,18 +930,41 @@ typedef struct NvmeIdNs { > uint8_t mc; > uint8_t dpc; > uint8_t dps; > - > uint8_t nmic; > uint8_t rescap; > uint8_t fpi; > uint8_t dlfeat; > - > - uint8_t res34[94]; > + uint16_t nawun; > + uint16_t nawupf; > + uint16_t nacwu; > + uint16_t nabsn; > + uint16_t nabo; > + uint16_t nabspf; > + uint16_t noiob; > + uint8_t nvmcap[16]; > + uint8_t rsvd64[40]; > + uint8_t nguid[16]; > + uint64_t eui64; > NvmeLBAF lbaf[16]; > - uint8_t res192[192]; > + uint8_t rsvd192[192]; > uint8_t vs[3712]; > } NvmeIdNs; > > +typedef struct NvmeIdNsDescr { > + uint8_t nidt; > + uint8_t nidl; > + uint8_t rsvd2[2]; > +} NvmeIdNsDescr; > + > +#define NVME_NIDT_EUI64_LEN 8 > +#define NVME_NIDT_NGUID_LEN 16 > +#define NVME_NIDT_UUID_LEN 16 This could be defined as an enum > + > +enum { A named enum would be more consistent with the rest of this file > + NVME_NIDT_EUI64 = 0x1, > + NVME_NIDT_NGUID = 0x2, > + NVME_NIDT_UUID = 0x3, > +}; > > /*Deallocate Logical Block Features*/ > #define NVME_ID_NS_DLFEAT_GUARD_CRC(dlfeat) ((dlfeat) & 0x10)
On Jul 3 00:44, Dmitry Fomichev wrote: > On Mon, 2020-06-29 at 20:26 +0200, Klaus Jensen wrote: > > From: Klaus Jensen <k.jensen@samsung.com> > > > > Add missing fields in the Identify Controller and Identify Namespace > > data structures to bring them in line with NVMe v1.3. > > > > This also adds data structures and defines for SGL support which > > requires a couple of trivial changes to the nvme block driver as well. > > > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > > Acked-by: Fam Zheng <fam@euphon.net> > > Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> > > --- > > block/nvme.c | 18 ++--- > > hw/block/nvme.c | 12 ++-- > > include/block/nvme.h | 154 ++++++++++++++++++++++++++++++++++++++----- > > 3 files changed, 152 insertions(+), 32 deletions(-) > > > > diff --git a/block/nvme.c b/block/nvme.c > > index eb2f54dd9dc9..29e90557c428 100644 > > --- a/block/nvme.c > > +++ b/block/nvme.c > > @@ -446,7 +446,7 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp) > > error_setg(errp, "Cannot map buffer for DMA"); > > goto out; > > } > > - cmd.prp1 = cpu_to_le64(iova); > > + cmd.dptr.prp1 = cpu_to_le64(iova); > > > > if (nvme_cmd_sync(bs, s->queues[0], &cmd)) { > > error_setg(errp, "Failed to identify controller"); > > @@ -545,7 +545,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) > > } > > cmd = (NvmeCmd) { > > .opcode = NVME_ADM_CMD_CREATE_CQ, > > - .prp1 = cpu_to_le64(q->cq.iova), > > + .dptr.prp1 = cpu_to_le64(q->cq.iova), > > .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | (n & 0xFFFF)), > > .cdw11 = cpu_to_le32(0x3), > > }; > > @@ -556,7 +556,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) > > } > > cmd = (NvmeCmd) { > > .opcode = NVME_ADM_CMD_CREATE_SQ, > > - .prp1 = cpu_to_le64(q->sq.iova), > > + .dptr.prp1 = cpu_to_le64(q->sq.iova), > > .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | (n & 0xFFFF)), > > .cdw11 = cpu_to_le32(0x1 | (n << 16)), > > }; > > @@ -904,16 +904,16 @@ try_map: > > case 0: > > abort(); > > case 1: > > - cmd->prp1 = pagelist[0]; > > - cmd->prp2 = 0; > > + cmd->dptr.prp1 = pagelist[0]; > > + cmd->dptr.prp2 = 0; > > break; > > case 2: > > - cmd->prp1 = pagelist[0]; > > - cmd->prp2 = pagelist[1]; > > + cmd->dptr.prp1 = pagelist[0]; > > + cmd->dptr.prp2 = pagelist[1]; > > break; > > default: > > - cmd->prp1 = pagelist[0]; > > - cmd->prp2 = cpu_to_le64(req->prp_list_iova + sizeof(uint64_t)); > > + cmd->dptr.prp1 = pagelist[0]; > > + cmd->dptr.prp2 = cpu_to_le64(req->prp_list_iova + sizeof(uint64_t)); > > break; > > } > > trace_nvme_cmd_map_qiov(s, cmd, req, qiov, entries); > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > > index 1aee042d4cb2..71b388aa0e20 100644 > > --- a/hw/block/nvme.c > > +++ b/hw/block/nvme.c > > @@ -397,8 +397,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, > > NvmeRwCmd *rw = (NvmeRwCmd *)cmd; > > uint32_t nlb = le32_to_cpu(rw->nlb) + 1; > > uint64_t slba = le64_to_cpu(rw->slba); > > - uint64_t prp1 = le64_to_cpu(rw->prp1); > > - uint64_t prp2 = le64_to_cpu(rw->prp2); > > + uint64_t prp1 = le64_to_cpu(rw->dptr.prp1); > > + uint64_t prp2 = le64_to_cpu(rw->dptr.prp2); > > > > uint8_t lba_index = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); > > uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds; > > @@ -795,8 +795,8 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n) > > > > static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) > > { > > - uint64_t prp1 = le64_to_cpu(cmd->prp1); > > - uint64_t prp2 = le64_to_cpu(cmd->prp2); > > + uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); > > + uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); > > > > uint64_t timestamp = nvme_get_timestamp(n); > > > > @@ -834,8 +834,8 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) > > { > > uint16_t ret; > > uint64_t timestamp; > > - uint64_t prp1 = le64_to_cpu(cmd->prp1); > > - uint64_t prp2 = le64_to_cpu(cmd->prp2); > > + uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); > > + uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); > > > > ret = nvme_dma_write_prp(n, (uint8_t *)×tamp, > > sizeof(timestamp), prp1, prp2); > > diff --git a/include/block/nvme.h b/include/block/nvme.h > > index 1720ee1d5158..6d1fa6ff2228 100644 > > --- a/include/block/nvme.h > > +++ b/include/block/nvme.h > > @@ -377,15 +377,53 @@ enum NvmePmrmscMask { > > #define NVME_PMRMSC_SET_CBA(pmrmsc, val) \ > > (pmrmsc |= (uint64_t)(val & PMRMSC_CBA_MASK) << PMRMSC_CBA_SHIFT) > > > > +enum NvmeSglDescriptorType { > > + NVME_SGL_DESCR_TYPE_DATA_BLOCK = 0x0, > > + NVME_SGL_DESCR_TYPE_BIT_BUCKET = 0x1, > > + NVME_SGL_DESCR_TYPE_SEGMENT = 0x2, > > + NVME_SGL_DESCR_TYPE_LAST_SEGMENT = 0x3, > > + NVME_SGL_DESCR_TYPE_KEYED_DATA_BLOCK = 0x4, > > + > > + NVME_SGL_DESCR_TYPE_VENDOR_SPECIFIC = 0xf, > > +}; > > + > > +enum NvmeSglDescriptorSubtype { > > + NVME_SGL_DESCR_SUBTYPE_ADDRESS = 0x0, > > +}; > > + > > +typedef struct NvmeSglDescriptor { > > + uint64_t addr; > > + uint32_t len; > > + uint8_t rsvd[3]; > > + uint8_t type; > > +} NvmeSglDescriptor; > > + > > +#define NVME_SGL_TYPE(type) ((type >> 4) & 0xf) > > +#define NVME_SGL_SUBTYPE(type) (type & 0xf) > > + > > +typedef union NvmeCmdDptr { > > + struct { > > + uint64_t prp1; > > + uint64_t prp2; > > + }; > > + > > + NvmeSglDescriptor sgl; > > +} NvmeCmdDptr; > > + > > +enum NvmePsdt { > > + PSDT_PRP = 0x0, > > + PSDT_SGL_MPTR_CONTIGUOUS = 0x1, > > + PSDT_SGL_MPTR_SGL = 0x2, > > +}; > > + > > typedef struct NvmeCmd { > > uint8_t opcode; > > - uint8_t fuse; > > + uint8_t flags; > > uint16_t cid; > > uint32_t nsid; > > uint64_t res1; > > uint64_t mptr; > > - uint64_t prp1; > > - uint64_t prp2; > > + NvmeCmdDptr dptr; > > uint32_t cdw10; > > uint32_t cdw11; > > uint32_t cdw12; > > @@ -394,6 +432,9 @@ typedef struct NvmeCmd { > > uint32_t cdw15; > > } NvmeCmd; > > > > +#define NVME_CMD_FLAGS_FUSE(flags) (flags & 0x3) > > +#define NVME_CMD_FLAGS_PSDT(flags) ((flags >> 6) & 0x3) > > + > > enum NvmeAdminCommands { > > NVME_ADM_CMD_DELETE_SQ = 0x00, > > NVME_ADM_CMD_CREATE_SQ = 0x01, > > @@ -493,8 +534,7 @@ typedef struct NvmeRwCmd { > > uint32_t nsid; > > uint64_t rsvd2; > > uint64_t mptr; > > - uint64_t prp1; > > - uint64_t prp2; > > + NvmeCmdDptr dptr; > > uint64_t slba; > > uint16_t nlb; > > uint16_t control; > > @@ -534,8 +574,7 @@ typedef struct NvmeDsmCmd { > > uint16_t cid; > > uint32_t nsid; > > uint64_t rsvd2[2]; > > - uint64_t prp1; > > - uint64_t prp2; > > + NvmeCmdDptr dptr; > > uint32_t nr; > > uint32_t attributes; > > uint32_t rsvd12[4]; > > @@ -599,6 +638,12 @@ enum NvmeStatusCodes { > > NVME_CMD_ABORT_MISSING_FUSE = 0x000a, > > NVME_INVALID_NSID = 0x000b, > > NVME_CMD_SEQ_ERROR = 0x000c, > > + NVME_INVALID_SGL_SEG_DESCR = 0x000d, > > + NVME_INVALID_NUM_SGL_DESCRS = 0x000e, > > + NVME_DATA_SGL_LEN_INVALID = 0x000f, > > + NVME_MD_SGL_LEN_INVALID = 0x0010, > > + NVME_SGL_DESCR_TYPE_INVALID = 0x0011, > > + NVME_INVALID_USE_OF_CMB = 0x0012, > > NVME_LBA_RANGE = 0x0080, > > NVME_CAP_EXCEEDED = 0x0081, > > NVME_NS_NOT_READY = 0x0082, > > @@ -687,7 +732,7 @@ enum NvmeSmartWarn { > > NVME_SMART_FAILED_VOLATILE_MEDIA = 1 << 4, > > }; > > > > -enum LogIdentifier { > > +enum NvmeLogIdentifier { > > NVME_LOG_ERROR_INFO = 0x01, > > NVME_LOG_SMART_INFO = 0x02, > > NVME_LOG_FW_SLOT_INFO = 0x03, > > @@ -711,6 +756,7 @@ enum { > > NVME_ID_CNS_NS = 0x0, > > NVME_ID_CNS_CTRL = 0x1, > > NVME_ID_CNS_NS_ACTIVE_LIST = 0x2, > > + NVME_ID_CNS_NS_DESCR_LIST = 0x3, > > }; > > > > typedef struct NvmeIdCtrl { > > @@ -723,7 +769,15 @@ typedef struct NvmeIdCtrl { > > uint8_t ieee[3]; > > uint8_t cmic; > > uint8_t mdts; > > - uint8_t rsvd255[178]; > > + uint16_t cntlid; > > + uint32_t ver; > > + uint32_t rtd3r; > > + uint32_t rtd3e; > > + uint32_t oaes; > > + uint32_t ctratt; > > + uint8_t rsvd100[12]; > > + uint8_t fguid[16]; > > + uint8_t rsvd128[128]; > > uint16_t oacs; > > uint8_t acl; > > uint8_t aerl; > > @@ -731,10 +785,28 @@ typedef struct NvmeIdCtrl { > > uint8_t lpa; > > uint8_t elpe; > > uint8_t npss; > > - uint8_t rsvd511[248]; > > + uint8_t avscc; > > + uint8_t apsta; > > + uint16_t wctemp; > > + uint16_t cctemp; > > + uint16_t mtfa; > > + uint32_t hmpre; > > + uint32_t hmmin; > > + uint8_t tnvmcap[16]; > > + uint8_t unvmcap[16]; > > + uint32_t rpmbs; > > + uint16_t edstt; > > + uint8_t dsto; > > + uint8_t fwug; > > + uint16_t kas; > > + uint16_t hctma; > > + uint16_t mntmt; > > + uint16_t mxtmt; > > + uint32_t sanicap; > > + uint8_t rsvd332[180]; > > uint8_t sqes; > > uint8_t cqes; > > - uint16_t rsvd515; > > + uint16_t maxcmd; > > uint32_t nn; > > uint16_t oncs; > > uint16_t fuses; > > @@ -742,8 +814,14 @@ typedef struct NvmeIdCtrl { > > uint8_t vwc; > > uint16_t awun; > > uint16_t awupf; > > - uint8_t rsvd703[174]; > > - uint8_t rsvd2047[1344]; > > + uint8_t nvscc; > > + uint8_t rsvd531; > > + uint16_t acwu; > > + uint8_t rsvd534[2]; > > + uint32_t sgls; > > + uint8_t rsvd540[228]; > > + uint8_t subnqn[256]; > > + uint8_t rsvd1024[1024]; > > NvmePSD psd[32]; > > uint8_t vs[1024]; > > } NvmeIdCtrl; > > @@ -769,6 +847,16 @@ enum NvmeIdCtrlOncs { > > #define NVME_CTRL_CQES_MIN(cqes) ((cqes) & 0xf) > > #define NVME_CTRL_CQES_MAX(cqes) (((cqes) >> 4) & 0xf) > > > > +#define NVME_CTRL_SGLS_SUPPORTED_MASK (0x3 << 0) > > NVME_CTRL_SGL_SUPPORT_MASK? > I wanna keep it as "SGLS" because that matches with the field name in the spec, but shortened them all to _SUPPORT_ > > +#define NVME_CTRL_SGLS_SUPPORTED_NO_ALIGNMENT (0x1 << 0) > > +#define NVME_CTRL_SGLS_SUPPORTED_DWORD_ALIGNMENT (0x1 << 1) > > These could be shortened to ..._ALIGN/_NO_ALIGN > Done. > > +#define NVME_CTRL_SGLS_KEYED (0x1 << 2) > > +#define NVME_CTRL_SGLS_BITBUCKET (0x1 << 16) > > +#define NVME_CTRL_SGLS_MPTR_CONTIGUOUS (0x1 << 17) > > +#define NVME_CTRL_SGLS_EXCESS_LENGTH (0x1 << 18) > > +#define NVME_CTRL_SGLS_MPTR_SGL (0x1 << 19) > > +#define NVME_CTRL_SGLS_ADDR_OFFSET (0x1 << 20) > > + > > typedef struct NvmeFeatureVal { > > uint32_t arbitration; > > uint32_t power_mgmt; > > @@ -791,6 +879,15 @@ typedef struct NvmeFeatureVal { > > #define NVME_INTC_THR(intc) (intc & 0xff) > > #define NVME_INTC_TIME(intc) ((intc >> 8) & 0xff) > > > > +#define NVME_TEMP_THSEL(temp) ((temp >> 20) & 0x3) > > +#define NVME_TEMP_THSEL_OVER 0x0 > > +#define NVME_TEMP_THSEL_UNDER 0x1 > > + > > +#define NVME_TEMP_TMPSEL(temp) ((temp >> 16) & 0xf) > > +#define NVME_TEMP_TMPSEL_COMPOSITE 0x0 > > + > > +#define NVME_TEMP_TMPTH(temp) ((temp >> 0) & 0xffff) > > + > > enum NvmeFeatureIds { > > NVME_ARBITRATION = 0x1, > > NVME_POWER_MANAGEMENT = 0x2, > > @@ -833,18 +930,41 @@ typedef struct NvmeIdNs { > > uint8_t mc; > > uint8_t dpc; > > uint8_t dps; > > - > > uint8_t nmic; > > uint8_t rescap; > > uint8_t fpi; > > uint8_t dlfeat; > > - > > - uint8_t res34[94]; > > + uint16_t nawun; > > + uint16_t nawupf; > > + uint16_t nacwu; > > + uint16_t nabsn; > > + uint16_t nabo; > > + uint16_t nabspf; > > + uint16_t noiob; > > + uint8_t nvmcap[16]; > > + uint8_t rsvd64[40]; > > + uint8_t nguid[16]; > > + uint64_t eui64; > > NvmeLBAF lbaf[16]; > > - uint8_t res192[192]; > > + uint8_t rsvd192[192]; > > uint8_t vs[3712]; > > } NvmeIdNs; > > > > +typedef struct NvmeIdNsDescr { > > + uint8_t nidt; > > + uint8_t nidl; > > + uint8_t rsvd2[2]; > > +} NvmeIdNsDescr; > > + > > +#define NVME_NIDT_EUI64_LEN 8 > > +#define NVME_NIDT_NGUID_LEN 16 > > +#define NVME_NIDT_UUID_LEN 16 > > This could be defined as an enum > Done. > > + > > +enum { > > A named enum would be more consistent with the rest of this file > Good point. Fixed. > > + NVME_NIDT_EUI64 = 0x1, > > + NVME_NIDT_NGUID = 0x2, > > + NVME_NIDT_UUID = 0x3, > > +}; > > > > /*Deallocate Logical Block Features*/ > > #define NVME_ID_NS_DLFEAT_GUARD_CRC(dlfeat) ((dlfeat) & 0x10)
diff --git a/block/nvme.c b/block/nvme.c index eb2f54dd9dc9..29e90557c428 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -446,7 +446,7 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp) error_setg(errp, "Cannot map buffer for DMA"); goto out; } - cmd.prp1 = cpu_to_le64(iova); + cmd.dptr.prp1 = cpu_to_le64(iova); if (nvme_cmd_sync(bs, s->queues[0], &cmd)) { error_setg(errp, "Failed to identify controller"); @@ -545,7 +545,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) } cmd = (NvmeCmd) { .opcode = NVME_ADM_CMD_CREATE_CQ, - .prp1 = cpu_to_le64(q->cq.iova), + .dptr.prp1 = cpu_to_le64(q->cq.iova), .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | (n & 0xFFFF)), .cdw11 = cpu_to_le32(0x3), }; @@ -556,7 +556,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) } cmd = (NvmeCmd) { .opcode = NVME_ADM_CMD_CREATE_SQ, - .prp1 = cpu_to_le64(q->sq.iova), + .dptr.prp1 = cpu_to_le64(q->sq.iova), .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | (n & 0xFFFF)), .cdw11 = cpu_to_le32(0x1 | (n << 16)), }; @@ -904,16 +904,16 @@ try_map: case 0: abort(); case 1: - cmd->prp1 = pagelist[0]; - cmd->prp2 = 0; + cmd->dptr.prp1 = pagelist[0]; + cmd->dptr.prp2 = 0; break; case 2: - cmd->prp1 = pagelist[0]; - cmd->prp2 = pagelist[1]; + cmd->dptr.prp1 = pagelist[0]; + cmd->dptr.prp2 = pagelist[1]; break; default: - cmd->prp1 = pagelist[0]; - cmd->prp2 = cpu_to_le64(req->prp_list_iova + sizeof(uint64_t)); + cmd->dptr.prp1 = pagelist[0]; + cmd->dptr.prp2 = cpu_to_le64(req->prp_list_iova + sizeof(uint64_t)); break; } trace_nvme_cmd_map_qiov(s, cmd, req, qiov, entries); diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 1aee042d4cb2..71b388aa0e20 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -397,8 +397,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, NvmeRwCmd *rw = (NvmeRwCmd *)cmd; uint32_t nlb = le32_to_cpu(rw->nlb) + 1; uint64_t slba = le64_to_cpu(rw->slba); - uint64_t prp1 = le64_to_cpu(rw->prp1); - uint64_t prp2 = le64_to_cpu(rw->prp2); + uint64_t prp1 = le64_to_cpu(rw->dptr.prp1); + uint64_t prp2 = le64_to_cpu(rw->dptr.prp2); uint8_t lba_index = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds; @@ -795,8 +795,8 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n) static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) { - uint64_t prp1 = le64_to_cpu(cmd->prp1); - uint64_t prp2 = le64_to_cpu(cmd->prp2); + uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); + uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); uint64_t timestamp = nvme_get_timestamp(n); @@ -834,8 +834,8 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) { uint16_t ret; uint64_t timestamp; - uint64_t prp1 = le64_to_cpu(cmd->prp1); - uint64_t prp2 = le64_to_cpu(cmd->prp2); + uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); + uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); ret = nvme_dma_write_prp(n, (uint8_t *)×tamp, sizeof(timestamp), prp1, prp2); diff --git a/include/block/nvme.h b/include/block/nvme.h index 1720ee1d5158..6d1fa6ff2228 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -377,15 +377,53 @@ enum NvmePmrmscMask { #define NVME_PMRMSC_SET_CBA(pmrmsc, val) \ (pmrmsc |= (uint64_t)(val & PMRMSC_CBA_MASK) << PMRMSC_CBA_SHIFT) +enum NvmeSglDescriptorType { + NVME_SGL_DESCR_TYPE_DATA_BLOCK = 0x0, + NVME_SGL_DESCR_TYPE_BIT_BUCKET = 0x1, + NVME_SGL_DESCR_TYPE_SEGMENT = 0x2, + NVME_SGL_DESCR_TYPE_LAST_SEGMENT = 0x3, + NVME_SGL_DESCR_TYPE_KEYED_DATA_BLOCK = 0x4, + + NVME_SGL_DESCR_TYPE_VENDOR_SPECIFIC = 0xf, +}; + +enum NvmeSglDescriptorSubtype { + NVME_SGL_DESCR_SUBTYPE_ADDRESS = 0x0, +}; + +typedef struct NvmeSglDescriptor { + uint64_t addr; + uint32_t len; + uint8_t rsvd[3]; + uint8_t type; +} NvmeSglDescriptor; + +#define NVME_SGL_TYPE(type) ((type >> 4) & 0xf) +#define NVME_SGL_SUBTYPE(type) (type & 0xf) + +typedef union NvmeCmdDptr { + struct { + uint64_t prp1; + uint64_t prp2; + }; + + NvmeSglDescriptor sgl; +} NvmeCmdDptr; + +enum NvmePsdt { + PSDT_PRP = 0x0, + PSDT_SGL_MPTR_CONTIGUOUS = 0x1, + PSDT_SGL_MPTR_SGL = 0x2, +}; + typedef struct NvmeCmd { uint8_t opcode; - uint8_t fuse; + uint8_t flags; uint16_t cid; uint32_t nsid; uint64_t res1; uint64_t mptr; - uint64_t prp1; - uint64_t prp2; + NvmeCmdDptr dptr; uint32_t cdw10; uint32_t cdw11; uint32_t cdw12; @@ -394,6 +432,9 @@ typedef struct NvmeCmd { uint32_t cdw15; } NvmeCmd; +#define NVME_CMD_FLAGS_FUSE(flags) (flags & 0x3) +#define NVME_CMD_FLAGS_PSDT(flags) ((flags >> 6) & 0x3) + enum NvmeAdminCommands { NVME_ADM_CMD_DELETE_SQ = 0x00, NVME_ADM_CMD_CREATE_SQ = 0x01, @@ -493,8 +534,7 @@ typedef struct NvmeRwCmd { uint32_t nsid; uint64_t rsvd2; uint64_t mptr; - uint64_t prp1; - uint64_t prp2; + NvmeCmdDptr dptr; uint64_t slba; uint16_t nlb; uint16_t control; @@ -534,8 +574,7 @@ typedef struct NvmeDsmCmd { uint16_t cid; uint32_t nsid; uint64_t rsvd2[2]; - uint64_t prp1; - uint64_t prp2; + NvmeCmdDptr dptr; uint32_t nr; uint32_t attributes; uint32_t rsvd12[4]; @@ -599,6 +638,12 @@ enum NvmeStatusCodes { NVME_CMD_ABORT_MISSING_FUSE = 0x000a, NVME_INVALID_NSID = 0x000b, NVME_CMD_SEQ_ERROR = 0x000c, + NVME_INVALID_SGL_SEG_DESCR = 0x000d, + NVME_INVALID_NUM_SGL_DESCRS = 0x000e, + NVME_DATA_SGL_LEN_INVALID = 0x000f, + NVME_MD_SGL_LEN_INVALID = 0x0010, + NVME_SGL_DESCR_TYPE_INVALID = 0x0011, + NVME_INVALID_USE_OF_CMB = 0x0012, NVME_LBA_RANGE = 0x0080, NVME_CAP_EXCEEDED = 0x0081, NVME_NS_NOT_READY = 0x0082, @@ -687,7 +732,7 @@ enum NvmeSmartWarn { NVME_SMART_FAILED_VOLATILE_MEDIA = 1 << 4, }; -enum LogIdentifier { +enum NvmeLogIdentifier { NVME_LOG_ERROR_INFO = 0x01, NVME_LOG_SMART_INFO = 0x02, NVME_LOG_FW_SLOT_INFO = 0x03, @@ -711,6 +756,7 @@ enum { NVME_ID_CNS_NS = 0x0, NVME_ID_CNS_CTRL = 0x1, NVME_ID_CNS_NS_ACTIVE_LIST = 0x2, + NVME_ID_CNS_NS_DESCR_LIST = 0x3, }; typedef struct NvmeIdCtrl { @@ -723,7 +769,15 @@ typedef struct NvmeIdCtrl { uint8_t ieee[3]; uint8_t cmic; uint8_t mdts; - uint8_t rsvd255[178]; + uint16_t cntlid; + uint32_t ver; + uint32_t rtd3r; + uint32_t rtd3e; + uint32_t oaes; + uint32_t ctratt; + uint8_t rsvd100[12]; + uint8_t fguid[16]; + uint8_t rsvd128[128]; uint16_t oacs; uint8_t acl; uint8_t aerl; @@ -731,10 +785,28 @@ typedef struct NvmeIdCtrl { uint8_t lpa; uint8_t elpe; uint8_t npss; - uint8_t rsvd511[248]; + uint8_t avscc; + uint8_t apsta; + uint16_t wctemp; + uint16_t cctemp; + uint16_t mtfa; + uint32_t hmpre; + uint32_t hmmin; + uint8_t tnvmcap[16]; + uint8_t unvmcap[16]; + uint32_t rpmbs; + uint16_t edstt; + uint8_t dsto; + uint8_t fwug; + uint16_t kas; + uint16_t hctma; + uint16_t mntmt; + uint16_t mxtmt; + uint32_t sanicap; + uint8_t rsvd332[180]; uint8_t sqes; uint8_t cqes; - uint16_t rsvd515; + uint16_t maxcmd; uint32_t nn; uint16_t oncs; uint16_t fuses; @@ -742,8 +814,14 @@ typedef struct NvmeIdCtrl { uint8_t vwc; uint16_t awun; uint16_t awupf; - uint8_t rsvd703[174]; - uint8_t rsvd2047[1344]; + uint8_t nvscc; + uint8_t rsvd531; + uint16_t acwu; + uint8_t rsvd534[2]; + uint32_t sgls; + uint8_t rsvd540[228]; + uint8_t subnqn[256]; + uint8_t rsvd1024[1024]; NvmePSD psd[32]; uint8_t vs[1024]; } NvmeIdCtrl; @@ -769,6 +847,16 @@ enum NvmeIdCtrlOncs { #define NVME_CTRL_CQES_MIN(cqes) ((cqes) & 0xf) #define NVME_CTRL_CQES_MAX(cqes) (((cqes) >> 4) & 0xf) +#define NVME_CTRL_SGLS_SUPPORTED_MASK (0x3 << 0) +#define NVME_CTRL_SGLS_SUPPORTED_NO_ALIGNMENT (0x1 << 0) +#define NVME_CTRL_SGLS_SUPPORTED_DWORD_ALIGNMENT (0x1 << 1) +#define NVME_CTRL_SGLS_KEYED (0x1 << 2) +#define NVME_CTRL_SGLS_BITBUCKET (0x1 << 16) +#define NVME_CTRL_SGLS_MPTR_CONTIGUOUS (0x1 << 17) +#define NVME_CTRL_SGLS_EXCESS_LENGTH (0x1 << 18) +#define NVME_CTRL_SGLS_MPTR_SGL (0x1 << 19) +#define NVME_CTRL_SGLS_ADDR_OFFSET (0x1 << 20) + typedef struct NvmeFeatureVal { uint32_t arbitration; uint32_t power_mgmt; @@ -791,6 +879,15 @@ typedef struct NvmeFeatureVal { #define NVME_INTC_THR(intc) (intc & 0xff) #define NVME_INTC_TIME(intc) ((intc >> 8) & 0xff) +#define NVME_TEMP_THSEL(temp) ((temp >> 20) & 0x3) +#define NVME_TEMP_THSEL_OVER 0x0 +#define NVME_TEMP_THSEL_UNDER 0x1 + +#define NVME_TEMP_TMPSEL(temp) ((temp >> 16) & 0xf) +#define NVME_TEMP_TMPSEL_COMPOSITE 0x0 + +#define NVME_TEMP_TMPTH(temp) ((temp >> 0) & 0xffff) + enum NvmeFeatureIds { NVME_ARBITRATION = 0x1, NVME_POWER_MANAGEMENT = 0x2, @@ -833,18 +930,41 @@ typedef struct NvmeIdNs { uint8_t mc; uint8_t dpc; uint8_t dps; - uint8_t nmic; uint8_t rescap; uint8_t fpi; uint8_t dlfeat; - - uint8_t res34[94]; + uint16_t nawun; + uint16_t nawupf; + uint16_t nacwu; + uint16_t nabsn; + uint16_t nabo; + uint16_t nabspf; + uint16_t noiob; + uint8_t nvmcap[16]; + uint8_t rsvd64[40]; + uint8_t nguid[16]; + uint64_t eui64; NvmeLBAF lbaf[16]; - uint8_t res192[192]; + uint8_t rsvd192[192]; uint8_t vs[3712]; } NvmeIdNs; +typedef struct NvmeIdNsDescr { + uint8_t nidt; + uint8_t nidl; + uint8_t rsvd2[2]; +} NvmeIdNsDescr; + +#define NVME_NIDT_EUI64_LEN 8 +#define NVME_NIDT_NGUID_LEN 16 +#define NVME_NIDT_UUID_LEN 16 + +enum { + NVME_NIDT_EUI64 = 0x1, + NVME_NIDT_NGUID = 0x2, + NVME_NIDT_UUID = 0x3, +}; /*Deallocate Logical Block Features*/ #define NVME_ID_NS_DLFEAT_GUARD_CRC(dlfeat) ((dlfeat) & 0x10)