Merge git://git.infradead.org/users/willy/linux-nvme

Pull NVMe update from Matthew Wilcox:
 "Mostly bugfixes again for the NVMe driver.  I'd like to call out the
  exported tracepoint in the block layer; I believe Keith has cleared
  this with Jens.

  We've had a few reports from people who're really pounding on NVMe
  devices at scale, hence the timeout changes (and new module
  parameters), hotplug cpu deadlock, tracepoints, and minor performance
  tweaks"

[ Jens hadn't seen that tracepoint thing, but is ok with it - it will
  end up going away when mq conversion happens ]

* git://git.infradead.org/users/willy/linux-nvme: (22 commits)
  NVMe: Fix START_STOP_UNIT Scsi->NVMe translation.
  NVMe: Use Log Page constants in SCSI emulation
  NVMe: Define Log Page constants
  NVMe: Fix hot cpu notification dead lock
  NVMe: Rename io_timeout to nvme_io_timeout
  NVMe: Use last bytes of f/w rev SCSI Inquiry
  NVMe: Adhere to request queue block accounting enable/disable
  NVMe: Fix nvme get/put queue semantics
  NVMe: Delete NVME_GET_FEAT_TEMP_THRESH
  NVMe: Make admin timeout a module parameter
  NVMe: Make iod bio timeout a parameter
  NVMe: Prevent possible NULL pointer dereference
  NVMe: Fix the buffer size passed in GetLogPage(CDW10.NUMD)
  NVMe: Update data structures for NVMe 1.2
  NVMe: Enable BUILD_BUG_ON checks
  NVMe: Update namespace and controller identify structures to the 1.1a spec
  NVMe: Flush with data support
  NVMe: Configure support for block flush
  NVMe: Add tracepoints
  NVMe: Protect against badly formatted CQEs
  ...

2 files changed, 44 insertions, 20 deletions

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index a50173ca1d72..2bf403195c09 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -1,6 +1,6 @@
 /*
  * Definitions for the NVM Express interface
- * Copyright (c) 2011-2013, Intel Corporation.
+ * Copyright (c) 2011-2014, Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -10,10 +10,6 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _LINUX_NVME_H
@@ -66,8 +62,8 @@ enum {
 
 #define NVME_VS(major, minor)   (major << 16 | minor)
 
-extern unsigned char io_timeout;
-#define NVME_IO_TIMEOUT (io_timeout * HZ)
+extern unsigned char nvme_io_timeout;
+#define NVME_IO_TIMEOUT (nvme_io_timeout * HZ)
 
 /*
  * Represents an NVM Express device.  Each nvme_dev is a PCI function.
@@ -94,7 +90,7 @@ struct nvme_dev {
         struct miscdevice miscdev;
         work_func_t reset_workfn;
         struct work_struct reset_work;
-        struct notifier_block nb;
+        struct work_struct cpu_work;
         char name[12];
         char serial[20];
         char model[40];
@@ -103,6 +99,7 @@ struct nvme_dev {
         u32 stripe_size;
         u16 oncs;
         u16 abort_limit;
+        u8 vwc;
         u8 initialized;
 };
 
@@ -159,7 +156,6 @@ struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write,
 void nvme_unmap_user_pages(struct nvme_dev *dev, int write,
                         struct nvme_iod *iod);
 int nvme_submit_io_cmd(struct nvme_dev *, struct nvme_command *, u32 *);
-int nvme_submit_flush_data(struct nvme_queue *nvmeq, struct nvme_ns *ns);
 int nvme_submit_admin_cmd(struct nvme_dev *, struct nvme_command *,
                                                         u32 *result);
 int nvme_identify(struct nvme_dev *, unsigned nsid, unsigned cns,
diff --git a/include/uapi/linux/nvme.h b/include/uapi/linux/nvme.h
index 096fe1c6f83d..29a7d8619d8d 100644
--- a/include/uapi/linux/nvme.h
+++ b/include/uapi/linux/nvme.h
@@ -1,6 +1,6 @@
 /*
  * Definitions for the NVM Express interface
- * Copyright (c) 2011-2013, Intel Corporation.
+ * Copyright (c) 2011-2014, Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -10,10 +10,6 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _UAPI_LINUX_NVME_H
@@ -31,7 +27,12 @@ struct nvme_id_power_state {
         __u8                    read_lat;
         __u8                    write_tput;
         __u8                    write_lat;
-        __u8                    rsvd16[16];
+        __le16                  idle_power;
+        __u8                    idle_scale;
+        __u8                    rsvd19;
+        __le16                  active_power;
+        __u8                    active_work_scale;
+        __u8                    rsvd23[9];
 };
 
 enum {
@@ -49,7 +50,9 @@ struct nvme_id_ctrl {
         __u8                    ieee[3];
         __u8                    mic;
         __u8                    mdts;
-        __u8                    rsvd78[178];
+        __u16                   cntlid;
+        __u32                   ver;
+        __u8                    rsvd84[172];
         __le16                  oacs;
         __u8                    acl;
         __u8                    aerl;
@@ -57,7 +60,11 @@ struct nvme_id_ctrl {
         __u8                    lpa;
         __u8                    elpe;
         __u8                    npss;
-        __u8                    rsvd264[248];
+        __u8                    avscc;
+        __u8                    apsta;
+        __le16                  wctemp;
+        __le16                  cctemp;
+        __u8                    rsvd270[242];
         __u8                    sqes;
         __u8                    cqes;
         __u8                    rsvd514[2];
@@ -68,7 +75,12 @@ struct nvme_id_ctrl {
         __u8                    vwc;
         __le16                  awun;
         __le16                  awupf;
-        __u8                    rsvd530[1518];
+        __u8                    nvscc;
+        __u8                    rsvd531;
+        __le16                  acwu;
+        __u8                    rsvd534[2];
+        __le32                  sgls;
+        __u8                    rsvd540[1508];
         struct nvme_id_power_state      psd[32];
         __u8                    vs[1024];
 };
@@ -77,6 +89,7 @@ enum {
         NVME_CTRL_ONCS_COMPARE                  = 1 << 0,
         NVME_CTRL_ONCS_WRITE_UNCORRECTABLE      = 1 << 1,
         NVME_CTRL_ONCS_DSM                      = 1 << 2,
+        NVME_CTRL_VWC_PRESENT                   = 1 << 0,
 };
 
 struct nvme_lbaf {
@@ -95,7 +108,15 @@ struct nvme_id_ns {
         __u8                    mc;
         __u8                    dpc;
         __u8                    dps;
-        __u8                    rsvd30[98];
+        __u8                    nmic;
+        __u8                    rescap;
+        __u8                    fpi;
+        __u8                    rsvd33;
+        __le16                  nawun;
+        __le16                  nawupf;
+        __le16                  nacwu;
+        __u8                    rsvd40[80];
+        __u8                    eui64[8];
         struct nvme_lbaf        lbaf[16];
         __u8                    rsvd192[192];
         __u8                    vs[3712];
@@ -126,7 +147,10 @@ struct nvme_smart_log {
         __u8                    unsafe_shutdowns[16];
         __u8                    media_errors[16];
         __u8                    num_err_log_entries[16];
-        __u8                    rsvd192[320];
+        __le32                  warning_temp_time;
+        __le32                  critical_comp_time;
+        __le16                  temp_sensor[8];
+        __u8                    rsvd216[296];
 };
 
 enum {
@@ -282,6 +306,10 @@ enum {
         NVME_FEAT_WRITE_ATOMIC  = 0x0a,
         NVME_FEAT_ASYNC_EVENT   = 0x0b,
         NVME_FEAT_SW_PROGRESS   = 0x0c,
+        NVME_LOG_ERROR          = 0x01,
+        NVME_LOG_SMART          = 0x02,
+        NVME_LOG_FW_SLOT        = 0x03,
+        NVME_LOG_RESERVATION    = 0x80,
         NVME_FWACT_REPL         = (0 << 3),
         NVME_FWACT_REPL_ACTV    = (1 << 3),
         NVME_FWACT_ACTV         = (2 << 3),