diff options
author | Al Viro <viro@parcelfarce.linux.theplanet.co.uk> | 2005-05-15 20:59:55 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-26 09:41:15 -0400 |
commit | 631e8a1398ce4cfef8b30678d51daf0c64313a09 (patch) | |
tree | 14d3b601b4a7160568c58d53a94a0a4711094588 /drivers/ieee1394/sbp2.c | |
parent | 53222b906903fd861dc24ebccfa07ee125941313 (diff) |
[SCSI] TYPE_RBC cache fixes (sbp2.c affected)
a) TYPE_SDAD renamed to TYPE_RBC and taken to scsi.h
b) in sbp2.c remapping of TYPE_RPB to TYPE_DISK turned off
c) relevant places in midlayer and sd.c taught to accept TYPE_RBC
d) sd.c::sd_read_cache_type() looks into page 6 when dealing with
TYPE_RBC - these guys have writeback cache flag there and are not guaranteed
to have page 8 at all.
e) sd_read_cache_type() got an extra sanity check - it checks that
it got the page it asked for before using its contents. And screams if
mismatch had happened. Rationale: there are broken devices out there that
are "helpful" enough to go for "I don't have a page you've asked for, here,
have another one". For example, PL3507 had been caught doing just that...
f) sbp2 sets sdev->use_10_for_rw and sdev->use_10_for_ms instead
of bothering to remap READ6/WRITE6/MOD_SENSE, so most of the conversions
in there are gone now.
Incidentally, I wonder if USB storage devices that have no
mode page 8 are simply RBC ones. I haven't touched that, but it might
be interesting to check...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/ieee1394/sbp2.c')
-rw-r--r-- | drivers/ieee1394/sbp2.c | 130 |
1 files changed, 3 insertions, 127 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 00c7b958361a..094e646ed4de 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
@@ -1070,7 +1070,7 @@ static int sbp2_handle_physdma_read(struct hpsb_host *host, int nodeid, quadlet_ | |||
1070 | static __inline__ int sbp2_command_conversion_device_type(u8 device_type) | 1070 | static __inline__ int sbp2_command_conversion_device_type(u8 device_type) |
1071 | { | 1071 | { |
1072 | return (((device_type == TYPE_DISK) || | 1072 | return (((device_type == TYPE_DISK) || |
1073 | (device_type == TYPE_SDAD) || | 1073 | (device_type == TYPE_RBC) || |
1074 | (device_type == TYPE_ROM)) ? 1:0); | 1074 | (device_type == TYPE_ROM)) ? 1:0); |
1075 | } | 1075 | } |
1076 | 1076 | ||
@@ -2111,102 +2111,6 @@ static int sbp2_send_command(struct scsi_id_instance_data *scsi_id, | |||
2111 | */ | 2111 | */ |
2112 | static void sbp2_check_sbp2_command(struct scsi_id_instance_data *scsi_id, unchar *cmd) | 2112 | static void sbp2_check_sbp2_command(struct scsi_id_instance_data *scsi_id, unchar *cmd) |
2113 | { | 2113 | { |
2114 | unchar new_cmd[16]; | ||
2115 | u8 device_type = SBP2_DEVICE_TYPE (scsi_id->sbp2_device_type_and_lun); | ||
2116 | |||
2117 | SBP2_DEBUG("sbp2_check_sbp2_command"); | ||
2118 | |||
2119 | switch (*cmd) { | ||
2120 | |||
2121 | case READ_6: | ||
2122 | |||
2123 | if (sbp2_command_conversion_device_type(device_type)) { | ||
2124 | |||
2125 | SBP2_DEBUG("Convert READ_6 to READ_10"); | ||
2126 | |||
2127 | /* | ||
2128 | * Need to turn read_6 into read_10 | ||
2129 | */ | ||
2130 | new_cmd[0] = 0x28; | ||
2131 | new_cmd[1] = (cmd[1] & 0xe0); | ||
2132 | new_cmd[2] = 0x0; | ||
2133 | new_cmd[3] = (cmd[1] & 0x1f); | ||
2134 | new_cmd[4] = cmd[2]; | ||
2135 | new_cmd[5] = cmd[3]; | ||
2136 | new_cmd[6] = 0x0; | ||
2137 | new_cmd[7] = 0x0; | ||
2138 | new_cmd[8] = cmd[4]; | ||
2139 | new_cmd[9] = cmd[5]; | ||
2140 | |||
2141 | memcpy(cmd, new_cmd, 10); | ||
2142 | |||
2143 | } | ||
2144 | |||
2145 | break; | ||
2146 | |||
2147 | case WRITE_6: | ||
2148 | |||
2149 | if (sbp2_command_conversion_device_type(device_type)) { | ||
2150 | |||
2151 | SBP2_DEBUG("Convert WRITE_6 to WRITE_10"); | ||
2152 | |||
2153 | /* | ||
2154 | * Need to turn write_6 into write_10 | ||
2155 | */ | ||
2156 | new_cmd[0] = 0x2a; | ||
2157 | new_cmd[1] = (cmd[1] & 0xe0); | ||
2158 | new_cmd[2] = 0x0; | ||
2159 | new_cmd[3] = (cmd[1] & 0x1f); | ||
2160 | new_cmd[4] = cmd[2]; | ||
2161 | new_cmd[5] = cmd[3]; | ||
2162 | new_cmd[6] = 0x0; | ||
2163 | new_cmd[7] = 0x0; | ||
2164 | new_cmd[8] = cmd[4]; | ||
2165 | new_cmd[9] = cmd[5]; | ||
2166 | |||
2167 | memcpy(cmd, new_cmd, 10); | ||
2168 | |||
2169 | } | ||
2170 | |||
2171 | break; | ||
2172 | |||
2173 | case MODE_SENSE: | ||
2174 | |||
2175 | if (sbp2_command_conversion_device_type(device_type)) { | ||
2176 | |||
2177 | SBP2_DEBUG("Convert MODE_SENSE_6 to MODE_SENSE_10"); | ||
2178 | |||
2179 | /* | ||
2180 | * Need to turn mode_sense_6 into mode_sense_10 | ||
2181 | */ | ||
2182 | new_cmd[0] = 0x5a; | ||
2183 | new_cmd[1] = cmd[1]; | ||
2184 | new_cmd[2] = cmd[2]; | ||
2185 | new_cmd[3] = 0x0; | ||
2186 | new_cmd[4] = 0x0; | ||
2187 | new_cmd[5] = 0x0; | ||
2188 | new_cmd[6] = 0x0; | ||
2189 | new_cmd[7] = 0x0; | ||
2190 | new_cmd[8] = cmd[4]; | ||
2191 | new_cmd[9] = cmd[5]; | ||
2192 | |||
2193 | memcpy(cmd, new_cmd, 10); | ||
2194 | |||
2195 | } | ||
2196 | |||
2197 | break; | ||
2198 | |||
2199 | case MODE_SELECT: | ||
2200 | |||
2201 | /* | ||
2202 | * TODO. Probably need to change mode select to 10 byte version | ||
2203 | */ | ||
2204 | |||
2205 | default: | ||
2206 | break; | ||
2207 | } | ||
2208 | |||
2209 | return; | ||
2210 | } | 2114 | } |
2211 | 2115 | ||
2212 | /* | 2116 | /* |
@@ -2272,14 +2176,6 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id, | |||
2272 | } | 2176 | } |
2273 | 2177 | ||
2274 | /* | 2178 | /* |
2275 | * Check for Simple Direct Access Device and change it to TYPE_DISK | ||
2276 | */ | ||
2277 | if ((scsi_buf[0] & 0x1f) == TYPE_SDAD) { | ||
2278 | SBP2_DEBUG("Changing TYPE_SDAD to TYPE_DISK"); | ||
2279 | scsi_buf[0] &= 0xe0; | ||
2280 | } | ||
2281 | |||
2282 | /* | ||
2283 | * Fix ansi revision and response data format | 2179 | * Fix ansi revision and response data format |
2284 | */ | 2180 | */ |
2285 | scsi_buf[2] |= 2; | 2181 | scsi_buf[2] |= 2; |
@@ -2287,27 +2183,6 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id, | |||
2287 | 2183 | ||
2288 | break; | 2184 | break; |
2289 | 2185 | ||
2290 | case MODE_SENSE: | ||
2291 | |||
2292 | if (sbp2_command_conversion_device_type(device_type)) { | ||
2293 | |||
2294 | SBP2_DEBUG("Modify mode sense response (10 byte version)"); | ||
2295 | |||
2296 | scsi_buf[0] = scsi_buf[1]; /* Mode data length */ | ||
2297 | scsi_buf[1] = scsi_buf[2]; /* Medium type */ | ||
2298 | scsi_buf[2] = scsi_buf[3]; /* Device specific parameter */ | ||
2299 | scsi_buf[3] = scsi_buf[7]; /* Block descriptor length */ | ||
2300 | memcpy(scsi_buf + 4, scsi_buf + 8, scsi_buf[0]); | ||
2301 | } | ||
2302 | |||
2303 | break; | ||
2304 | |||
2305 | case MODE_SELECT: | ||
2306 | |||
2307 | /* | ||
2308 | * TODO. Probably need to change mode select to 10 byte version | ||
2309 | */ | ||
2310 | |||
2311 | default: | 2186 | default: |
2312 | break; | 2187 | break; |
2313 | } | 2188 | } |
@@ -2690,7 +2565,8 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id, | |||
2690 | static int sbp2scsi_slave_configure (struct scsi_device *sdev) | 2565 | static int sbp2scsi_slave_configure (struct scsi_device *sdev) |
2691 | { | 2566 | { |
2692 | blk_queue_dma_alignment(sdev->request_queue, (512 - 1)); | 2567 | blk_queue_dma_alignment(sdev->request_queue, (512 - 1)); |
2693 | 2568 | sdev->use_10_for_rw = 1; | |
2569 | sdev->use_10_for_ms = 1; | ||
2694 | return 0; | 2570 | return 0; |
2695 | } | 2571 | } |
2696 | 2572 | ||