summaryrefslogtreecommitdiffstats
path: root/drivers/nvme/host/nvme.h
diff options
context:
space:
mode:
authorArnav Dawn2017-07-12 12:40:40 +0200
committerChristoph Hellwig2017-08-28 21:38:17 +0200
commitb6dccf7fae4331b0ea41cf087e3f02d5db9161dc (patch)
treedb9b0a9a59990b07642d6b9c61c022aa8ef99244 /drivers/nvme/host/nvme.h
parentMerge tag 'v4.13-rc7' into for-4.14/block-postmerge (diff)
downloadkernel-qcow2-linux-b6dccf7fae4331b0ea41cf087e3f02d5db9161dc.tar.gz
kernel-qcow2-linux-b6dccf7fae4331b0ea41cf087e3f02d5db9161dc.tar.xz
kernel-qcow2-linux-b6dccf7fae4331b0ea41cf087e3f02d5db9161dc.zip
nvme: add support for FW activation without reset
This patch adds support for handling Fw activation without reset On completion of FW-activation-starting AER, all queues are paused till CSTS.PP is cleared or timed out (exceeds max time for fw activtion MTFA). If device fails to clear CSTS.PP within MTFA, driver issues reset controller. Signed-off-by: Arnav Dawn <a.dawn@samsung.com> Reviewed-by: Keith Busch <keith.busch@intel.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Diffstat (limited to 'drivers/nvme/host/nvme.h')
-rw-r--r--drivers/nvme/host/nvme.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 8f2a168ddc01..b40b9af4564f 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -142,6 +142,7 @@ struct nvme_ctrl {
u16 cntlid;
u32 ctrl_config;
+ u16 mtfa;
u32 queue_count;
u64 cap;
@@ -167,6 +168,7 @@ struct nvme_ctrl {
struct work_struct scan_work;
struct work_struct async_event_work;
struct delayed_work ka_work;
+ struct work_struct fw_act_work;
/* Power saving configuration */
u64 ps_max_latency_us;