From b8edc465e2e7cee3e7ef42d5b2a7f310a43d02ac Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 27 Apr 2018 14:20:37 -0700 Subject: [PATCH] nvme: check Optional Asynchronous Events Supported In addition to checking for the required version, also use the OAES bits to determine which features to request. Change-Id: Idb07e4175cca5609904876bd17d912b50bc6b62a Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/409352 Reviewed-by: Jim Harris Tested-by: SPDK Automated Test System --- lib/nvme/nvme_ctrlr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 96545addc..4d8adfa8a 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -1212,8 +1212,12 @@ _nvme_ctrlr_configure_aer(struct spdk_nvme_ctrlr *ctrlr) config.bits.crit_warn.bits.volatile_memory_backup = 1; if (cdata->ver.raw >= SPDK_NVME_VERSION(1, 2, 0)) { - config.bits.ns_attr_notice = 1; - config.bits.fw_activation_notice = 1; + if (ctrlr->cdata.oaes.ns_attribute_notices) { + config.bits.ns_attr_notice = 1; + } + if (ctrlr->cdata.oaes.fw_activation_notices) { + config.bits.fw_activation_notice = 1; + } } if (cdata->ver.raw >= SPDK_NVME_VERSION(1, 3, 0) && cdata->lpa.telemetry) { config.bits.telemetry_log_notice = 1;