Use the newly added max_cmd_len in the scsi_device
struct instead of the field by the same name in
the scsi_host struct. This allows for better
granularity of control of the max allowed command
length and allows for SAS/SATA hosts to impose their
own host restrictions on max command length, if needed.
It also simplifies using libata for SATA devices under
SAS HBAs.
Signed-off-by: Brian King <brking@xxxxxxxxxx>
---
libata-dev-bjking1/drivers/scsi/libata-core.c | 10 ++--------
libata-dev-bjking1/drivers/scsi/libata-scsi.c | 1 +
2 files changed, 3 insertions(+), 8 deletions(-)
diff -puN drivers/scsi/libata-core.c~libata_sd_cdb_len drivers/scsi/libata-core.c
--- libata-dev/drivers/scsi/libata-core.c~libata_sd_cdb_len 2006-04-17 17:30:20.000000000 -0500
+++ libata-dev-bjking1/drivers/scsi/libata-core.c 2006-04-17 17:30:20.000000000 -0500
@@ -1225,7 +1225,7 @@ static int ata_dev_configure(struct ata_
{
const u16 *id = dev->id;
unsigned int xfer_mask;
- int i, rc;
+ int rc;
if (!ata_dev_enabled(dev)) {
DPRINTK("ENTER/EXIT (host %u, dev %u) -- nodev\n",
@@ -1328,12 +1328,6 @@ static int ata_dev_configure(struct ata_
ap->id, dev->devno, ata_mode_string(xfer_mask));
}
- ap->host->max_cmd_len = 0;
- for (i = 0; i < ATA_MAX_DEVICES; i++)
- ap->host->max_cmd_len = max_t(unsigned int,
- ap->host->max_cmd_len,
- ap->device[i].cdb_len);
-
/* limit bridge transfers to udma5, 200 sectors */
if (ata_dev_knobble(ap, dev)) {
if (print_info)
@@ -4573,7 +4567,7 @@ static void ata_host_init(struct ata_por
host->max_lun = 1;
host->max_channel = 1;
host->unique_id = ata_unique_id++;
- host->max_cmd_len = 12;
+ host->max_cmd_len = ATAPI_CDB_LEN;
ap->flags = ATA_FLAG_DISABLED;
ap->id = host->unique_id;
diff -puN drivers/scsi/libata-scsi.c~libata_sd_cdb_len drivers/scsi/libata-scsi.c
--- libata-dev/drivers/scsi/libata-scsi.c~libata_sd_cdb_len 2006-04-17 17:30:20.000000000 -0500
+++ libata-dev-bjking1/drivers/scsi/libata-scsi.c 2006-04-17 17:30:20.000000000 -0500
@@ -670,6 +670,7 @@ static void ata_scsi_dev_config(struct s
max_sectors = dev->max_sectors;
blk_queue_max_sectors(sdev->request_queue, max_sectors);
+ sdev->max_cmd_len = dev->cdb_len;
/*
* SATA DMA transfers must be multiples of 4 byte, so
_
