Commit 0825befa authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvme: use saved CC register value when creating IO qpairs 



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


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 9e216680

lib/nvme/nvme_ctrlr.c

+1 −5
Original line number Diff line number Diff line
@@ -387,11 +387,7 @@ nvme_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, 
	}



	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);

	if (nvme_ctrlr_get_cc(ctrlr, &cc)) {

		NVME_CTRLR_ERRLOG(ctrlr, "get_cc failed\n");

		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

		return NULL;

	}

	cc.raw = ctrlr->process_init_cc.raw;



	if (opts->qprio & ~SPDK_NVME_CREATE_IO_SQ_QPRIO_MASK) {

		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c

+2 −2
Original line number Diff line number Diff line
@@ -1578,7 +1578,7 @@ test_alloc_io_qpair_wrr_1(void) 
	 * Fake to simulate the controller with weighted round robin

	 * arbitration mechanism.

	 */

	g_ut_nvme_regs.cc.bits.ams = SPDK_NVME_CC_AMS_WRR;

	ctrlr.process_init_cc.bits.ams = SPDK_NVME_CC_AMS_WRR;



	spdk_nvme_ctrlr_get_default_io_qpair_opts(&ctrlr, &opts, sizeof(opts));
@@ -1632,7 +1632,7 @@ test_alloc_io_qpair_wrr_2(void) 
	 * Fake to simulate the controller with weighted round robin

	 * arbitration mechanism.

	 */

	g_ut_nvme_regs.cc.bits.ams = SPDK_NVME_CC_AMS_WRR;

	ctrlr.process_init_cc.bits.ams = SPDK_NVME_CC_AMS_WRR;



	spdk_nvme_ctrlr_get_default_io_qpair_opts(&ctrlr, &opts, sizeof(opts));