ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: set AER configuration bits based on NVMe version

Browse Source 
Change-Id: Ia2fd4d31560c9117b167cbf12d2749c303e4cb8c
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/408772
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Changpeng Liu 2018-04-23 22:26:35 -04:00 committed by Daniel Verkamp
parent 396bedd09f
commit f0f3a48f40
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/nvme/nvme_ctrlr.c
View File

@ -1195,15 +1195,14 @@ nvme_ctrlr_construct_and_submit_aer(struct spdk_nvme_ctrlr *ctrlr,
} }
static int static int
nvme_ctrlr_configure_aer(struct spdk_nvme_ctrlr *ctrlr) _nvme_ctrlr_configure_aer(struct spdk_nvme_ctrlr *ctrlr)
{ {
union spdk_nvme_feat_async_event_configuration config; const struct spdk_nvme_ctrlr_data *cdata;
struct nvme_async_event_request *aer; union spdk_nvme_feat_async_event_configuration config;
uint32_t i; struct nvme_completion_poll_status status;
struct nvme_completion_poll_status status; int rc;
int rc;
status.done = false; cdata = spdk_nvme_ctrlr_get_data(ctrlr);
config.raw = 0; config.raw = 0;
config.bits.crit_warn.bits.available_spare = 1; config.bits.crit_warn.bits.available_spare = 1;
@ -1211,9 +1210,16 @@ nvme_ctrlr_configure_aer(struct spdk_nvme_ctrlr *ctrlr)
config.bits.crit_warn.bits.device_reliability = 1; config.bits.crit_warn.bits.device_reliability = 1;
config.bits.crit_warn.bits.read_only = 1; config.bits.crit_warn.bits.read_only = 1;
config.bits.crit_warn.bits.volatile_memory_backup = 1; config.bits.crit_warn.bits.volatile_memory_backup = 1;
config.bits.ns_attr_notice = 1;
config.bits.fw_activation_notice = 1; if (cdata->ver.raw >= SPDK_NVME_VERSION(1, 2, 0)) {
config.bits.telemetry_log_notice = 1; config.bits.ns_attr_notice = 1;
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;
}
status.done = false;
rc = nvme_ctrlr_cmd_set_async_event_config(ctrlr, config, nvme_completion_poll_cb, &status); rc = nvme_ctrlr_cmd_set_async_event_config(ctrlr, config, nvme_completion_poll_cb, &status);
if (rc != 0) { if (rc != 0) {
return rc; return rc;
@ -1223,7 +1229,22 @@ nvme_ctrlr_configure_aer(struct spdk_nvme_ctrlr *ctrlr)
spdk_nvme_qpair_process_completions(ctrlr->adminq, 0); spdk_nvme_qpair_process_completions(ctrlr->adminq, 0);
} }
if (spdk_nvme_cpl_is_error(&status.cpl)) { if (spdk_nvme_cpl_is_error(&status.cpl)) {
SPDK_ERRLOG("nvme_ctrlr_cmd_set_async_event_config failed!\n"); return -ENXIO;
}
return 0;
}
static int
nvme_ctrlr_configure_aer(struct spdk_nvme_ctrlr *ctrlr)
{
struct nvme_async_event_request *aer;
uint32_t i;
int rc;
rc = _nvme_ctrlr_configure_aer(ctrlr);
if (rc != 0) {
SPDK_NOTICELOG("nvme_ctrlr_configure_aer failed!\n");
return 0; return 0;
} }