Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 878b17a..5616cd7 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1307,6 +1307,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
        int sense_valid = 0;
        int the_result;
        int retries = 3;
+       unsigned int alignment;
        unsigned long long lba;
        unsigned sector_size;
 
@@ -1358,6 +1359,16 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
                return -EOVERFLOW;
        }
 
+       /* Logical blocks per physical block exponent */
+       sdkp->hw_sector_size = (1 << (buffer[13] & 0xf)) * sector_size;
+
+       /* Lowest aligned logical block */
+       alignment = ((buffer[14] & 0x3f) << 8 | buffer[15]) * sector_size;
+       blk_queue_alignment_offset(sdp->request_queue, alignment);
+       if (alignment && sdkp->first_scan)
+               sd_printk(KERN_NOTICE, sdkp,
+                         "physical block alignment offset: %u\n", alignment);
+
        sdkp->capacity = lba + 1;
        return sector_size;
 }
@@ -1409,6 +1420,7 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
        }
 
        sdkp->capacity = lba + 1;
+       sdkp->hw_sector_size = sector_size;
        return sector_size;
 }
 
@@ -1521,11 +1533,17 @@ got_data:
                string_get_size(sz, STRING_UNITS_10, cap_str_10,
                                sizeof(cap_str_10));
 
-               if (sdkp->first_scan || old_capacity != sdkp->capacity)
+               if (sdkp->first_scan || old_capacity != sdkp->capacity) {
                        sd_printk(KERN_NOTICE, sdkp,
-                                 "%llu %d-byte hardware sectors: (%s/%s)\n",
+                                 "%llu %d-byte logical blocks: (%s/%s)\n",
                                  (unsigned long long)sdkp->capacity,
                                  sector_size, cap_str_10, cap_str_2);
+
+                       if (sdkp->hw_sector_size != sector_size)
+                               sd_printk(KERN_NOTICE, sdkp,
+                                         "%u-byte physical blocks\n",
+                                         sdkp->hw_sector_size);
+               }
        }
 
        /* Rescale capacity to 512-byte units */
@@ -1538,6 +1556,7 @@ got_data:
        else if (sector_size == 256)
                sdkp->capacity >>= 1;
 
+       blk_queue_physical_block_size(sdp->request_queue, sdkp->hw_sector_size);
        sdkp->device->sector_size = sector_size;
 }
 
@@ -1775,6 +1794,52 @@ void sd_read_app_tag_own(struct scsi_disk *sdkp, unsigned char *buffer)
        return;
 }
 
+/**
+ * sd_read_block_limits - Query disk device for preferred I/O sizes.
+ * @disk: disk to query
+ */
+static void sd_read_block_limits(struct scsi_disk *sdkp)
+{
+       unsigned int sector_sz = sdkp->device->sector_size;
+       char *buffer;
+
+       /* Block Limits VPD */
+       buffer = scsi_get_vpd_page(sdkp->device, 0xb0);
+
+       if (buffer == NULL)
+               return;
+
+       blk_queue_io_min(sdkp->disk->queue,
+                        get_unaligned_be16(&buffer[6]) * sector_sz);
+       blk_queue_io_opt(sdkp->disk->queue,
+                        get_unaligned_be32(&buffer[12]) * sector_sz);
+
+       kfree(buffer);
+}
+
+/**
+ * sd_read_block_characteristics - Query block dev. characteristics
+ * @disk: disk to query
+ */
+static void sd_read_block_characteristics(struct scsi_disk *sdkp)
+{
+       char *buffer;
+       u16 rot;
+
+       /* Block Device Characteristics VPD */
+       buffer = scsi_get_vpd_page(sdkp->device, 0xb1);
+
+       if (buffer == NULL)
+               return;
+
+       rot = get_unaligned_be16(&buffer[4]);
+
+       if (rot == 1)
+               queue_flag_set_unlocked(QUEUE_FLAG_NONROT, sdkp->disk->queue);
+
+       kfree(buffer);
+}
+
 /**
  *     sd_revalidate_disk - called the first time a new disk is seen,
  *     performs disk spin up, read_capacity, etc.
@@ -1812,6 +1877,8 @@ static int sd_revalidate_disk(struct gendisk *disk)
         */
        if (sdkp->media_present) {
                sd_read_capacity(sdkp, buffer);
+               sd_read_block_limits(sdkp);
+               sd_read_block_characteristics(sdkp);
                sd_read_write_protect_flag(sdkp, buffer);
                sd_read_cache_type(sdkp, buffer);
                sd_read_app_tag_own(sdkp, buffer);
@@ -1934,6 +2001,8 @@ static void sd_probe_async(void *data, async_cookie_t cookie)
        add_disk(gd);
        sd_dif_config_host(sdkp);
 
+       sd_revalidate_disk(gd);
+
        sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
                  sdp->removable ? "removable " : "");
 }
@@ -2054,6 +2123,7 @@ static int sd_remove(struct device *dev)
 
        async_synchronize_full();
        sdkp = dev_get_drvdata(dev);
+       blk_queue_prep_rq(sdkp->device->request_queue, scsi_prep_fn);
        device_del(&sdkp->dev);
        del_gendisk(sdkp->disk);
        sd_shutdown(dev);