From: Christoph Hellwig <hch@lst.de> To: linux-nvme@lists.infradead.org Cc: Jens Axboe <axboe@kernel.dk>, Keith Busch <keith.busch@intel.com>, Sagi Grimberg <sagi@grimberg.me>, Hannes Reinecke <hare@suse.de>, linux-block@vger.kernel.org, Hannes Reinecke <hare@suse.com> Subject: [PATCH 11/14] nvme: submit AEN event configuration on startup Date: Sat, 26 May 2018 12:27:32 +0200 [thread overview] Message-ID: <20180526102735.31404-12-hch@lst.de> (raw) In-Reply-To: <20180526102735.31404-1-hch@lst.de> From: Hannes Reinecke <hare@suse.de> We should register for AEN events; some law-abiding targets might not be sending us AENs otherwise. Signed-off-by: Hannes Reinecke <hare@suse.com> [hch: slight cleanups] Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/nvme/host/core.c | 17 +++++++++++++++++ drivers/nvme/host/nvme.h | 1 + 2 files changed, 18 insertions(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 86cb78653155..c0bc76d98194 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1030,6 +1030,21 @@ int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count) } EXPORT_SYMBOL_GPL(nvme_set_queue_count); +#define NVME_AEN_SUPPORTED \ + (NVME_AEN_CFG_NS_ATTR | NVME_AEN_CFG_FW_ACT) + +static void nvme_enable_aen(struct nvme_ctrl *ctrl) +{ + u32 result; + int status; + + status = nvme_set_features(ctrl, NVME_FEAT_ASYNC_EVENT, + ctrl->oaes & NVME_AEN_SUPPORTED, NULL, 0, &result); + if (status) + dev_warn(ctrl->device, "Failed to configure AEN (cfg %x)\n", + ctrl->oaes & NVME_AEN_SUPPORTED); +} + static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) { struct nvme_user_io io; @@ -2347,6 +2362,7 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) ctrl->oacs = le16_to_cpu(id->oacs); ctrl->oncs = le16_to_cpup(&id->oncs); + ctrl->oaes = le32_to_cpu(id->oaes); atomic_set(&ctrl->abort_limit, id->acl + 1); ctrl->vwc = id->vwc; ctrl->cntlid = le16_to_cpup(&id->cntlid); @@ -3379,6 +3395,7 @@ void nvme_start_ctrl(struct nvme_ctrl *ctrl) if (ctrl->queue_count > 1) { nvme_queue_scan(ctrl); + nvme_enable_aen(ctrl); queue_work(nvme_wq, &ctrl->async_event_work); nvme_start_queues(ctrl); } diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index ec6e4acc4d48..dcf9e9592c1a 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -176,6 +176,7 @@ struct nvme_ctrl { u16 kas; u8 npss; u8 apsta; + u32 oaes; u32 aen_result; unsigned int shutdown_timeout; unsigned int kato; -- 2.17.0
WARNING: multiple messages have this Message-ID (diff)
From: hch@lst.de (Christoph Hellwig) Subject: [PATCH 11/14] nvme: submit AEN event configuration on startup Date: Sat, 26 May 2018 12:27:32 +0200 [thread overview] Message-ID: <20180526102735.31404-12-hch@lst.de> (raw) In-Reply-To: <20180526102735.31404-1-hch@lst.de> From: Hannes Reinecke <hare@suse.de> We should register for AEN events; some law-abiding targets might not be sending us AENs otherwise. Signed-off-by: Hannes Reinecke <hare at suse.com> [hch: slight cleanups] Signed-off-by: Christoph Hellwig <hch at lst.de> --- drivers/nvme/host/core.c | 17 +++++++++++++++++ drivers/nvme/host/nvme.h | 1 + 2 files changed, 18 insertions(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 86cb78653155..c0bc76d98194 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1030,6 +1030,21 @@ int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count) } EXPORT_SYMBOL_GPL(nvme_set_queue_count); +#define NVME_AEN_SUPPORTED \ + (NVME_AEN_CFG_NS_ATTR | NVME_AEN_CFG_FW_ACT) + +static void nvme_enable_aen(struct nvme_ctrl *ctrl) +{ + u32 result; + int status; + + status = nvme_set_features(ctrl, NVME_FEAT_ASYNC_EVENT, + ctrl->oaes & NVME_AEN_SUPPORTED, NULL, 0, &result); + if (status) + dev_warn(ctrl->device, "Failed to configure AEN (cfg %x)\n", + ctrl->oaes & NVME_AEN_SUPPORTED); +} + static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) { struct nvme_user_io io; @@ -2347,6 +2362,7 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) ctrl->oacs = le16_to_cpu(id->oacs); ctrl->oncs = le16_to_cpup(&id->oncs); + ctrl->oaes = le32_to_cpu(id->oaes); atomic_set(&ctrl->abort_limit, id->acl + 1); ctrl->vwc = id->vwc; ctrl->cntlid = le16_to_cpup(&id->cntlid); @@ -3379,6 +3395,7 @@ void nvme_start_ctrl(struct nvme_ctrl *ctrl) if (ctrl->queue_count > 1) { nvme_queue_scan(ctrl); + nvme_enable_aen(ctrl); queue_work(nvme_wq, &ctrl->async_event_work); nvme_start_queues(ctrl); } diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index ec6e4acc4d48..dcf9e9592c1a 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -176,6 +176,7 @@ struct nvme_ctrl { u16 kas; u8 npss; u8 apsta; + u32 oaes; u32 aen_result; unsigned int shutdown_timeout; unsigned int kato; -- 2.17.0
next prev parent reply other threads:[~2018-05-26 10:27 UTC|newest] Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-26 10:27 nvme/nvmet AEN and log page fixups Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-26 10:27 ` [PATCH 01/14] block: unexport check_disk_size_change Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:33 ` Johannes Thumshirn 2018-05-28 6:33 ` Johannes Thumshirn 2018-05-26 10:27 ` [PATCH 02/14] block: don't print a message when the device went away Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:34 ` Johannes Thumshirn 2018-05-28 6:34 ` Johannes Thumshirn 2018-05-26 10:27 ` [PATCH 03/14] nvme.h: untangle AEN notice definitions Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:35 ` Johannes Thumshirn 2018-05-28 6:35 ` Johannes Thumshirn 2018-05-26 10:27 ` [PATCH 04/14] nvme.h: add the changed namespace list log Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:35 ` Johannes Thumshirn 2018-05-28 6:35 ` Johannes Thumshirn 2018-05-26 10:27 ` [PATCH 05/14] nvme.h: add AER configuration symbols Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:35 ` Johannes Thumshirn 2018-05-28 6:35 ` Johannes Thumshirn 2018-05-26 10:27 ` [PATCH 06/14] nvmet: add a new nvmet_zero_sgl helper Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:36 ` Johannes Thumshirn 2018-05-28 6:36 ` Johannes Thumshirn 2018-05-29 8:13 ` Christoph Hellwig 2018-05-29 8:13 ` Christoph Hellwig 2018-05-26 10:27 ` [PATCH 07/14] nvmet: split log page implementation Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:38 ` Johannes Thumshirn 2018-05-28 6:38 ` Johannes Thumshirn 2018-05-26 10:27 ` [PATCH 08/14] nvmet: implement the changed namespaces log Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:53 ` Johannes Thumshirn 2018-05-28 6:53 ` Johannes Thumshirn 2018-05-29 8:17 ` Christoph Hellwig 2018-05-29 8:17 ` Christoph Hellwig 2018-05-29 8:16 ` Johannes Thumshirn 2018-05-29 8:16 ` Johannes Thumshirn 2018-05-29 8:24 ` Christoph Hellwig 2018-05-29 8:24 ` Christoph Hellwig 2018-05-29 16:59 ` Verkamp, Daniel 2018-05-29 16:59 ` Verkamp, Daniel 2018-05-29 17:24 ` Christoph Hellwig 2018-05-29 17:24 ` Christoph Hellwig 2018-05-29 20:44 ` Daniel Verkamp 2018-05-29 20:44 ` Daniel Verkamp 2018-05-26 10:27 ` [PATCH 09/14] nvmet: Add AEN configuration support Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:54 ` Johannes Thumshirn 2018-05-28 6:54 ` Johannes Thumshirn 2018-05-29 17:15 ` Verkamp, Daniel 2018-05-29 17:15 ` Verkamp, Daniel 2018-05-29 17:29 ` Christoph Hellwig 2018-05-29 17:29 ` Christoph Hellwig 2018-05-29 17:35 ` Verkamp, Daniel 2018-05-29 17:35 ` Verkamp, Daniel 2018-05-29 17:45 ` Christoph Hellwig 2018-05-29 17:45 ` Christoph Hellwig 2018-05-26 10:27 ` [PATCH 10/14] nvmet: mask pending AERs Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:56 ` Johannes Thumshirn 2018-05-28 6:56 ` Johannes Thumshirn 2018-05-26 10:27 ` Christoph Hellwig [this message] 2018-05-26 10:27 ` [PATCH 11/14] nvme: submit AEN event configuration on startup Christoph Hellwig 2018-05-28 6:56 ` Johannes Thumshirn 2018-05-28 6:56 ` Johannes Thumshirn 2018-05-26 10:27 ` [PATCH 12/14] nvme: mark nvme_queue_scan static Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 6:57 ` Johannes Thumshirn 2018-05-28 6:57 ` Johannes Thumshirn 2018-05-26 10:27 ` [PATCH 13/14] nvme: use the changed namespaces list log to clear ns data changed AENs Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-26 12:05 ` Popuri, Sriram 2018-05-26 12:05 ` Popuri, Sriram 2018-05-26 12:21 ` Christoph Hellwig 2018-05-26 12:21 ` Christoph Hellwig 2018-05-26 13:02 ` Knight, Frederick 2018-05-28 6:59 ` Johannes Thumshirn 2018-05-28 6:59 ` Johannes Thumshirn 2018-06-04 19:59 ` Keith Busch 2018-06-04 19:59 ` Keith Busch 2018-06-05 4:47 ` Christoph Hellwig 2018-06-05 4:47 ` Christoph Hellwig 2018-06-05 14:37 ` Keith Busch 2018-06-05 14:37 ` Keith Busch 2018-05-26 10:27 ` [PATCH 14/14] nvme: limit warnings from nvme_identify_ns Christoph Hellwig 2018-05-26 10:27 ` Christoph Hellwig 2018-05-28 7:00 ` Johannes Thumshirn 2018-05-28 7:00 ` Johannes Thumshirn
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180526102735.31404-12-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@kernel.dk \ --cc=hare@suse.com \ --cc=hare@suse.de \ --cc=keith.busch@intel.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=sagi@grimberg.me \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.