12 files changed, 46 insertions, 55 deletions

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 7f46c224b7c4..ae7a4329a581 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -140,7 +140,7 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name)
 {
-        int bus_speed = ide_pci_clk ? ide_pci_clk : system_bus_clock();
+        int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
 
         if (bus_speed <= 33)
                 pci_set_drvdata(dev, (void *) aec6xxx_33_base);
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index f2129d5e07f2..f2de00adf147 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -72,7 +72,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
         int s_time, a_time, c_time;
         u8 s_clc, a_clc, r_clc;
         unsigned long flags;
-        int bus_speed = ide_pci_clk ? ide_pci_clk : system_bus_clock();
+        int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
         int port = hwif->channel ? 0x5c : 0x58;
         int portFIFO = hwif->channel ? 0x55 : 0x54;
         u8 cd_dma_fifo = 0;
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index efcf54338be7..ad222206a429 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -53,20 +53,20 @@ static void amd_set_speed(struct pci_dev *dev, u8 dn, u8 udma_mask,
         u8 t = 0, offset = amd_offset(dev);
 
         pci_read_config_byte(dev, AMD_ADDRESS_SETUP + offset, &t);
-        t = (t & ~(3 << ((3 - dn) << 1))) | ((FIT(timing->setup, 1, 4) - 1) << ((3 - dn) << 1));
+        t = (t & ~(3 << ((3 - dn) << 1))) | ((clamp_val(timing->setup, 1, 4) - 1) << ((3 - dn) << 1));
         pci_write_config_byte(dev, AMD_ADDRESS_SETUP + offset, t);
 
         pci_write_config_byte(dev, AMD_8BIT_TIMING + offset + (1 - (dn >> 1)),
-                ((FIT(timing->act8b, 1, 16) - 1) << 4) | (FIT(timing->rec8b, 1, 16) - 1));
+                ((clamp_val(timing->act8b, 1, 16) - 1) << 4) | (clamp_val(timing->rec8b, 1, 16) - 1));
 
         pci_write_config_byte(dev, AMD_DRIVE_TIMING + offset + (3 - dn),
-                ((FIT(timing->active, 1, 16) - 1) << 4) | (FIT(timing->recover, 1, 16) - 1));
+                ((clamp_val(timing->active, 1, 16) - 1) << 4) | (clamp_val(timing->recover, 1, 16) - 1));
 
         switch (udma_mask) {
-        case ATA_UDMA2: t = timing->udma ? (0xc0 | (FIT(timing->udma, 2, 5) - 2)) : 0x03; break;
-        case ATA_UDMA4: t = timing->udma ? (0xc0 | amd_cyc2udma[FIT(timing->udma, 2, 10)]) : 0x03; break;
-        case ATA_UDMA5: t = timing->udma ? (0xc0 | amd_cyc2udma[FIT(timing->udma, 1, 10)]) : 0x03; break;
-        case ATA_UDMA6: t = timing->udma ? (0xc0 | amd_cyc2udma[FIT(timing->udma, 1, 15)]) : 0x03; break;
+        case ATA_UDMA2: t = timing->udma ? (0xc0 | (clamp_val(timing->udma, 2, 5) - 2)) : 0x03; break;
+        case ATA_UDMA4: t = timing->udma ? (0xc0 | amd_cyc2udma[clamp_val(timing->udma, 2, 10)]) : 0x03; break;
+        case ATA_UDMA5: t = timing->udma ? (0xc0 | amd_cyc2udma[clamp_val(timing->udma, 1, 10)]) : 0x03; break;
+        case ATA_UDMA6: t = timing->udma ? (0xc0 | amd_cyc2udma[clamp_val(timing->udma, 1, 15)]) : 0x03; break;
         default: return;
         }
 
@@ -179,7 +179,7 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev,
  * Determine the system bus clock.
  */
 
-        amd_clock = (ide_pci_clk ? ide_pci_clk : system_bus_clock()) * 1000;
+        amd_clock = (ide_pci_clk ? ide_pci_clk : 33) * 1000;
 
         switch (amd_clock) {
                 case 33000: amd_clock = 33333; break;
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index b38a1980dcd5..cd1ba14984ab 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -525,12 +525,10 @@ static void cmd640_set_mode(ide_drive_t *drive, unsigned int index,
         u8 setup_count, active_count, recovery_count, recovery_count2, cycle_count;
         int bus_speed;
 
-        if (cmd640_vlb && ide_vlb_clk)
-                bus_speed = ide_vlb_clk;
-        else if (!cmd640_vlb && ide_pci_clk)
-                bus_speed = ide_pci_clk;
+        if (cmd640_vlb)
+                bus_speed = ide_vlb_clk ? ide_vlb_clk : 50;
         else
-                bus_speed = system_bus_clock();
+                bus_speed = ide_pci_clk ? ide_pci_clk : 33;
 
         if (pio_mode > 5)
                 pio_mode = 5;
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 08674711d089..ca4774aa27ee 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -69,7 +69,7 @@ static u8 quantize_timing(int timing, int quant)
 static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_time)
 {
         struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
-        int clock_time = 1000 / (ide_pci_clk ? ide_pci_clk : system_bus_clock());
+        int clock_time = 1000 / (ide_pci_clk ? ide_pci_clk : 33);
         u8  cycle_count, active_count, recovery_count, drwtim;
         static const u8 recovery_values[] =
                 {15, 15, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0};
@@ -128,7 +128,7 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)
                             ide_pio_timings[pio].active_time);
 
         setup_count = quantize_timing(ide_pio_timings[pio].setup_time,
-                        1000 / (ide_pci_clk ? ide_pci_clk : system_bus_clock()));
+                        1000 / (ide_pci_clk ? ide_pci_clk : 33));
 
         /*
          * The primary channel has individual address setup timing registers
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 77cc22c2ad45..8c534afcb6c8 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -134,7 +134,7 @@ static int calc_clk(int time, int bus_speed)
 static void compute_clocks(u8 pio, pio_clocks_t *p_pclk)
 {
         int clk1, clk2;
-        int bus_speed = ide_pci_clk ? ide_pci_clk : system_bus_clock();
+        int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
 
         /* we don't check against CY82C693's min and max speed,
          * so you can play with the idebus=xx parameter
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index c929dadaaaff..397c6cbe953c 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -759,8 +759,7 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask)
                                 enable_irq (hwif->irq);
                 }
         } else
-                outb(mask ? (drive->ctl | 2) : (drive->ctl & ~2),
-                     hwif->io_ports.ctl_addr);
+                outb(ATA_DEVCTL_OBS | (mask ? 2 : 0), hwif->io_ports.ctl_addr);
 }
 
 /*
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index a7a41bb82778..45ba71a7182f 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -76,7 +76,7 @@ static void superio_tf_read(ide_drive_t *drive, ide_task_t *task)
         }
 
         /* be sure we're looking at the low order bits */
-        outb(drive->ctl & ~0x80, io_ports->ctl_addr);
+        outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
 
         if (task->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = inb(io_ports->nsect_addr);
@@ -90,7 +90,7 @@ static void superio_tf_read(ide_drive_t *drive, ide_task_t *task)
                 tf->device = superio_ide_inb(io_ports->device_addr);
 
         if (task->tf_flags & IDE_TFLAG_LBA48) {
-                outb(drive->ctl | 0x80, io_ports->ctl_addr);
+                outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
 
                 if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
                         tf->hob_feature = inb(io_ports->feature_addr);
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 910fb00deb71..1584ebb6a185 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -148,11 +148,8 @@ static void scc_ide_outb(u8 addr, unsigned long port)
         out_be32((void*)port, addr);
 }
 
-static void
-scc_ide_outbsync(ide_drive_t * drive, u8 addr, unsigned long port)
+static void scc_ide_outbsync(ide_hwif_t *hwif, u8 addr, unsigned long port)
 {
-        ide_hwif_t *hwif = HWIF(drive);
-
         out_be32((void*)port, addr);
         eieio();
         in_be32((void*)(hwif->dma_base + 0x01c));
@@ -662,8 +659,6 @@ static void scc_tf_load(ide_drive_t *drive, ide_task_t *task)
         if (task->tf_flags & IDE_TFLAG_FLAGGED)
                 HIHI = 0xFF;
 
-        ide_set_irq(drive, 1);
-
         if (task->tf_flags & IDE_TFLAG_OUT_DATA)
                 out_be32((void *)io_ports->data_addr,
                          (tf->hob_data << 8) | tf->data);
@@ -708,7 +703,7 @@ static void scc_tf_read(ide_drive_t *drive, ide_task_t *task)
         }
 
         /* be sure we're looking at the low order bits */
-        scc_ide_outb(drive->ctl & ~0x80, io_ports->ctl_addr);
+        scc_ide_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
 
         if (task->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = scc_ide_inb(io_ports->nsect_addr);
@@ -722,7 +717,7 @@ static void scc_tf_read(ide_drive_t *drive, ide_task_t *task)
                 tf->device = scc_ide_inb(io_ports->device_addr);
 
         if (task->tf_flags & IDE_TFLAG_LBA48) {
-                scc_ide_outb(drive->ctl | 0x80, io_ports->ctl_addr);
+                scc_ide_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
 
                 if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
                         tf->hob_feature = scc_ide_inb(io_ports->feature_addr);
@@ -795,7 +790,6 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif)
 
         hwif->dma_base = dma_base;
         hwif->config_data = ports->ctl;
-        hwif->mmio = 1;
 }
 
 /**
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 16a0bce17d69..24513e3dcd6b 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -111,7 +111,7 @@ sgiioc4_init_hwif_ports(hw_regs_t * hw, unsigned long data_port,
 static void
 sgiioc4_maskproc(ide_drive_t * drive, int mask)
 {
-        writeb(mask ? (drive->ctl | 2) : (drive->ctl & ~2),
+        writeb(ATA_DEVCTL_OBS | (mask ? 2 : 0),
                (void __iomem *)drive->hwif->io_ports.ctl_addr);
 }
 
@@ -369,8 +369,7 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
         hwif->sg_max_nents = IOC4_PRD_ENTRIES;
 
         pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE,
-                                   (dma_addr_t *) &(hwif->dma_status));
-
+                                   (dma_addr_t *)&hwif->extra_base);
         if (pad) {
                 ide_set_hwifdata(hwif, pad);
                 return 0;
@@ -439,7 +438,7 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)
 
         /* Address of the Ending DMA */
         memset(ide_get_hwifdata(hwif), 0, IOC4_IDE_CACHELINE_SIZE);
-        ending_dma_addr = cpu_to_le32(hwif->dma_status);
+        ending_dma_addr = cpu_to_le32(hwif->extra_base);
         writel(ending_dma_addr, (void __iomem *)(dma_base + IOC4_DMA_END_ADDR * 4));
 
         writel(dma_direction, (void __iomem *)ioc4_dma_addr);
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 0006b9e58567..b75e9bb390a7 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -94,7 +94,7 @@ static unsigned long siimage_selreg(ide_hwif_t *hwif, int r)
         unsigned long base = (unsigned long)hwif->hwif_data;
 
         base += 0xA0 + r;
-        if (hwif->mmio)
+        if (hwif->host_flags & IDE_HFLAG_MMIO)
                 base += hwif->channel << 6;
         else
                 base += hwif->channel << 4;
@@ -117,7 +117,7 @@ static inline unsigned long siimage_seldev(ide_drive_t *drive, int r)
         unsigned long base      = (unsigned long)hwif->hwif_data;
 
         base += 0xA0 + r;
-        if (hwif->mmio)
+        if (hwif->host_flags & IDE_HFLAG_MMIO)
                 base += hwif->channel << 6;
         else
                 base += hwif->channel << 4;
@@ -190,7 +190,9 @@ static u8 sil_pata_udma_filter(ide_drive_t *drive)
         unsigned long base      = (unsigned long)hwif->hwif_data;
         u8 scsc, mask           = 0;
 
-        scsc = sil_ioread8(dev, base + (hwif->mmio ? 0x4A : 0x8A));
+        base += (hwif->host_flags & IDE_HFLAG_MMIO) ? 0x4A : 0x8A;
+
+        scsc = sil_ioread8(dev, base);
 
         switch (scsc & 0x30) {
         case 0x10:      /* 133 */
@@ -238,8 +240,9 @@ static void sil_set_pio_mode(ide_drive_t *drive, u8 pio)
         unsigned long tfaddr    = siimage_selreg(hwif,  0x02);
         unsigned long base      = (unsigned long)hwif->hwif_data;
         u8 tf_pio               = pio;
-        u8 addr_mask            = hwif->channel ? (hwif->mmio ? 0xF4 : 0x84)
-                                                : (hwif->mmio ? 0xB4 : 0x80);
+        u8 mmio                 = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
+        u8 addr_mask            = hwif->channel ? (mmio ? 0xF4 : 0x84)
+                                                : (mmio ? 0xB4 : 0x80);
         u8 mode                 = 0;
         u8 unit                 = drive->select.b.unit;
 
@@ -290,13 +293,13 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed)
         u16 ultra = 0, multi    = 0;
         u8 mode = 0, unit       = drive->select.b.unit;
         unsigned long base      = (unsigned long)hwif->hwif_data;
-        u8 scsc = 0, addr_mask  = hwif->channel ?
-                                        (hwif->mmio ? 0xF4 : 0x84) :
-                                        (hwif->mmio ? 0xB4 : 0x80);
+        u8 mmio                 = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
+        u8 scsc = 0, addr_mask  = hwif->channel ? (mmio ? 0xF4 : 0x84)
+                                                : (mmio ? 0xB4 : 0x80);
         unsigned long ma        = siimage_seldev(drive, 0x08);
         unsigned long ua        = siimage_seldev(drive, 0x0C);
 
-        scsc  = sil_ioread8 (dev, base + (hwif->mmio ? 0x4A : 0x8A));
+        scsc  = sil_ioread8 (dev, base + (mmio ? 0x4A : 0x8A));
         mode  = sil_ioread8 (dev, base + addr_mask);
         multi = sil_ioread16(dev, ma);
         ultra = sil_ioread16(dev, ua);
@@ -391,7 +394,7 @@ static int siimage_mmio_dma_test_irq(ide_drive_t *drive)
 
 static int siimage_dma_test_irq(ide_drive_t *drive)
 {
-        if (drive->hwif->mmio)
+        if (drive->hwif->host_flags & IDE_HFLAG_MMIO)
                 return siimage_mmio_dma_test_irq(drive);
         else
                 return siimage_io_dma_test_irq(drive);
@@ -640,8 +643,6 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
         hwif->irq = dev->irq;
 
         hwif->dma_base = (unsigned long)addr + (ch ? 0x08 : 0x00);
-
-        hwif->mmio = 1;
 }
 
 static int is_dev_seagate_sata(ide_drive_t *drive)
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 566e0ecb8db1..3ed9728abd24 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -120,21 +120,21 @@ static void via_set_speed(ide_hwif_t *hwif, u8 dn, struct ide_timing *timing)
 
         if (~vdev->via_config->flags & VIA_BAD_AST) {
                 pci_read_config_byte(dev, VIA_ADDRESS_SETUP, &t);
-                t = (t & ~(3 << ((3 - dn) << 1))) | ((FIT(timing->setup, 1, 4) - 1) << ((3 - dn) << 1));
+                t = (t & ~(3 << ((3 - dn) << 1))) | ((clamp_val(timing->setup, 1, 4) - 1) << ((3 - dn) << 1));
                 pci_write_config_byte(dev, VIA_ADDRESS_SETUP, t);
         }
 
         pci_write_config_byte(dev, VIA_8BIT_TIMING + (1 - (dn >> 1)),
-                ((FIT(timing->act8b, 1, 16) - 1) << 4) | (FIT(timing->rec8b, 1, 16) - 1));
+                ((clamp_val(timing->act8b, 1, 16) - 1) << 4) | (clamp_val(timing->rec8b, 1, 16) - 1));
 
         pci_write_config_byte(dev, VIA_DRIVE_TIMING + (3 - dn),
-                ((FIT(timing->active, 1, 16) - 1) << 4) | (FIT(timing->recover, 1, 16) - 1));
+                ((clamp_val(timing->active, 1, 16) - 1) << 4) | (clamp_val(timing->recover, 1, 16) - 1));
 
         switch (vdev->via_config->udma_mask) {
-        case ATA_UDMA2: t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 5) - 2)) : 0x03; break;
-        case ATA_UDMA4: t = timing->udma ? (0xe8 | (FIT(timing->udma, 2, 9) - 2)) : 0x0f; break;
-        case ATA_UDMA5: t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 9) - 2)) : 0x07; break;
-        case ATA_UDMA6: t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 9) - 2)) : 0x07; break;
+        case ATA_UDMA2: t = timing->udma ? (0xe0 | (clamp_val(timing->udma, 2, 5) - 2)) : 0x03; break;
+        case ATA_UDMA4: t = timing->udma ? (0xe8 | (clamp_val(timing->udma, 2, 9) - 2)) : 0x0f; break;
+        case ATA_UDMA5: t = timing->udma ? (0xe0 | (clamp_val(timing->udma, 2, 9) - 2)) : 0x07; break;
+        case ATA_UDMA6: t = timing->udma ? (0xe0 | (clamp_val(timing->udma, 2, 9) - 2)) : 0x07; break;
         default: return;
         }
 
@@ -340,7 +340,7 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const
          * Determine system bus clock.
          */
 
-        via_clock = (ide_pci_clk ? ide_pci_clk : system_bus_clock()) * 1000;
+        via_clock = (ide_pci_clk ? ide_pci_clk : 33) * 1000;
 
         switch (via_clock) {
                 case 33000: via_clock = 33333; break;