libata: Conditionally set host->max_cmd_len
PATCH 1/4 libata: Conditionally set host->max_cmd_len
In preparation for SAS attached SATA devices, which will not have a libata scsi_host, only setup host->max_cmd_len if ap->host exists.
Signed-off-by Brian King <[email protected]>
---
libata-dev-bjking1/drivers/scsi/libata-core.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
drivers/scsi/libata-core.c renamed from drivers/scsi/libata-core.c~libata_cdb_len +15 -6
@@ -1326,6 +1326,19 @@ static void ata_dev_config_ncq(struct atsnprintf (desc, desc_sz,"NCQ (depth %d/%d)" , hdepth, ddepth); } +static void ata_set_port_max_cmd_len (struct ata_port *ap) +{ +int i; + +if (ap->host) { + 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); + } +} +/** * ata_dev_configure - Configure the specified ATA/ATAPI device * @dev: Target device to configure
@@ -1345,7 +1358,7 @@ int ata_dev_configure(struct ata_devicestruct ata_port *ap = dev->ap;const u16 *id = dev->id;unsigned int xfer_mask; -int i, rc; +int rc;if (!ata_dev_enabled (dev) &&ata_msg_info (ap)) { ata_dev_printk(dev, KERN_INFO,
@@ -1475,11 +1488,7 @@ int ata_dev_configure(struct ata_device cdb_intr_string); } - 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); +ata_set_port_max_cmd_len (ap);/* limit bridge transfers to udma5, 200 sectors */ if (ata_dev_knobble (dev)) {
_
Jeff Garzik
Appliedapplied