Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eabd02c authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[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: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 61eb066a

drivers/scsi/libata-core.c

+5 −4
Original line number Diff line number Diff line
@@ -1121,9 +1121,10 @@ static void ata_dev_identify(struct ata_port *ap, unsigned int device) 
}





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;