Commit df01076f authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: add NVME_CTRLR_STATE_READ_VS 



Read VS (Version) register as part of controller
initialization instead of controller construction.

This prepares for upcoming changes to make
controller attach fully asynchronous.  Since reading
fabrics registers is an asynchronous operation, it
will be easier to read the VS register as part of
controller initialization which operates as an
asynchronous state machine.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I771386dbdf5902633e0d9f91b3b20be98f26fdc3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8076


Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent a12cf26c

lib/nvme/nvme_ctrlr.c

+9 −4
Original line number Diff line number Diff line
@@ -1134,6 +1134,8 @@ nvme_ctrlr_state_string(enum nvme_ctrlr_state state) 
	switch (state) {

	case NVME_CTRLR_STATE_INIT_DELAY:

		return "delay init";

	case NVME_CTRLR_STATE_READ_VS:

		return "read vs";

	case NVME_CTRLR_STATE_CHECK_EN:

		return "check en";

	case NVME_CTRLR_STATE_DISABLE_WAIT_FOR_READY_1:
@@ -3124,7 +3126,12 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) 
		}

		break;



	case NVME_CTRLR_STATE_CHECK_EN: /* synonymous with NVME_CTRLR_STATE_INIT */

	case NVME_CTRLR_STATE_READ_VS: /* synonymous with NVME_CTRLR_STATE_INIT */

		nvme_ctrlr_get_vs(ctrlr, &ctrlr->vs);

		nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_CHECK_EN, NVME_TIMEOUT_INFINITE);

		break;



	case NVME_CTRLR_STATE_CHECK_EN:

		/* Begin the hardware initialization by making sure the controller is disabled. */

		if (cc.bits.en) {

			NVME_CTRLR_DEBUGLOG(ctrlr, "CC.EN = 1\n");
@@ -3405,11 +3412,9 @@ nvme_ctrlr_construct(struct spdk_nvme_ctrlr *ctrlr) 


/* This function should be called once at ctrlr initialization to set up constant properties. */

void

nvme_ctrlr_init_cap(struct spdk_nvme_ctrlr *ctrlr, const union spdk_nvme_cap_register *cap,

		    const union spdk_nvme_vs_register *vs)

nvme_ctrlr_init_cap(struct spdk_nvme_ctrlr *ctrlr, const union spdk_nvme_cap_register *cap)

{

	ctrlr->cap = *cap;

	ctrlr->vs = *vs;



	if (ctrlr->cap.bits.ams & SPDK_NVME_CAP_AMS_WRR) {

		ctrlr->flags |= SPDK_NVME_CTRLR_WRR_SUPPORTED;

lib/nvme/nvme_internal.h

+9 −5
Original line number Diff line number Diff line
@@ -518,14 +518,19 @@ enum nvme_ctrlr_state { 
	NVME_CTRLR_STATE_INIT_DELAY,



	/**

	 * Check EN to prepare for controller initialization.

	 * Read Version (VS) register.

	 */

	NVME_CTRLR_STATE_CHECK_EN,

	NVME_CTRLR_STATE_READ_VS,



	/**

	 * Controller has not started initialized yet.

	 */

	NVME_CTRLR_STATE_INIT = NVME_CTRLR_STATE_CHECK_EN,

	NVME_CTRLR_STATE_INIT = NVME_CTRLR_STATE_READ_VS,



	/**

	 * Check EN to prepare for controller initialization.

	 */

	NVME_CTRLR_STATE_CHECK_EN,



	/**

	 * Waiting for CSTS.RDY to transition from 0 to 1 so that CC.EN may be set to 0.
@@ -1037,8 +1042,7 @@ int nvme_ctrlr_get_vs(struct spdk_nvme_ctrlr *ctrlr, union spdk_nvme_vs_register 
int	nvme_ctrlr_get_cmbsz(struct spdk_nvme_ctrlr *ctrlr, union spdk_nvme_cmbsz_register *cmbsz);

int	nvme_ctrlr_get_pmrcap(struct spdk_nvme_ctrlr *ctrlr, union spdk_nvme_pmrcap_register *pmrcap);

bool	nvme_ctrlr_multi_iocs_enabled(struct spdk_nvme_ctrlr *ctrlr);

void	nvme_ctrlr_init_cap(struct spdk_nvme_ctrlr *ctrlr, const union spdk_nvme_cap_register *cap,

			    const union spdk_nvme_vs_register *vs);

void	nvme_ctrlr_init_cap(struct spdk_nvme_ctrlr *ctrlr, const union spdk_nvme_cap_register *cap);

void    nvme_ctrlr_process_async_event(struct spdk_nvme_ctrlr *ctrlr,

				       const struct spdk_nvme_cpl *cpl);

void nvme_ctrlr_disconnect_qpair(struct spdk_nvme_qpair *qpair);

lib/nvme/nvme_pcie.c

+1 −9
Original line number Diff line number Diff line
@@ -908,7 +908,6 @@ static struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(const struct spdk_nvme_ 
	struct spdk_pci_device *pci_dev = devhandle;

	struct nvme_pcie_ctrlr *pctrlr;

	union spdk_nvme_cap_register cap;

	union spdk_nvme_vs_register vs;

	uint16_t cmd_reg;

	int rc;

	struct spdk_pci_id pci_id;
@@ -960,14 +959,7 @@ static struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(const struct spdk_nvme_ 
		return NULL;

	}



	if (nvme_ctrlr_get_vs(&pctrlr->ctrlr, &vs)) {

		SPDK_ERRLOG("get_vs() failed\n");

		spdk_pci_device_unclaim(pci_dev);

		spdk_free(pctrlr);

		return NULL;

	}



	nvme_ctrlr_init_cap(&pctrlr->ctrlr, &cap, &vs);

	nvme_ctrlr_init_cap(&pctrlr->ctrlr, &cap);



	/* Doorbell stride is 2 ^ (dstrd + 2),

	 * but we want multiples of 4, so drop the + 2 */

lib/nvme/nvme_rdma.c

+1 −7
Original line number Diff line number Diff line
@@ -1739,7 +1739,6 @@ static struct spdk_nvme_ctrlr *nvme_rdma_ctrlr_construct(const struct spdk_nvme_ 
{

	struct nvme_rdma_ctrlr *rctrlr;

	union spdk_nvme_cap_register cap;

	union spdk_nvme_vs_register vs;

	struct ibv_context **contexts;

	struct ibv_device_attr dev_attr;

	int i, flag, rc;
@@ -1838,17 +1837,12 @@ static struct spdk_nvme_ctrlr *nvme_rdma_ctrlr_construct(const struct spdk_nvme_ 
		goto destruct_ctrlr;

	}



	if (nvme_ctrlr_get_vs(&rctrlr->ctrlr, &vs)) {

		SPDK_ERRLOG("get_vs() failed\n");

		goto destruct_ctrlr;

	}



	if (nvme_ctrlr_add_process(&rctrlr->ctrlr, 0) != 0) {

		SPDK_ERRLOG("nvme_ctrlr_add_process() failed\n");

		goto destruct_ctrlr;

	}



	nvme_ctrlr_init_cap(&rctrlr->ctrlr, &cap, &vs);

	nvme_ctrlr_init_cap(&rctrlr->ctrlr, &cap);



	SPDK_DEBUGLOG(nvme, "successfully initialized the nvmf ctrlr\n");

	return &rctrlr->ctrlr;

lib/nvme/nvme_tcp.c

+1 −8
Original line number Diff line number Diff line
@@ -1935,7 +1935,6 @@ static struct spdk_nvme_ctrlr *nvme_tcp_ctrlr_construct(const struct spdk_nvme_t 
{

	struct nvme_tcp_ctrlr *tctrlr;

	union spdk_nvme_cap_register cap;

	union spdk_nvme_vs_register vs;

	int rc;



	tctrlr = calloc(1, sizeof(*tctrlr));
@@ -1975,19 +1974,13 @@ static struct spdk_nvme_ctrlr *nvme_tcp_ctrlr_construct(const struct spdk_nvme_t 
		return NULL;

	}



	if (nvme_ctrlr_get_vs(&tctrlr->ctrlr, &vs)) {

		SPDK_ERRLOG("get_vs() failed\n");

		nvme_ctrlr_destruct(&tctrlr->ctrlr);

		return NULL;

	}



	if (nvme_ctrlr_add_process(&tctrlr->ctrlr, 0) != 0) {

		SPDK_ERRLOG("nvme_ctrlr_add_process() failed\n");

		nvme_ctrlr_destruct(&tctrlr->ctrlr);

		return NULL;

	}



	nvme_ctrlr_init_cap(&tctrlr->ctrlr, &cap, &vs);

	nvme_ctrlr_init_cap(&tctrlr->ctrlr, &cap);



	return &tctrlr->ctrlr;

}