Commit 453c804d authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme: continue initialization even if NN=0 



Similar to the previous patch, some controllers may report 0 namespaces;
we should still be able to send admin commands in this situation.

Change-Id: Ia14e3ce773c63e645199e1c40ba5b37095da2473
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/407497


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent c9ef7642

lib/nvme/nvme_ctrlr.c

+5 −5
Original line number Diff line number Diff line
@@ -1098,17 +1098,17 @@ nvme_ctrlr_construct_namespaces(struct spdk_nvme_ctrlr *ctrlr) 
	uint32_t i, nn = ctrlr->cdata.nn;

	uint64_t phys_addr = 0;



	if (nn == 0) {

		SPDK_ERRLOG("controller has 0 namespaces\n");

		return -1;

	}



	/* ctrlr->num_ns may be 0 (startup) or a different number of namespaces (reset),

	 * so check if we need to reallocate.

	 */

	if (nn != ctrlr->num_ns) {

		nvme_ctrlr_destruct_namespaces(ctrlr);



		if (nn == 0) {

			SPDK_WARNLOG("controller has 0 namespaces\n");

			return 0;

		}



		ctrlr->ns = spdk_dma_zmalloc(nn * sizeof(struct spdk_nvme_ns), 64,

					     &phys_addr);

		if (ctrlr->ns == NULL) {