1 files changed, 202 insertions, 142 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 5425d3038ec2..57d9a9a79a6f 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -37,21 +37,6 @@ static u8 ide_inb (unsigned long port)
         return (u8) inb(port);
 }
 
-static u16 ide_inw (unsigned long port)
-{
-        return (u16) inw(port);
-}
-
-static void ide_insw (unsigned long port, void *addr, u32 count)
-{
-        insw(port, addr, count);
-}
-
-static void ide_insl (unsigned long port, void *addr, u32 count)
-{
-        insl(port, addr, count);
-}
-
 static void ide_outb (u8 val, unsigned long port)
 {
         outb(val, port);
@@ -62,32 +47,11 @@ static void ide_outbsync (ide_drive_t *drive, u8 addr, unsigned long port)
         outb(addr, port);
 }
 
-static void ide_outw (u16 val, unsigned long port)
-{
-        outw(val, port);
-}
-
-static void ide_outsw (unsigned long port, void *addr, u32 count)
-{
-        outsw(port, addr, count);
-}
-
-static void ide_outsl (unsigned long port, void *addr, u32 count)
-{
-        outsl(port, addr, count);
-}
-
 void default_hwif_iops (ide_hwif_t *hwif)
 {
         hwif->OUTB      = ide_outb;
         hwif->OUTBSYNC  = ide_outbsync;
-        hwif->OUTW      = ide_outw;
-        hwif->OUTSW     = ide_outsw;
-        hwif->OUTSL     = ide_outsl;
         hwif->INB       = ide_inb;
-        hwif->INW       = ide_inw;
-        hwif->INSW      = ide_insw;
-        hwif->INSL      = ide_insl;
 }
 
 /*
@@ -99,21 +63,6 @@ static u8 ide_mm_inb (unsigned long port)
         return (u8) readb((void __iomem *) port);
 }
 
-static u16 ide_mm_inw (unsigned long port)
-{
-        return (u16) readw((void __iomem *) port);
-}
-
-static void ide_mm_insw (unsigned long port, void *addr, u32 count)
-{
-        __ide_mm_insw((void __iomem *) port, addr, count);
-}
-
-static void ide_mm_insl (unsigned long port, void *addr, u32 count)
-{
-        __ide_mm_insl((void __iomem *) port, addr, count);
-}
-
 static void ide_mm_outb (u8 value, unsigned long port)
 {
         writeb(value, (void __iomem *) port);
@@ -124,34 +73,13 @@ static void ide_mm_outbsync (ide_drive_t *drive, u8 value, unsigned long port)
         writeb(value, (void __iomem *) port);
 }
 
-static void ide_mm_outw (u16 value, unsigned long port)
-{
-        writew(value, (void __iomem *) port);
-}
-
-static void ide_mm_outsw (unsigned long port, void *addr, u32 count)
-{
-        __ide_mm_outsw((void __iomem *) port, addr, count);
-}
-
-static void ide_mm_outsl (unsigned long port, void *addr, u32 count)
-{
-        __ide_mm_outsl((void __iomem *) port, addr, count);
-}
-
 void default_hwif_mmiops (ide_hwif_t *hwif)
 {
         hwif->OUTB      = ide_mm_outb;
         /* Most systems will need to override OUTBSYNC, alas however
            this one is controller specific! */
         hwif->OUTBSYNC  = ide_mm_outbsync;
-        hwif->OUTW      = ide_mm_outw;
-        hwif->OUTSW     = ide_mm_outsw;
-        hwif->OUTSL     = ide_mm_outsl;
         hwif->INB       = ide_mm_inb;
-        hwif->INW       = ide_mm_inw;
-        hwif->INSW      = ide_mm_insw;
-        hwif->INSL      = ide_mm_insl;
 }
 
 EXPORT_SYMBOL(default_hwif_mmiops);
@@ -175,6 +103,123 @@ void SELECT_MASK (ide_drive_t *drive, int mask)
                 port_ops->maskproc(drive, mask);
 }
 
+static void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        struct ide_io_ports *io_ports = &hwif->io_ports;
+        struct ide_taskfile *tf = &task->tf;
+        void (*tf_outb)(u8 addr, unsigned long port);
+        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
+        u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;
+
+        if (mmio)
+                tf_outb = ide_mm_outb;
+        else
+                tf_outb = ide_outb;
+
+        if (task->tf_flags & IDE_TFLAG_FLAGGED)
+                HIHI = 0xFF;
+
+        ide_set_irq(drive, 1);
+
+        if ((task->tf_flags & IDE_TFLAG_NO_SELECT_MASK) == 0)
+                SELECT_MASK(drive, 0);
+
+        if (task->tf_flags & IDE_TFLAG_OUT_DATA) {
+                u16 data = (tf->hob_data << 8) | tf->data;
+
+                if (mmio)
+                        writew(data, (void __iomem *)io_ports->data_addr);
+                else
+                        outw(data, io_ports->data_addr);
+        }
+
+        if (task->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
+                tf_outb(tf->hob_feature, io_ports->feature_addr);
+        if (task->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
+                tf_outb(tf->hob_nsect, io_ports->nsect_addr);
+        if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)
+                tf_outb(tf->hob_lbal, io_ports->lbal_addr);
+        if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)
+                tf_outb(tf->hob_lbam, io_ports->lbam_addr);
+        if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)
+                tf_outb(tf->hob_lbah, io_ports->lbah_addr);
+
+        if (task->tf_flags & IDE_TFLAG_OUT_FEATURE)
+                tf_outb(tf->feature, io_ports->feature_addr);
+        if (task->tf_flags & IDE_TFLAG_OUT_NSECT)
+                tf_outb(tf->nsect, io_ports->nsect_addr);
+        if (task->tf_flags & IDE_TFLAG_OUT_LBAL)
+                tf_outb(tf->lbal, io_ports->lbal_addr);
+        if (task->tf_flags & IDE_TFLAG_OUT_LBAM)
+                tf_outb(tf->lbam, io_ports->lbam_addr);
+        if (task->tf_flags & IDE_TFLAG_OUT_LBAH)
+                tf_outb(tf->lbah, io_ports->lbah_addr);
+
+        if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
+                tf_outb((tf->device & HIHI) | drive->select.all,
+                         io_ports->device_addr);
+}
+
+static void ide_tf_read(ide_drive_t *drive, ide_task_t *task)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        struct ide_io_ports *io_ports = &hwif->io_ports;
+        struct ide_taskfile *tf = &task->tf;
+        void (*tf_outb)(u8 addr, unsigned long port);
+        u8 (*tf_inb)(unsigned long port);
+        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
+
+        if (mmio) {
+                tf_outb = ide_mm_outb;
+                tf_inb  = ide_mm_inb;
+        } else {
+                tf_outb = ide_outb;
+                tf_inb  = ide_inb;
+        }
+
+        if (task->tf_flags & IDE_TFLAG_IN_DATA) {
+                u16 data;
+
+                if (mmio)
+                        data = readw((void __iomem *)io_ports->data_addr);
+                else
+                        data = inw(io_ports->data_addr);
+
+                tf->data = data & 0xff;
+                tf->hob_data = (data >> 8) & 0xff;
+        }
+
+        /* be sure we're looking at the low order bits */
+        tf_outb(drive->ctl & ~0x80, io_ports->ctl_addr);
+
+        if (task->tf_flags & IDE_TFLAG_IN_NSECT)
+                tf->nsect  = tf_inb(io_ports->nsect_addr);
+        if (task->tf_flags & IDE_TFLAG_IN_LBAL)
+                tf->lbal   = tf_inb(io_ports->lbal_addr);
+        if (task->tf_flags & IDE_TFLAG_IN_LBAM)
+                tf->lbam   = tf_inb(io_ports->lbam_addr);
+        if (task->tf_flags & IDE_TFLAG_IN_LBAH)
+                tf->lbah   = tf_inb(io_ports->lbah_addr);
+        if (task->tf_flags & IDE_TFLAG_IN_DEVICE)
+                tf->device = tf_inb(io_ports->device_addr);
+
+        if (task->tf_flags & IDE_TFLAG_LBA48) {
+                tf_outb(drive->ctl | 0x80, io_ports->ctl_addr);
+
+                if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
+                        tf->hob_feature = tf_inb(io_ports->feature_addr);
+                if (task->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
+                        tf->hob_nsect   = tf_inb(io_ports->nsect_addr);
+                if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
+                        tf->hob_lbal    = tf_inb(io_ports->lbal_addr);
+                if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
+                        tf->hob_lbam    = tf_inb(io_ports->lbam_addr);
+                if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
+                        tf->hob_lbah    = tf_inb(io_ports->lbah_addr);
+        }
+}
+
 /*
  * Some localbus EIDE interfaces require a special access sequence
  * when using 32-bit I/O instructions to transfer data.  We call this
@@ -182,109 +227,112 @@ void SELECT_MASK (ide_drive_t *drive, int mask)
  * of the sector count register location, with interrupts disabled
  * to ensure that the reads all happen together.
  */
-static void ata_vlb_sync(ide_drive_t *drive, unsigned long port)
+static void ata_vlb_sync(unsigned long port)
 {
-        (void) HWIF(drive)->INB(port);
-        (void) HWIF(drive)->INB(port);
-        (void) HWIF(drive)->INB(port);
+        (void)inb(port);
+        (void)inb(port);
+        (void)inb(port);
 }
 
 /*
  * This is used for most PIO data transfers *from* the IDE interface
+ *
+ * These routines will round up any request for an odd number of bytes,
+ * so if an odd len is specified, be sure that there's at least one
+ * extra byte allocated for the buffer.
  */
-static void ata_input_data(ide_drive_t *drive, void *buffer, u32 wcount)
+static void ata_input_data(ide_drive_t *drive, struct request *rq,
+                           void *buf, unsigned int len)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct ide_io_ports *io_ports = &hwif->io_ports;
+        unsigned long data_addr = io_ports->data_addr;
         u8 io_32bit = drive->io_32bit;
+        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
+
+        len++;
 
         if (io_32bit) {
-                if (io_32bit & 2) {
-                        unsigned long flags;
+                unsigned long uninitialized_var(flags);
 
+                if ((io_32bit & 2) && !mmio) {
                         local_irq_save(flags);
-                        ata_vlb_sync(drive, io_ports->nsect_addr);
-                        hwif->INSL(io_ports->data_addr, buffer, wcount);
+                        ata_vlb_sync(io_ports->nsect_addr);
+                }
+
+                if (mmio)
+                        __ide_mm_insl((void __iomem *)data_addr, buf, len / 4);
+                else
+                        insl(data_addr, buf, len / 4);
+
+                if ((io_32bit & 2) && !mmio)
                         local_irq_restore(flags);
-                } else
-                        hwif->INSL(io_ports->data_addr, buffer, wcount);
-        } else
-                hwif->INSW(io_ports->data_addr, buffer, wcount << 1);
+
+                if ((len & 3) >= 2) {
+                        if (mmio)
+                                __ide_mm_insw((void __iomem *)data_addr,
+                                                (u8 *)buf + (len & ~3), 1);
+                        else
+                                insw(data_addr, (u8 *)buf + (len & ~3), 1);
+                }
+        } else {
+                if (mmio)
+                        __ide_mm_insw((void __iomem *)data_addr, buf, len / 2);
+                else
+                        insw(data_addr, buf, len / 2);
+        }
 }
 
 /*
  * This is used for most PIO data transfers *to* the IDE interface
  */
-static void ata_output_data(ide_drive_t *drive, void *buffer, u32 wcount)
+static void ata_output_data(ide_drive_t *drive, struct request *rq,
+                            void *buf, unsigned int len)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct ide_io_ports *io_ports = &hwif->io_ports;
+        unsigned long data_addr = io_ports->data_addr;
         u8 io_32bit = drive->io_32bit;
+        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
 
         if (io_32bit) {
-                if (io_32bit & 2) {
-                        unsigned long flags;
+                unsigned long uninitialized_var(flags);
 
+                if ((io_32bit & 2) && !mmio) {
                         local_irq_save(flags);
-                        ata_vlb_sync(drive, io_ports->nsect_addr);
-                        hwif->OUTSL(io_ports->data_addr, buffer, wcount);
-                        local_irq_restore(flags);
-                } else
-                        hwif->OUTSL(io_ports->data_addr, buffer, wcount);
-        } else
-                hwif->OUTSW(io_ports->data_addr, buffer, wcount << 1);
-}
-
-/*
- * The following routines are mainly used by the ATAPI drivers.
- *
- * These routines will round up any request for an odd number of bytes,
- * so if an odd bytecount is specified, be sure that there's at least one
- * extra byte allocated for the buffer.
- */
-
-static void atapi_input_bytes(ide_drive_t *drive, void *buffer, u32 bytecount)
-{
-        ide_hwif_t *hwif = HWIF(drive);
+                        ata_vlb_sync(io_ports->nsect_addr);
+                }
 
-        ++bytecount;
-#if defined(CONFIG_ATARI) || defined(CONFIG_Q40)
-        if (MACH_IS_ATARI || MACH_IS_Q40) {
-                /* Atari has a byte-swapped IDE interface */
-                insw_swapw(hwif->io_ports.data_addr, buffer, bytecount / 2);
-                return;
-        }
-#endif /* CONFIG_ATARI || CONFIG_Q40 */
-        hwif->ata_input_data(drive, buffer, bytecount / 4);
-        if ((bytecount & 0x03) >= 2)
-                hwif->INSW(hwif->io_ports.data_addr,
-                           (u8 *)buffer + (bytecount & ~0x03), 1);
-}
+                if (mmio)
+                        __ide_mm_outsl((void __iomem *)data_addr, buf, len / 4);
+                else
+                        outsl(data_addr, buf, len / 4);
 
-static void atapi_output_bytes(ide_drive_t *drive, void *buffer, u32 bytecount)
-{
-        ide_hwif_t *hwif = HWIF(drive);
+                if ((io_32bit & 2) && !mmio)
+                        local_irq_restore(flags);
 
-        ++bytecount;
-#if defined(CONFIG_ATARI) || defined(CONFIG_Q40)
-        if (MACH_IS_ATARI || MACH_IS_Q40) {
-                /* Atari has a byte-swapped IDE interface */
-                outsw_swapw(hwif->io_ports.data_addr, buffer, bytecount / 2);
-                return;
+                if ((len & 3) >= 2) {
+                        if (mmio)
+                                __ide_mm_outsw((void __iomem *)data_addr,
+                                                 (u8 *)buf + (len & ~3), 1);
+                        else
+                                outsw(data_addr, (u8 *)buf + (len & ~3), 1);
+                }
+        } else {
+                if (mmio)
+                        __ide_mm_outsw((void __iomem *)data_addr, buf, len / 2);
+                else
+                        outsw(data_addr, buf, len / 2);
         }
-#endif /* CONFIG_ATARI || CONFIG_Q40 */
-        hwif->ata_output_data(drive, buffer, bytecount / 4);
-        if ((bytecount & 0x03) >= 2)
-                hwif->OUTSW(hwif->io_ports.data_addr,
-                            (u8 *)buffer + (bytecount & ~0x03), 1);
 }
 
 void default_hwif_transport(ide_hwif_t *hwif)
 {
-        hwif->ata_input_data            = ata_input_data;
-        hwif->ata_output_data           = ata_output_data;
-        hwif->atapi_input_bytes         = atapi_input_bytes;
-        hwif->atapi_output_bytes        = atapi_output_bytes;
+        hwif->tf_load     = ide_tf_load;
+        hwif->tf_read     = ide_tf_read;
+
+        hwif->input_data  = ata_input_data;
+        hwif->output_data = ata_output_data;
 }
 
 void ide_fix_driveid (struct hd_driveid *id)
@@ -577,6 +625,8 @@ static const struct drive_list_entry ivb_list[] = {
         { "TSSTcorp CDDVDW SH-S202J"    , "SB01"        },
         { "TSSTcorp CDDVDW SH-S202N"    , "SB00"        },
         { "TSSTcorp CDDVDW SH-S202N"    , "SB01"        },
+        { "TSSTcorp CDDVDW SH-S202H"    , "SB00"        },
+        { "TSSTcorp CDDVDW SH-S202H"    , "SB01"        },
         { NULL                          , NULL          }
 };
 
@@ -641,7 +691,7 @@ int ide_driveid_update(ide_drive_t *drive)
         SELECT_MASK(drive, 1);
         ide_set_irq(drive, 1);
         msleep(50);
-        hwif->OUTB(WIN_IDENTIFY, hwif->io_ports.command_addr);
+        hwif->OUTBSYNC(drive, WIN_IDENTIFY, hwif->io_ports.command_addr);
         timeout = jiffies + WAIT_WORSTCASE;
         do {
                 if (time_after(jiffies, timeout)) {
@@ -668,7 +718,7 @@ int ide_driveid_update(ide_drive_t *drive)
                 local_irq_restore(flags);
                 return 0;
         }
-        hwif->ata_input_data(drive, id, SECTOR_WORDS);
+        hwif->input_data(drive, NULL, id, SECTOR_SIZE);
         (void)ide_read_status(drive);   /* clear drive IRQ */
         local_irq_enable();
         local_irq_restore(flags);
@@ -849,9 +899,19 @@ void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
         ndelay(400);
         spin_unlock_irqrestore(&ide_lock, flags);
 }
-
 EXPORT_SYMBOL(ide_execute_command);
 
+void ide_execute_pkt_cmd(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ide_lock, flags);
+        hwif->OUTBSYNC(drive, WIN_PACKETCMD, hwif->io_ports.command_addr);
+        ndelay(400);
+        spin_unlock_irqrestore(&ide_lock, flags);
+}
+EXPORT_SYMBOL_GPL(ide_execute_pkt_cmd);
 
 /* needed below */
 static ide_startstop_t do_reset1 (ide_drive_t *, int);