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

nvme: don't try to enable intel log pages on fabrics ctrlrs 



By default, the SPDK nvmf target reports vid==INTEL,
which results in the SPDK nvme driver trying to enable
Intel vendor-specific log page.  Fix this by trying to
enable those log pages only for PCIE transport
controllers.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent 988ce2ec

lib/nvme/nvme_ctrlr.c

+3 −1
Original line number Diff line number Diff line
@@ -886,7 +886,9 @@ nvme_ctrlr_set_supported_log_pages(struct spdk_nvme_ctrlr *ctrlr) 
		}

	}



	if (ctrlr->cdata.vid == SPDK_PCI_VID_INTEL && !(ctrlr->quirks & NVME_INTEL_QUIRK_NO_LOG_PAGES)) {

	if (ctrlr->cdata.vid == SPDK_PCI_VID_INTEL &&

	    ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_PCIE &&

	    !(ctrlr->quirks & NVME_INTEL_QUIRK_NO_LOG_PAGES)) {

		nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_SET_SUPPORTED_INTEL_LOG_PAGES,

				     ctrlr->opts.admin_timeout_ms);

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

+1 −0
Original line number Diff line number Diff line
@@ -3068,6 +3068,7 @@ test_nvme_ctrlr_set_intel_supported_log_pages(void) 


	ctrlr.opts.admin_timeout_ms = NVME_TIMEOUT_INFINITE;

	ctrlr.cdata.vid = SPDK_PCI_VID_INTEL;

	ctrlr.trid.trtype = SPDK_NVME_TRANSPORT_PCIE;

	ctrlr.state = NVME_CTRLR_STATE_SET_SUPPORTED_LOG_PAGES;



	CU_ASSERT(nvme_ctrlr_process_init(&ctrlr) == 0);