The patch titled
pata: libata: Enable per device speed setting
has been removed from the -mm tree. Its filename is
pata-libata-enable-per-device-speed-setting.patch
This patch was dropped because an updated version was merged
------------------------------------------------------
Subject: pata: libata: Enable per device speed setting
From: Alan Cox <alan@xxxxxxxxxx>
Testing says that nothing seems to break when we do this.
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/libata-core.c | 36 +++++++++++++----------------------
1 file changed, 14 insertions(+), 22 deletions(-)
diff -puN drivers/scsi/libata-core.c~pata-libata-enable-per-device-speed-setting drivers/scsi/libata-core.c
--- a/drivers/scsi/libata-core.c~pata-libata-enable-per-device-speed-setting
+++ a/drivers/scsi/libata-core.c
@@ -3054,6 +3054,7 @@ static void ata_dev_xfermask(struct ata_
unsigned long xfer_mask;
int i;
+ /* Controller modes available */
xfer_mask = ata_pack_xfermask(ap->pio_mask,
ap->mwdma_mask, ap->udma_mask);
@@ -3063,30 +3064,21 @@ static void ata_dev_xfermask(struct ata_
if (ap->cbl == ATA_CBL_PATA40)
xfer_mask &= ~(0xF8 << ATA_SHIFT_UDMA);
- /* FIXME: Use port-wide xfermask for now */
- for (i = 0; i < ATA_MAX_DEVICES; i++) {
- struct ata_device *d = &ap->device[i];
-
- if (ata_dev_absent(d))
- continue;
-
- if (ata_dev_disabled(d)) {
- /* to avoid violating device selection timing */
- xfer_mask &= ata_pack_xfermask(d->pio_mask,
- UINT_MAX, UINT_MAX);
- continue;
- }
+ if (ata_dev_disabled(dev)) {
+ /* to avoid violating device selection timing */
+ xfer_mask &= ata_pack_xfermask(dev->pio_mask,
+ UINT_MAX, UINT_MAX);
+ goto out;
+ }
+ xfer_mask &= ata_pack_xfermask(dev->pio_mask,
+ dev->mwdma_mask, dev->udma_mask);
+ xfer_mask &= ata_id_xfermask(dev->id);
- xfer_mask &= ata_pack_xfermask(d->pio_mask,
- d->mwdma_mask, d->udma_mask);
- xfer_mask &= ata_id_xfermask(d->id);
- if (ata_dma_blacklisted(d))
- xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
- }
-
- if (ata_dma_blacklisted(dev))
+ if (ata_dma_blacklisted(dev)) {
+ xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
ata_dev_printk(dev, KERN_WARNING,
"device is on DMA blacklist, disabling DMA\n");
+ }
if (hs->flags & ATA_HOST_SIMPLEX) {
if (hs->simplex_claimed)
@@ -3095,7 +3087,7 @@ static void ata_dev_xfermask(struct ata_
if (ap->ops->mode_filter)
xfer_mask = ap->ops->mode_filter(ap, dev, xfer_mask);
-
+out:
ata_unpack_xfermask(xfer_mask, &dev->pio_mask,
&dev->mwdma_mask, &dev->udma_mask);
}
_
Patches currently in -mm which might be from alan@xxxxxxxxxx are
git-libata-all.patch
pata-ata_generic-generic-bios-setup-sff-ata-driver.patch
rework-legacy-handling-to-remove-much-of-the-cruft.patch
pata-libata-enable-per-device-speed-setting.patch
fixes-for-piix-driver.patch
1-of-2-jmicron-driver.patch
2-of-2-jmicron-driver-plumbing-and-quirk.patch
my-name-is-ingo-molnar-you-killed-my-make-allyesconfig-prepare-to-die.patch
sanitize-3c589_cs.patch
ide-backport-piix-fixes-from-libata-into-the-legacy-driver.patch
move-ide-to-unmaintained-drop-reference-to-old-git-tree.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
