sd, scsi_lib: fix recognition of cache type of Initio SBP-2 bridges
PATCH 2/2 sd, scsi_lib: fix recognition of cache type of Initio SBP-2 bridges
sd, scsi_lib: fix recognition of cache type of Initio SBP-2 bridges
Regardless what mode page was asked for, Initio INIC-14x0 and INIC-2430 always return page 6 without mode page headers. Check for this breakage in scsi_mode_sense().
Taken from a patch by Al Viro <[email protected]>.
http://marc.theaimsgroup.com/?l=linux-scsi&m=114055884611429
Signed-off-by Stefan Richter <[email protected]>
---
Depends on patch "sd: fix memory corruption by sd_read_cache_type".
This cache type fix is applicable to 2.6.14, 2.6.15, and 2.6.16 as well but is definitely of less importance than the memory corruption patch.
drivers/scsi/scsi_lib.c +11 -2
@@ -1893,8 +1893,16 @@ scsi_mode_sense(struct scsi_device *sdev }if (scsi_status_is_good (result)) { - data->header_length = header_length; -if (use_10_for_ms) { +if (unlikely (buffer[0 ] ==0x86 && buffer[1 ] ==0x0b && + (modepage ==6 || modepage ==8 ))) { +/* Initio breakage? */ + header_length =0 ; + data->length =13 ; + data->medium_type =0 ; + data->device_specific =0 ; + data->longlba =0 ; + data->block_descriptor_length =0 ; + }else if (use_10_for_ms) { data->length = buffer[0 ]*256 + buffer[1 ] +2 ; data->medium_type = buffer[2 ]; data->device_specific = buffer[3 ];
@@ -1907,6 +1915,7 @@ scsi_mode_sense(struct scsi_device *sdev data->device_specific = buffer[2 ]; data->block_descriptor_length = buffer[3 ]; } + data->header_length = header_length; }return result;
drivers/scsi/sd.c +6 -0
@@ -1328,6 +1328,12 @@ sd_read_cache_type(struct scsi_disk *sdkif (!scsi_status_is_good (res)) goto bad_sense; +if (!data.header_length) { + modepage =6 ; +printk (KERN_ERR "%s: missing header in MODE_SENSE response\n" , + diskname); + } +/* that went OK, now ask for the proper length */ len = data.length;