Commit 9d8251f6 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvme: read the capability (CAP) register asynchronously 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I685e0ca772ff7e485db42a2179a84c483ec49cdc
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8616


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 09acc162

lib/nvme/nvme_ctrlr.c

+24 −4
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ static void nvme_ctrlr_set_state(struct spdk_nvme_ctrlr *ctrlr, enum nvme_ctrlr_ 
	nvme_transport_ctrlr_get_reg_ ## sz ## _async(ctrlr, \

		offsetof(struct spdk_nvme_registers, reg), cb_fn, cb_arg)



#define nvme_ctrlr_get_cap_async(ctrlr, cb_fn, cb_arg) \

	nvme_ctrlr_get_reg_async(ctrlr, cap, 8, cb_fn, cb_arg)



#define nvme_ctrlr_get_vs_async(ctrlr, cb_fn, cb_arg) \

	nvme_ctrlr_get_reg_async(ctrlr, vs, 4, cb_fn, cb_arg)
@@ -1244,6 +1247,8 @@ nvme_ctrlr_state_string(enum nvme_ctrlr_state state) 
		return "read vs wait for vs";

	case NVME_CTRLR_STATE_READ_CAP:

		return "read cap";

	case NVME_CTRLR_STATE_READ_CAP_WAIT_FOR_CAP:

		return "read cap wait for cap";

	case NVME_CTRLR_STATE_CHECK_EN:

		return "check en";

	case NVME_CTRLR_STATE_DISABLE_WAIT_FOR_READY_1:
@@ -3387,6 +3392,22 @@ nvme_ctrlr_process_init_vs_done(void *ctx, uint64_t value, const struct spdk_nvm 
	nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_READ_CAP, NVME_TIMEOUT_INFINITE);

}



static void

nvme_ctrlr_process_init_cap_done(void *ctx, uint64_t value, const struct spdk_nvme_cpl *cpl)

{

	struct spdk_nvme_ctrlr *ctrlr = ctx;



	if (spdk_nvme_cpl_is_error(cpl)) {

		NVME_CTRLR_ERRLOG(ctrlr, "Failed to read the CAP register\n");

		nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_ERROR, NVME_TIMEOUT_INFINITE);

		return;

	}



	ctrlr->cap.raw = value;

	nvme_ctrlr_init_cap(ctrlr);

	nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_CHECK_EN, NVME_TIMEOUT_INFINITE);

}



/**

 * This function will be called repeatedly during initialization until the controller is ready.

 */
@@ -3483,8 +3504,8 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) 
		break;



	case NVME_CTRLR_STATE_READ_CAP:

		nvme_ctrlr_init_cap(ctrlr);

		nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_CHECK_EN, NVME_TIMEOUT_INFINITE);

		nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_READ_CAP_WAIT_FOR_CAP, NVME_TIMEOUT_INFINITE);

		rc = nvme_ctrlr_get_cap_async(ctrlr, nvme_ctrlr_process_init_cap_done, ctrlr);

		break;



	case NVME_CTRLR_STATE_CHECK_EN:
@@ -3641,6 +3662,7 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) 
		return -1;



	case NVME_CTRLR_STATE_READ_VS_WAIT_FOR_VS:

	case NVME_CTRLR_STATE_READ_CAP_WAIT_FOR_CAP:

	case NVME_CTRLR_STATE_WAIT_FOR_IDENTIFY:

	case NVME_CTRLR_STATE_WAIT_FOR_IDENTIFY_IOCS_SPECIFIC:

	case NVME_CTRLR_STATE_WAIT_FOR_GET_ZNS_CMD_EFFECTS_LOG:
@@ -3750,8 +3772,6 @@ nvme_ctrlr_construct(struct spdk_nvme_ctrlr *ctrlr) 
static void

nvme_ctrlr_init_cap(struct spdk_nvme_ctrlr *ctrlr)

{

	nvme_ctrlr_get_cap(ctrlr, &ctrlr->cap);



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

		ctrlr->flags |= SPDK_NVME_CTRLR_WRR_SUPPORTED;

	}

lib/nvme/nvme_internal.h

+5 −0
Original line number Diff line number Diff line
@@ -573,6 +573,11 @@ enum nvme_ctrlr_state { 
	 */

	NVME_CTRLR_STATE_READ_CAP,



	/**

	 * Waiting for Capabilities (CAP) register to be read.

	 */

	NVME_CTRLR_STATE_READ_CAP_WAIT_FOR_CAP,



	/**

	 * Check EN to prepare for controller initialization.

	 */