41 files changed, 87 insertions, 8 deletions

diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index e8cd86e86433..9361154ba5c2 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -814,6 +814,7 @@ init_e100_ide (void)
                 hwif->dma_host_on = &cris_dma_on;
                 hwif->dma_off_quietly = &cris_dma_off;
                 hwif->cbl = ATA_CBL_PATA40;
+                hwif->pio_mask = ATA_PIO4,
                 hwif->ultra_mask = cris_ultra_mask;
                 hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */
                 hwif->autodma = 1;
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index b442b341d52e..f3ea5ea41fd4 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -457,6 +457,8 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
 
         hwif->host_flags                = tmp_hwif->host_flags;
 
+        hwif->pio_mask                  = tmp_hwif->pio_mask;
+
         hwif->atapi_dma                 = tmp_hwif->atapi_dma;
         hwif->ultra_mask                = tmp_hwif->ultra_mask;
         hwif->mwdma_mask                = tmp_hwif->mwdma_mask;
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index d5c7a57b71c1..9b9c4761cb7d 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -211,10 +211,12 @@ static int __init ali14xx_probe(void)
         mate = &ide_hwifs[1];
 
         hwif->chipset = ide_ali14xx;
+        hwif->pio_mask = ATA_PIO4;
         hwif->tuneproc = &ali14xx_tune_drive;
         hwif->mate = mate;
 
         mate->chipset = ide_ali14xx;
+        mate->pio_mask = ATA_PIO4;
         mate->tuneproc = &ali14xx_tune_drive;
         mate->mate = hwif;
         mate->channel = 1;
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index 8c4c27e5dc10..6c01d951d074 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -123,6 +123,7 @@ static int __init dtc2278_probe(void)
 
         hwif->serialized = 1;
         hwif->chipset = ide_dtc2278;
+        hwif->pio_mask = ATA_PIO4;
         hwif->tuneproc = &tune_dtc2278;
         hwif->drives[0].no_unmask = 1;
         hwif->drives[1].no_unmask = 1;
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 82ed37df9566..bfaa2025173b 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -333,12 +333,14 @@ int __init ht6560b_init(void)
 
         hwif->chipset = ide_ht6560b;
         hwif->selectproc = &ht6560b_selectproc;
+        hwif->pio_mask = ATA_PIO5;
         hwif->tuneproc = &tune_ht6560b;
         hwif->serialized = 1;   /* is this needed? */
         hwif->mate = mate;
 
         mate->chipset = ide_ht6560b;
         mate->selectproc = &ht6560b_selectproc;
+        mate->pio_mask = ATA_PIO5;
         mate->tuneproc = &tune_ht6560b;
         mate->serialized = 1;   /* is this needed? */
         mate->mate = hwif;
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 39145102b348..8b87a424094a 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -346,6 +346,7 @@ static void __init qd_setup(ide_hwif_t *hwif, int base, int config,
         hwif->drives[1].drive_data = data1;
         hwif->drives[0].io_32bit =
         hwif->drives[1].io_32bit = 1;
+        hwif->pio_mask = ATA_PIO4;
         hwif->tuneproc = tuneproc;
         probe_hwif_init(hwif);
 }
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index caeebd41081f..d2862e638bc5 100644
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -149,10 +149,12 @@ static int __init umc8672_probe(void)
         mate = &ide_hwifs[1];
 
         hwif->chipset = ide_umc8672;
+        hwif->pio_mask = ATA_PIO4;
         hwif->tuneproc = &tune_umc;
         hwif->mate = mate;
 
         mate->chipset = ide_umc8672;
+        mate->pio_mask = ATA_PIO4;
         mate->tuneproc = &tune_umc;
         mate->mate = hwif;
         mate->channel = 1;
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index b0d13c34d310..2ba6a054b861 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -692,6 +692,8 @@ static int au_ide_probe(struct device *dev)
         hwif->swdma_mask                = 0x0;
 #endif
 
+        hwif->pio_mask = ATA_PIO4;
+
         hwif->noprobe = 0;
         hwif->drives[0].unmask          = 1;
         hwif->drives[1].unmask          = 1;
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 8396d711f232..74432830abf7 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -268,6 +268,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x07, /* udma0-2 */
         },{     /* 1 */
                 .name           = "AEC6260",
@@ -276,6 +277,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_aec62xx,
                 .autodma        = NOAUTODMA,
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 2 */
                 .name           = "AEC6260R",
@@ -285,6 +287,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .bootable       = NEVER_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 3 */
                 .name           = "AEC6280",
@@ -293,6 +296,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_aec62xx,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x3f, /* udma0-5 */
         },{     /* 4 */
                 .name           = "AEC6280R",
@@ -302,6 +306,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x3f, /* udma0-5 */
         }
 };
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index a0c43a91b0f3..5511c86733dc 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -818,6 +818,7 @@ static ide_pci_device_t ali15x3_chipset __devinitdata = {
         .init_dma       = init_dma_ali15x3,
         .autodma        = AUTODMA,
         .bootable       = ON_BOARD,
+        .pio_mask       = ATA_PIO5,
 };
 
 /**
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 5ed1d485fc7e..06c15a6a3e7d 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -453,6 +453,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                 .bootable       = ON_BOARD,                             \
                 .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST            \
                                 | IDE_HFLAG_PIO_NO_DOWNGRADE,           \
+                .pio_mask       = ATA_PIO5,                             \
         }
 
 #define DECLARE_NV_DEV(name_str)                                        \
@@ -465,6 +466,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                 .bootable       = ON_BOARD,                             \
                 .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST            \
                                 | IDE_HFLAG_PIO_NO_DOWNGRADE,           \
+                .pio_mask       = ATA_PIO5,                             \
         }
 
 static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index a4740e4776fd..1725aa402d98 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -294,6 +294,7 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
                 .bootable       = ON_BOARD,
+                .pio_mask       = ATA_PIO4,
         },{     /* 1 */
                 .name           = "SB600_PATA",
                 .init_hwif      = init_hwif_atiixp,
@@ -301,6 +302,7 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
                 .enablebits     = {{0x48,0x01,0x00}, {0x00,0x00,0x00}},
                 .bootable       = ON_BOARD,
                 .host_flags     = IDE_HFLAG_SINGLE,
+                .pio_mask       = ATA_PIO4,
         },
 };
 
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 335482981a92..9689494efa24 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -766,6 +766,7 @@ int __init ide_probe_for_cmd640x (void)
                cmd_hwif0->name, 'a' + cmd640_chip_version - 1, bus_type, cfr);
         cmd_hwif0->chipset = ide_cmd640;
 #ifdef CONFIG_BLK_DEV_CMD640_ENHANCED
+        cmd_hwif0->pio_mask = ATA_PIO5;
         cmd_hwif0->tuneproc = &cmd640_tune_drive;
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
 
@@ -821,6 +822,7 @@ int __init ide_probe_for_cmd640x (void)
                 cmd_hwif1->mate = cmd_hwif0;
                 cmd_hwif1->channel = 1;
 #ifdef CONFIG_BLK_DEV_CMD640_ENHANCED
+                cmd_hwif1->pio_mask = ATA_PIO5;
                 cmd_hwif1->tuneproc = &cmd640_tune_drive;
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
         }
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 9cf969b61bf2..19633c5aba15 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -622,6 +622,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x00,0x00,0x00}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .pio_mask       = ATA_PIO5,
                 .udma_mask      = 0x00, /* no udma */
         },{     /* 1 */
                 .name           = "CMD646",
@@ -631,6 +632,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .pio_mask       = ATA_PIO5,
                 .udma_mask      = 0x07, /* udma0-2 */
         },{     /* 2 */
                 .name           = "CMD648",
@@ -640,6 +642,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .pio_mask       = ATA_PIO5,
                 .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 3 */
                 .name           = "CMD649",
@@ -649,6 +652,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .pio_mask       = ATA_PIO5,
                 .udma_mask      = 0x3f, /* udma0-5 */
         }
 };
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index ee10e48d7cef..bccedf9b8b28 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -197,6 +197,7 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
                 .autodma        = AUTODMA,                      \
                 .bootable       = ON_BOARD,                     \
                 .host_flags     = IDE_HFLAG_ISA_PORTS,          \
+                .pio_mask       = ATA_PIO4,                     \
         }
 
 static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index a75c14a93182..acaf71fd4c09 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -343,6 +343,7 @@ static ide_pci_device_t cs5530_chipset __devinitdata = {
         .init_hwif      = init_hwif_cs5530,
         .autodma        = AUTODMA,
         .bootable       = ON_BOARD,
+        .pio_mask       = ATA_PIO4,
 };
 
 static int __devinit cs5530_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 0bff4005292a..ce44e38390aa 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -231,6 +231,7 @@ static ide_pci_device_t cs5535_chipset __devinitdata = {
         .autodma        = AUTODMA,
         .bootable       = ON_BOARD,
         .host_flags     = IDE_HFLAG_SINGLE,
+        .pio_mask       = ATA_PIO4,
 };
 
 static int __devinit cs5535_init_one(struct pci_dev *dev,
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index cb7c18187e3c..daa36fcbc8ef 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -486,6 +486,7 @@ static ide_pci_device_t cy82c693_chipset __devinitdata = {
         .autodma        = AUTODMA,
         .bootable       = ON_BOARD,
         .host_flags     = IDE_HFLAG_SINGLE,
+        .pio_mask       = ATA_PIO4,
 };
 
 static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 2e4591303f4f..19778c5fe711 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -177,7 +177,8 @@ static ide_pci_device_t hpt34x_chipset __devinitdata = {
         .init_hwif      = init_hwif_hpt34x,
         .autodma        = NOAUTODMA,
         .bootable       = NEVER_BOARD,
-        .extra          = 16
+        .extra          = 16,
+        .pio_mask       = ATA_PIO5,
 };
 
 static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 0a3fe9471eb6..2cd74c345a6c 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1549,7 +1549,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                 .bootable       = OFF_BOARD,
-                .extra          = 240
+                .extra          = 240,
+                .pio_mask       = ATA_PIO4,
         },{     /* 1 */
                 .name           = "HPT372A",
                 .init_setup     = init_setup_hpt372a,
@@ -1560,7 +1561,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                 .udma_mask      = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f,
                 .bootable       = OFF_BOARD,
-                .extra          = 240
+                .extra          = 240,
+                .pio_mask       = ATA_PIO4,
         },{     /* 2 */
                 .name           = "HPT302",
                 .init_setup     = init_setup_hpt302,
@@ -1571,7 +1573,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                 .udma_mask      = HPT302_ALLOW_ATA133_6 ? 0x7f : 0x3f,
                 .bootable       = OFF_BOARD,
-                .extra          = 240
+                .extra          = 240,
+                .pio_mask       = ATA_PIO4,
         },{     /* 3 */
                 .name           = "HPT371",
                 .init_setup     = init_setup_hpt371,
@@ -1582,7 +1585,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                 .udma_mask      = HPT371_ALLOW_ATA133_6 ? 0x7f : 0x3f,
                 .bootable       = OFF_BOARD,
-                .extra          = 240
+                .extra          = 240,
+                .pio_mask       = ATA_PIO4,
         },{     /* 4 */
                 .name           = "HPT374",
                 .init_setup     = init_setup_hpt374,
@@ -1593,7 +1597,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                 .udma_mask      = 0x3f,
                 .bootable       = OFF_BOARD,
-                .extra          = 240
+                .extra          = 240,
+                .pio_mask       = ATA_PIO4,
         },{     /* 5 */
                 .name           = "HPT372N",
                 .init_setup     = init_setup_hpt372n,
@@ -1604,7 +1609,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                 .udma_mask      = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f,
                 .bootable       = OFF_BOARD,
-                .extra          = 240
+                .extra          = 240,
+                .pio_mask       = ATA_PIO4,
         }
 };
 
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index d8425a2499bf..95dbed7e6022 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -276,6 +276,7 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
                 .enablebits     = {{0x41,0x80,0x80}}, \
                 .bootable       = ON_BOARD,             \
                 .host_flags     = IDE_HFLAG_SINGLE,     \
+                .pio_mask       = ATA_PIO4,             \
         }
 
 static ide_pci_device_t it8213_chipsets[] __devinitdata = {
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 790233db017b..9286c99e2ff0 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -720,7 +720,8 @@ static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const cha
                 .init_hwif      = init_hwif_it821x,     \
                 .autodma        = AUTODMA,              \
                 .bootable       = ON_BOARD,             \
-                .fixup          = it821x_fixups         \
+                .fixup          = it821x_fixups,        \
+                .pio_mask       = ATA_PIO4,             \
         }
 
 static ide_pci_device_t it821x_chipsets[] __devinitdata = {
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 57d3d4186b3f..d7ce9dd8de16 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -180,6 +180,7 @@ fallback:
                 .autodma        = AUTODMA,              \
                 .bootable       = ON_BOARD,             \
                 .enablebits     = { {0x40, 1, 1}, {0x40, 0x10, 0x10} }, \
+                .pio_mask       = ATA_PIO5,             \
         }
 
 static ide_pci_device_t jmicron_chipsets[] __devinitdata = {
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 1802ad0927eb..3a2bb2723515 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -353,12 +353,14 @@ static ide_pci_device_t opti621_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
                 .bootable       = ON_BOARD,
+                .pio_mask       = ATA_PIO3,
         },{     /* 1 */
                 .name           = "OPTI621X",
                 .init_hwif      = init_hwif_opti621,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
                 .bootable       = ON_BOARD,
+                .pio_mask       = ATA_PIO3,
         }
 };
 
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index a8a01b4ab607..8a66a2871b3a 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -568,6 +568,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x3f, /* udma0-5 */
         },{     /* 1 */
                 .name           = "PDC20269",
@@ -576,6 +577,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x7f, /* udma0-6*/
         },{     /* 2 */
                 .name           = "PDC20270",
@@ -584,6 +586,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x3f, /* udma0-5 */
         },{     /* 3 */
                 .name           = "PDC20271",
@@ -592,6 +595,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x7f, /* udma0-6*/
         },{     /* 4 */
                 .name           = "PDC20275",
@@ -600,6 +604,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x7f, /* udma0-6*/
         },{     /* 5 */
                 .name           = "PDC20276",
@@ -608,6 +613,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x7f, /* udma0-6*/
         },{     /* 6 */
                 .name           = "PDC20277",
@@ -616,6 +622,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x7f, /* udma0-6*/
         }
 };
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 3a6882d4aa64..fbcb0bb9c956 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -444,6 +444,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .extra          = 16,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x07, /* udma0-2 */
         },{     /* 1 */
                 .name           = "PDC20262",
@@ -454,6 +455,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 2 */
                 .name           = "PDC20263",
@@ -464,6 +466,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 3 */
                 .name           = "PDC20265",
@@ -474,6 +477,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x3f, /* udma0-5 */
         },{     /* 4 */
                 .name           = "PDC20267",
@@ -484,6 +488,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
+                .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x3f, /* udma0-5 */
         }
 };
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 41a3612c6107..4f69cd067e5e 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -498,6 +498,7 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
                 .autodma        = AUTODMA,              \
                 .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \
                 .bootable       = ON_BOARD,             \
+                .pio_mask       = ATA_PIO4,             \
                 .udma_mask      = udma,                 \
         }
 
@@ -517,6 +518,7 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
                 .enablebits     = {{0x6d,0xc0,0x80}, {0x6d,0xc0,0xc0}},
                 .bootable       = ON_BOARD,
                 .host_flags     = IDE_HFLAG_ISA_PORTS,
+                .pio_mask       = ATA_PIO4,
         },
 
         /*  3 */ DECLARE_PIIX_DEV("PIIX3", 0x00),       /* no udma */
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 98e1a2bd9501..9bdc9694d50d 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -438,6 +438,7 @@ static ide_pci_device_t sc1200_chipset __devinitdata = {
         .init_hwif      = init_hwif_sc1200,
         .autodma        = AUTODMA,
         .bootable       = ON_BOARD,
+        .pio_mask       = ATA_PIO4,
 };
 
 static int __devinit sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 2c76355b92e8..f668d235e6be 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -775,6 +775,7 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
       .autodma  = AUTODMA,                              \
       .bootable = ON_BOARD,                             \
       .host_flags       = IDE_HFLAG_SINGLE,             \
+      .pio_mask         = ATA_PIO4,                     \
   }
 
 static ide_pci_device_t scc_chipsets[] __devinitdata = {
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index 1fe29d9e68fa..9fead2e7d4c8 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -451,6 +451,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_svwks,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
+                .pio_mask       = ATA_PIO4,
         },{     /* 1 */
                 .name           = "SvrWks CSB5",
                 .init_setup     = init_setup_svwks,
@@ -458,6 +459,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_svwks,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
+                .pio_mask       = ATA_PIO4,
         },{     /* 2 */
                 .name           = "SvrWks CSB6",
                 .init_setup     = init_setup_csb6,
@@ -465,6 +467,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_svwks,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
+                .pio_mask       = ATA_PIO4,
         },{     /* 3 */
                 .name           = "SvrWks CSB6",
                 .init_setup     = init_setup_csb6,
@@ -473,6 +476,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
                 .host_flags     = IDE_HFLAG_SINGLE,
+                .pio_mask       = ATA_PIO4,
         },{     /* 4 */
                 .name           = "SvrWks HT1000",
                 .init_setup     = init_setup_svwks,
@@ -481,6 +485,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
                 .host_flags     = IDE_HFLAG_SINGLE,
+                .pio_mask       = ATA_PIO4,
         }
 };
 
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index ed983b56b4e2..57145767c3df 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -586,6 +586,7 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
         hwif->ultra_mask = 0x0; /* Disable Ultra DMA */
         hwif->mwdma_mask = 0x2; /* Multimode-2 DMA  */
         hwif->swdma_mask = 0x2;
+        hwif->pio_mask = 0x00;
         hwif->tuneproc = NULL;  /* Sets timing for PIO mode */
         hwif->speedproc = NULL; /* Sets timing for DMA &/or PIO modes */
         hwif->selectproc = NULL;/* Use the default routine to select drive */
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 63a8a93d63d6..50f6d172ef77 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -959,6 +959,7 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
                 .fixup          = siimage_fixup,        \
                 .autodma        = AUTODMA,              \
                 .bootable       = ON_BOARD,             \
+                .pio_mask       = ATA_PIO4,             \
         }
 
 static ide_pci_device_t siimage_chipsets[] __devinitdata = {
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 3c4693695ca3..63fbb79e8178 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -881,6 +881,7 @@ static ide_pci_device_t sis5513_chipset __devinitdata = {
         .autodma        = NOAUTODMA,
         .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
         .bootable       = ON_BOARD,
+        .pio_mask       = ATA_PIO4,
 };
 
 static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 4e8f32e643a6..0947cab00595 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -456,6 +456,7 @@ static ide_pci_device_t sl82c105_chipset __devinitdata = {
         .autodma        = NOAUTODMA,
         .enablebits     = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
         .bootable       = ON_BOARD,
+        .pio_mask       = ATA_PIO5,
 };
 
 static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 562747fbee39..8e655f2db5cb 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -217,6 +217,7 @@ static ide_pci_device_t slc90e66_chipset __devinitdata = {
         .autodma        = AUTODMA,
         .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
         .bootable       = ON_BOARD,
+        .pio_mask       = ATA_PIO4,
 };
 
 static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 2479a19f0094..ec79bacc30c2 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -251,6 +251,7 @@ static ide_pci_device_t tc86c001_chipset __devinitdata = {
         .autodma        = AUTODMA,
         .bootable       = OFF_BOARD,
         .host_flags     = IDE_HFLAG_SINGLE,
+        .pio_mask       = ATA_PIO4,
 };
 
 static int __devinit tc86c001_init_one(struct pci_dev *dev,
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index f8fef905bacc..024bbfae0429 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -132,6 +132,7 @@ static ide_pci_device_t triflex_device __devinitdata = {
         .autodma        = AUTODMA,
         .enablebits     = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
         .bootable       = ON_BOARD,
+        .pio_mask       = ATA_PIO4,
 };
 
 static int __devinit triflex_init_one(struct pci_dev *dev, 
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index b107ee3588f7..581316f9581d 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -503,6 +503,7 @@ static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
                 .bootable       = ON_BOARD,
                 .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST
                                 | IDE_HFLAG_PIO_NO_DOWNGRADE,
+                .pio_mask       = ATA_PIO5,
         },{     /* 1 */
                 .name           = "VP_IDE",
                 .init_chipset   = init_chipset_via82cxxx,
@@ -512,6 +513,7 @@ static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
                 .bootable       = ON_BOARD,
                 .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST
                                 | IDE_HFLAG_PIO_NO_DOWNGRADE,
+                .pio_mask       = ATA_PIO5,
         }
 };
 
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index f3789c0e6cc9..8859fe2f5ac2 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -316,6 +316,7 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
         }
 
         /* register routine to tune PIO mode */
+        ide_hwifs[data_port].pio_mask = ATA_PIO4;
         ide_hwifs[data_port].tuneproc = m8xx_ide_tuneproc;
 
         hw->ack_intr = (ide_ack_intr_t *) ide_interrupt_ack;
@@ -402,6 +403,7 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
         }
 
         /* register routine to tune PIO mode */
+        ide_hwifs[data_port].pio_mask = ATA_PIO4;
         ide_hwifs[data_port].tuneproc = m8xx_ide_tuneproc;
 
         hw->ack_intr = (ide_ack_intr_t *) ide_interrupt_ack;
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index debaa8823f51..33630ad3e794 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1248,6 +1248,7 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
         hwif->cbl = pmif->cable_80 ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
         hwif->drives[0].unmask = 1;
         hwif->drives[1].unmask = 1;
+        hwif->pio_mask = ATA_PIO4;
         hwif->tuneproc = pmac_ide_tuneproc;
         if (pmif->kind == controller_un_ata6
             || pmif->kind == controller_k2_ata6
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index e9f3267456e2..f9e455cc8092 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -614,6 +614,7 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                         ide_hwif_setup_dma(dev, d, hwif);
 bypass_legacy_dma:
                 hwif->host_flags = d->host_flags;
+                hwif->pio_mask = d->pio_mask;
 
                 if (d->init_hwif)
                         /* Call chipset-specific routine