forked from Minki/linux
[PATCH] libata: make ata_dev_knobble() per-device
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:
parent
61eb066aff
commit
8eabd02c24
@ -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)
|
||||
{
|
||||
/* 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",
|
||||
ap->id, ap->device->devno);
|
||||
ap->id, i);
|
||||
ap->udma_mask &= ATA_UDMA5;
|
||||
ap->host->max_sectors = ATA_MAX_SECTORS;
|
||||
ap->host->hostt->max_sectors = ATA_MAX_SECTORS;
|
||||
|
Loading…
Reference in New Issue
Block a user