Merge branch 'for-3.10/drivers' of git://git.kernel.dk/linux-block

Pull block driver updates from Jens Axboe:
 "It might look big in volume, but when categorized, not a lot of
  drivers are touched.  The pull request contains:

   - mtip32xx fixes from Micron.

   - A slew of drbd updates, this time in a nicer series.

   - bcache, a flash/ssd caching framework from Kent.

   - Fixes for cciss"

* 'for-3.10/drivers' of git://git.kernel.dk/linux-block: (66 commits)
  bcache: Use bd_link_disk_holder()
  bcache: Allocator cleanup/fixes
  cciss: bug fix to prevent cciss from loading in kdump crash kernel
  cciss: add cciss_allow_hpsa module parameter
  drivers/block/mg_disk.c: add CONFIG_PM_SLEEP to suspend/resume functions
  mtip32xx: Workaround for unaligned writes
  bcache: Make sure blocksize isn't smaller than device blocksize
  bcache: Fix merge_bvec_fn usage for when it modifies the bvm
  bcache: Correctly check against BIO_MAX_PAGES
  bcache: Hack around stuff that clones up to bi_max_vecs
  bcache: Set ra_pages based on backing device's ra_pages
  bcache: Take data offset from the bdev superblock.
  mtip32xx: mtip32xx: Disable TRIM support
  mtip32xx: fix a smatch warning
  bcache: Disable broken btree fuzz tester
  bcache: Fix a format string overflow
  bcache: Fix a minor memory leak on device teardown
  bcache: Documentation updates
  bcache: Use WARN_ONCE() instead of __WARN()
  bcache: Add missing #include <linux/prefetch.h>
  ...

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/block/mtip32xx/mtip32xx.h b/drivers/block/mtip32xx/mtip32xx.h
index 8e8334c9dd0f..3bb8a295fbe4 100644
--- a/drivers/block/mtip32xx/mtip32xx.h
+++ b/drivers/block/mtip32xx/mtip32xx.h
@@ -52,6 +52,9 @@
 #define MTIP_FTL_REBUILD_MAGIC          0xED51
 #define MTIP_FTL_REBUILD_TIMEOUT_MS     2400000
 
+/* unaligned IO handling */
+#define MTIP_MAX_UNALIGNED_SLOTS        8
+
 /* Macro to extract the tag bit number from a tag value. */
 #define MTIP_TAG_BIT(tag)       (tag & 0x1F)
 
@@ -333,6 +336,8 @@ struct mtip_cmd {
 
         int scatter_ents; /* Number of scatter list entries used */
 
+        int unaligned; /* command is unaligned on 4k boundary */
+
         struct scatterlist sg[MTIP_MAX_SG]; /* Scatter list entries */
 
         int retries; /* The number of retries left for this command. */
@@ -452,6 +457,10 @@ struct mtip_port {
          * command slots available.
          */
         struct semaphore cmd_slot;
+
+        /* Semaphore to control queue depth of unaligned IOs */
+        struct semaphore cmd_slot_unal;
+
         /* Spinlock for working around command-issue bug. */
         spinlock_t cmd_issue_lock[MTIP_MAX_SLOT_GROUPS];
 };
@@ -502,6 +511,8 @@ struct driver_data {
 
         int isr_binding;
 
+        int unal_qdepth; /* qdepth of unaligned IO queue */
+
         struct list_head online_list; /* linkage for online list */
 
         struct list_head remove_list; /* linkage for removing list */