lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scsi_transport_spi: use spi target settings instead of inquiry data for DV

Browse Source 
Right at the moment, we carefully set up the spi_support_xx in the
device configuration routines, but then we never actually use the
results: we rely on the inquiry strings.  If we're going to allow
overrides to the inquiry data, we have to rely on our own internal
settings.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
James Bottomley
2009-06-17 15:03:41 -04:00
parent 598fa4b775
commit 9872b81cf9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/scsi/scsi_transport_spi.c
View File

@@ -833,7 +833,7 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
return; return;
} }
if (!scsi_device_wide(sdev)) { if (!spi_support_wide(starget)) {
spi_max_width(starget) = 0; spi_max_width(starget) = 0;
max_width = 0; max_width = 0;
} }
@@ -860,7 +860,7 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
return; return;
/* device can't handle synchronous */ /* device can't handle synchronous */
if (!scsi_device_sync(sdev) && !scsi_device_dt(sdev)) if (!spi_support_sync(starget) && !spi_support_dt(starget))
return; return;
/* len == -1 is the signal that we need to ascertain the /* len == -1 is the signal that we need to ascertain the
@@ -876,13 +876,14 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
/* try QAS requests; this should be harmless to set if the /* try QAS requests; this should be harmless to set if the
* target supports it */ * target supports it */
if (scsi_device_qas(sdev) && spi_max_qas(starget)) { if (spi_support_qas(starget) && spi_max_qas(starget)) {
DV_SET(qas, 1); DV_SET(qas, 1);
} else { } else {
DV_SET(qas, 0); DV_SET(qas, 0);
} }
if (scsi_device_ius(sdev) && spi_max_iu(starget) && min_period < 9) { if (spi_support_ius(starget) && spi_max_iu(starget) &&
min_period < 9) {
/* This u320 (or u640). Set IU transfers */ /* This u320 (or u640). Set IU transfers */
DV_SET(iu, 1); DV_SET(iu, 1);
/* Then set the optional parameters */ /* Then set the optional parameters */
@@ -902,7 +903,7 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
i->f->get_signalling(shost); i->f->get_signalling(shost);
if (spi_signalling(shost) == SPI_SIGNAL_SE || if (spi_signalling(shost) == SPI_SIGNAL_SE ||
spi_signalling(shost) == SPI_SIGNAL_HVD || spi_signalling(shost) == SPI_SIGNAL_HVD ||
!scsi_device_dt(sdev)) { !spi_support_dt(starget)) {
DV_SET(dt, 0); DV_SET(dt, 0);
} else { } else {
DV_SET(dt, 1); DV_SET(dt, 1);