hw/nvme: add command set independent identify namespace
PATCH 1/1 hw/nvme: add command set independent identify namespace
From: Klaus Jensen <[email protected]>
Add support for the command set independent identify namespace data structure (CNS 0x8).
Signed-off-by Klaus Jensen <[email protected]>
--- hw/nvme/ctrl.c | 28 ++++++++++++++++++++++++++++ hw/nvme/trace-events | 1 + include/block/nvme.h | 16 ++++++++++++++++ 3 files changed, 45 insertions(+)
hw/nvme/ctrl.c +28 -0
@@ -4793,6 +4793,32 @@ static uint16_t nvme_identify_ctrl_list(NvmeCtrl *n, NvmeRequest *req,return nvme_c2h (n, (uint8_t *)list,sizeof (list), req); } +static uint16_t nvme_identify_ns_ind (NvmeCtrl *n,NvmeRequest *req) +{ +NvmeNamespace *ns; +NvmeIdentify *c = (NvmeIdentify *)&req->cmd; +uint32_t nsid =le32_to_cpu (c->nsid); +NvmeIdNsIndependent id; + +trace_pci_nvme_identify_ns_ind (nsid); + +if (!nvme_nsid_valid (n, nsid)) { +return NVME_INVALID_NSID |NVME_DNR ; + } + + ns =nvme_ns (n, nsid); +if (unlikely (!ns)) { +return nvme_rpt_empty_id_struct (n, req); + } + + id = (NvmeIdNsIndependent ) { + .nmic = ns->params.shared ?0x1 :0x0 , + .nstat =0x1 , + }; + +return nvme_c2h (n, &id,sizeof (id), req); +} +static uint16_t nvme_identify_ns_csi (NvmeCtrl *n,NvmeRequest *req,bool active) {
@@ -5011,6 +5037,8 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequest *req)return nvme_identify_ctrl_list (n, req, false);case NVME_ID_CNS_CS_NS :return nvme_identify_ns_csi (n, req, true); +case NVME_ID_CNS_CS_IND_NS : +return nvme_identify_ns_ind (n, req);case NVME_ID_CNS_CS_NS_PRESENT :return nvme_identify_ns_csi (n, req, false);case NVME_ID_CNS_CTRL :
hw/nvme/trace-events +1 -0
@@ -55,6 +55,7 @@ pci_nvme_identify(uint16_t cid, uint8_t cns, uint16_t ctrlid, uint8_t csi) "cid pci_nvme_identify_ctrl(void) "identify controller" pci_nvme_identify_ctrl_csi(uint8_t csi) "identify controller, csi=0x%"PRIx8"" pci_nvme_identify_ns(uint32_t ns) "nsid %"PRIu32"" +pci_nvme_identify_ns_ind(uint32_t nsid) "nsid %"PRIu32"" pci_nvme_identify_ctrl_list(uint8_t cns, uint16_t cntid) "cns 0x%"PRIx8" cntid %"PRIu16"" pci_nvme_identify_ns_csi(uint32_t ns, uint8_t csi) "nsid=%"PRIu32", csi=0x%"PRIx8"" pci_nvme_identify_nslist(uint32_t ns) "nsid %"PRIu32""
include/block/nvme.h +16 -0
@@ -1029,6 +1029,7 @@ enum NvmeIdCns {NVME_ID_CNS_CS_NS =0x05 ,NVME_ID_CNS_CS_CTRL =0x06 ,NVME_ID_CNS_CS_NS_ACTIVE_LIST =0x07 , +NVME_ID_CNS_CS_IND_NS =0x08 ,NVME_ID_CNS_NS_PRESENT_LIST =0x10 ,NVME_ID_CNS_NS_PRESENT =0x11 , NVME_ID_CNS_NS_ATTACHED_CTRL_LIST = 0x12,
@@ -1346,6 +1347,20 @@ typedef struct QEMU_PACKED NvmeIdNsNvm {uint8_t rsvd268[3828 ]; } NvmeIdNsNvm; +typedef struct QEMU_PACKED NvmeIdNsIndependent { +uint8_t nsfeat; +uint8_t nmic; +uint8_t rescap; +uint8_t fpi; +uint32_t anagrpid; +uint8_t nsattr; +uint8_t rsvd9; +uint16_t nvmsetid; +uint16_t endgrpid; +uint8_t nstat; +uint8_t rsvd15[4081 ]; +} NvmeIdNsIndependent; + typedef struct QEMU_PACKED NvmeIdNsDescr {uint8_t nidt;uint8_t nidl;
@@ -1582,6 +1597,7 @@ static inline void _nvme_check_size(void)QEMU_BUILD_BUG_ON (sizeof (NvmeLBAF) !=4 );QEMU_BUILD_BUG_ON (sizeof (NvmeLBAFE) !=16 );QEMU_BUILD_BUG_ON (sizeof (NvmeIdNs) !=4096 ); +QEMU_BUILD_BUG_ON (sizeof (NvmeIdNsIndependent) !=4096 );QEMU_BUILD_BUG_ON (sizeof (NvmeIdNsNvm) !=4096 );QEMU_BUILD_BUG_ON (sizeof (NvmeIdNsZoned) !=4096 );QEMU_BUILD_BUG_ON (sizeof (NvmeSglDescriptor) !=16 );
Signature · 1 line
2.36.1