ide: add IDE_HFLAG_RQSIZE_256 host flag

Add IDE_HFLAG_RQSIZE_256 host flag to tell ide_pci_setup_ports() to set
hwif->rqsize to 256 sectors.  Convert pdc202xx_old host driver to use it.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 29306121dc4a916780d25c62fa788bdfe7da7100..d0efe17d8314cf8ce5128cad8e41cb4abc45b5f3 100644 (file)
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -302,13 +302,6 @@ static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev,
 
 static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
 {
-       struct pci_dev *dev = hwif->pci_dev;
-
-       /* PDC20265 has problems with large LBA48 requests */
-       if ((dev->device == PCI_DEVICE_ID_PROMISE_20267) ||
-           (dev->device == PCI_DEVICE_ID_PROMISE_20265))
-               hwif->rqsize = 256;
-
        hwif->set_pio_mode = &pdc202xx_set_pio_mode;
        hwif->set_dma_mode = &pdc202xx_set_mode;
 
@@ -382,7 +375,7 @@ static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev,
        }
 }
 
-#define DECLARE_PDC2026X_DEV(name_str, udma) \
+#define DECLARE_PDC2026X_DEV(name_str, udma, extra_flags) \
        { \
                .name           = name_str, \
                .init_chipset   = init_chipset_pdc202xx, \
@@ -390,6 +383,7 @@ static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev,
                .init_dma       = init_dma_pdc202xx, \
                .extra          = 48, \
                .host_flags     = IDE_HFLAG_ERROR_STOPS_FIFO | \
+                                 extra_flags | \
                                  IDE_HFLAG_OFF_BOARD, \
                .pio_mask       = ATA_PIO4, \
                .mwdma_mask     = ATA_MWDMA2, \
@@ -410,10 +404,10 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .udma_mask      = ATA_UDMA2,
        },
 
-       /* 1 */ DECLARE_PDC2026X_DEV("PDC20262", ATA_UDMA4),
-       /* 2 */ DECLARE_PDC2026X_DEV("PDC20263", ATA_UDMA4),
-       /* 3 */ DECLARE_PDC2026X_DEV("PDC20265", ATA_UDMA5),
-       /* 4 */ DECLARE_PDC2026X_DEV("PDC20267", ATA_UDMA5),
+       /* 1 */ DECLARE_PDC2026X_DEV("PDC20262", ATA_UDMA4, 0),
+       /* 2 */ DECLARE_PDC2026X_DEV("PDC20263", ATA_UDMA4, 0),
+       /* 3 */ DECLARE_PDC2026X_DEV("PDC20265", ATA_UDMA5, IDE_HFLAG_RQSIZE_256),
+       /* 4 */ DECLARE_PDC2026X_DEV("PDC20267", ATA_UDMA5, IDE_HFLAG_RQSIZE_256),
 };
 
 /**

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 4fa813b96e7248a1f27b7ea3f69ea10a6861f03c..a1d7efc9eaafda3ec0d3f2b2c503d2944d484970 100644 (file)
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -582,6 +582,9 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                hwif->drives[0].autotune = 1;
                hwif->drives[1].autotune = 1;
 
+               if (d->host_flags & IDE_HFLAG_RQSIZE_256)
+                       hwif->rqsize = 256;
+
                if (d->init_hwif)
                        /* Call chipset-specific routine
                         * for each enabled hwif

diff --git a/include/linux/ide.h b/include/linux/ide.h
index ff9d293f9ae957ff6ca52e43b47cd88414d25a91..c5b52dd16a89c19fb4c069330a921e9399b852d9 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1265,6 +1265,8 @@ enum {
        IDE_HFLAG_LEGACY_IRQS           = (1 << 21),
        /* force use of legacy IRQs */
        IDE_HFLAG_FORCE_LEGACY_IRQS     = (1 << 22),
+       /* limit LBA48 requests to 256 sectors */
+       IDE_HFLAG_RQSIZE_256            = (1 << 23),
 };
 
 #ifdef CONFIG_BLK_DEV_OFFBOARD