summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2014-05-13 11:42:02 -0600
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2014-06-03 22:57:56 -0400
commit9d43cf646eab948db81913379dacb1dcecacb1eb (patch)
tree238dd44f9079cd7aa4d97a2f71cabe3669b4f283 /drivers
parent61e4ce086df0a64a555880089e3b782517c828c0 (diff)
downloadlinux-stable-9d43cf646eab948db81913379dacb1dcecacb1eb.tar.gz
linux-stable-9d43cf646eab948db81913379dacb1dcecacb1eb.tar.bz2
linux-stable-9d43cf646eab948db81913379dacb1dcecacb1eb.zip
NVMe: Make admin timeout a module parameter
Signed-off-by: Keith Busch <keith.busch@intel.com> [made admin_timeout static] Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/nvme-core.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 1a911067061c..12c57eb7c915 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -44,11 +44,15 @@
#include <trace/events/block.h>
-#define NVME_Q_DEPTH 1024
+#define NVME_Q_DEPTH 1024
#define SQ_SIZE(depth) (depth * sizeof(struct nvme_command))
#define CQ_SIZE(depth) (depth * sizeof(struct nvme_completion))
-#define ADMIN_TIMEOUT (60 * HZ)
-#define IOD_TIMEOUT (retry_time * HZ)
+#define ADMIN_TIMEOUT (admin_timeout * HZ)
+#define IOD_TIMEOUT (retry_time * HZ)
+
+static unsigned char admin_timeout = 60;
+module_param(admin_timeout, byte, 0644);
+MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands");
unsigned char io_timeout = 30;
module_param(io_timeout, byte, 0644);