Il 12/11/2012 12:33, James Bottomley ha scritto:
> On Fri, 2012-11-09 at 11:08 -0500, Jason J. Herne wrote:
>> diff --git a/drivers/usb/storage/scsiglue.c
>> b/drivers/usb/storage/scsiglue.c
>> index 13b8bcd..6ff785e 100644
>> --- a/drivers/usb/storage/scsiglue.c
>> +++ b/drivers/usb/storage/scsiglue.c
>> @@ -251,6 +251,11 @@ static int slave_configure(struct scsi_device
>> *sdev)
>> US_FL_SCM_MULT_TARG)) &&
>> us->protocol == USB_PR_BULK)
>> us->use_last_sector_hacks = 1;
>> +
>> + /* Force read-16 for large capacity drives. */
>> + sdev->force_read_16 = 1;
>> +
>> +
>
> This turns READ_16 on unconditionally for all USB disks ... is that
> safe? As in have you tested this with older USB thumb drives?
Actually it only turns it on for large capacity drives, as said in the
comment. sdp->force_read_16 only matters for >2TB drives:
>> + /* Many large capacity USB drives/controllers require the use of read(16). */
>> + force_read16 = (sdkp->capacity > 0xffffffffULL && sdp->force_read_16);
>> +
>> if (host_dif == SD_DIF_TYPE2_PROTECTION) {
>> SCpnt->cmnd = mempool_alloc(sd_cdb_pool, GFP_ATOMIC);
>>
>> @@ -833,7 +836,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
>> SCpnt->cmnd[29] = (unsigned char) (this_count >> 16) & 0xff;
>> SCpnt->cmnd[30] = (unsigned char) (this_count >> 8) & 0xff;
>> SCpnt->cmnd[31] = (unsigned char) this_count & 0xff;
>> - } else if (block > 0xffffffff) {
>> + } else if (block > 0xffffffff || force_read16) {
so the better name would be never_use_10_for_rw_on_large_disks. For
some definitions of better. :)
Any reason not to do this always on >2TB drives, which basically means
changing this:
- } else if (block > 0xffffffff) {
+ } else if (sdkp->capacity > 0xffffffff) {
and nothing else?
Paolo
>
>> diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
>> index 5591ed5..e92b846 100644
>> --- a/include/scsi/scsi_device.h
>> +++ b/include/scsi/scsi_device.h
>> @@ -134,6 +134,7 @@ struct scsi_device {
>> * because we did a bus reset. */
>> unsigned use_10_for_rw:1; /* first try 10-byte read / write */
>> unsigned use_10_for_ms:1; /* first try 10-byte mode
>> sense/select */
>> + unsigned force_read_16:1; /* Use read(16) over read(10) */
>
> This should probably be use_16_for_rw:1 for consistency.
>
> James
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
