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

[PATCH] libata: make ata_dev_knobble() per-device

Browse Source 
ata_dev_knobble() unconditionally used the first device of the port to
determine whether a device is bridged or not.  This causes bridge
limit to be incorrectly applied or unapplied for hosts with slave
devices (e.g. ata_piix).

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Tejun Heo
2006-02-12 23:32:58 +09:00
committed by Jeff Garzik
parent 61eb066aff
commit 8eabd02c24
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/libata-core.c
View File

@@ -1121,9 +1121,10 @@ err_out:
} }
static inline u8 ata_dev_knobble(const struct ata_port *ap) static inline u8 ata_dev_knobble(const struct ata_port *ap,
struct ata_device *dev)
{ {
return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(ap->device->id))); return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(dev->id)));
} }
/** /**
@@ -1137,9 +1138,9 @@ static inline u8 ata_dev_knobble(const struct ata_port *ap)
void ata_dev_config(struct ata_port *ap, unsigned int i) void ata_dev_config(struct ata_port *ap, unsigned int i)
{ {
/* limit bridge transfers to udma5, 200 sectors */ /* limit bridge transfers to udma5, 200 sectors */
if (ata_dev_knobble(ap)) { if (ata_dev_knobble(ap, &ap->device[i])) {
printk(KERN_INFO "ata%u(%u): applying bridge limits\n", printk(KERN_INFO "ata%u(%u): applying bridge limits\n",
ap->id, ap->device->devno); ap->id, i);
ap->udma_mask &= ATA_UDMA5; ap->udma_mask &= ATA_UDMA5;
ap->host->max_sectors = ATA_MAX_SECTORS; ap->host->max_sectors = ATA_MAX_SECTORS;
ap->host->hostt->max_sectors = ATA_MAX_SECTORS; ap->host->hostt->max_sectors = ATA_MAX_SECTORS;