Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (63 commits)
  ide: remove REQ_TYPE_ATA_CMD
  ide: switch ide_cmd_ioctl() to use REQ_TYPE_ATA_TASKFILE requests
  ide: switch set_xfer_rate() to use REQ_TYPE_ATA_TASKFILE requests
  ide: fix final status check in drive_cmd_intr()
  ide: check BUSY and ERROR status bits before reading data in drive_cmd_intr()
  ide: don't enable local IRQs for PIO-in in driver_cmd_intr() (take 2)
  ide: convert "empty" REQ_TYPE_ATA_CMD requests to use REQ_TYPE_ATA_TASKFILE
  ide: initialize rq->cmd_type in ide_init_drive_cmd() callers
  ide: use wait_drive_not_busy() in drive_cmd_intr() (take 2)
  ide: kill DATA_READY define
  ide: task_end_request() fix
  ide: use rq->nr_sectors in task_end_request()
  ide: remove needless ->cursg clearing from task_end_request()
  ide: set IDE_TFLAG_IN_* flags before queuing/executing command
  ide-tape: fix handling of non-special requests in ->end_request method
  ide: fix final status check in task_in_intr()
  ide: clear HOB bit for REQ_TYPE_ATA_CMD requests in ide_end_drive_cmd()
  ide: fix ->io_32bit race in ide_taskfile_ioctl()
  cmd64x: remove /proc/ide/cmd64x
  ide: remove broken disk byte-swapping support
  ...

2 files changed, 34 insertions, 28 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index bd20a4e8663a..49b7a4c31a6d 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -143,7 +143,6 @@ enum rq_cmd_type_bits {
          * use REQ_TYPE_SPECIAL and use rq->cmd[0] with the range of driver
          * private REQ_LB opcodes to differentiate what type of request this is
          */
-        REQ_TYPE_ATA_CMD,
         REQ_TYPE_ATA_TASKFILE,
         REQ_TYPE_ATA_PC,
 };
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 1e4409937ec3..27cb39de2ae2 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -107,7 +107,6 @@ typedef unsigned char	byte;	/* used everywhere */
 #define BAD_W_STAT              (BAD_R_STAT  | WRERR_STAT)
 #define BAD_STAT                (BAD_R_STAT  | DRQ_STAT)
 #define DRIVE_READY             (READY_STAT  | SEEK_STAT)
-#define DATA_READY              (DRQ_STAT)
 
 #define BAD_CRC                 (ABRT_ERR    | ICRC_ERR)
 
@@ -198,8 +197,11 @@ typedef struct hw_regs_s {
 } hw_regs_t;
 
 struct hwif_s * ide_find_port(unsigned long);
+void ide_init_port_data(struct hwif_s *, unsigned int);
+void ide_init_port_hw(struct hwif_s *, hw_regs_t *);
 
-int ide_register_hw(hw_regs_t *, void (*)(struct hwif_s *), int,
+struct ide_drive_s;
+int ide_register_hw(hw_regs_t *, void (*)(struct ide_drive_s *),
                     struct hwif_s **);
 
 void ide_setup_ports(   hw_regs_t *hw,
@@ -391,7 +393,6 @@ typedef struct ide_drive_s {
         u8      state;                  /* retry state */
         u8      waiting_for_dma;        /* dma currently in progress */
         u8      unmask;                 /* okay to unmask other irqs */
-        u8      bswap;                  /* byte swap data */
         u8      noflush;                /* don't attempt flushes */
         u8      dsc_overlap;            /* DSC overlap */
         u8      nice1;                  /* give potential excess bandwidth */
@@ -527,31 +528,26 @@ typedef struct hwif_s {
         /* special host masking for drive selection */
         void    (*maskproc)(ide_drive_t *, int);
         /* check host's drive quirk list */
-        int     (*quirkproc)(ide_drive_t *);
+        void    (*quirkproc)(ide_drive_t *);
         /* driver soft-power interface */
         int     (*busproc)(ide_drive_t *, int);
 #endif
         u8 (*mdma_filter)(ide_drive_t *);
         u8 (*udma_filter)(ide_drive_t *);
 
-        void (*fixup)(struct hwif_s *);
-
         void (*ata_input_data)(ide_drive_t *, void *, u32);
         void (*ata_output_data)(ide_drive_t *, void *, u32);
 
         void (*atapi_input_bytes)(ide_drive_t *, void *, u32);
         void (*atapi_output_bytes)(ide_drive_t *, void *, u32);
 
+        void (*dma_host_set)(ide_drive_t *, int);
         int (*dma_setup)(ide_drive_t *);
         void (*dma_exec_cmd)(ide_drive_t *, u8);
         void (*dma_start)(ide_drive_t *);
         int (*ide_dma_end)(ide_drive_t *drive);
-        int (*ide_dma_on)(ide_drive_t *drive);
-        void (*dma_off_quietly)(ide_drive_t *drive);
         int (*ide_dma_test_irq)(ide_drive_t *drive);
         void (*ide_dma_clear_irq)(ide_drive_t *drive);
-        void (*dma_host_on)(ide_drive_t *drive);
-        void (*dma_host_off)(ide_drive_t *drive);
         void (*dma_lost_irq)(ide_drive_t *drive);
         void (*dma_timeout)(ide_drive_t *drive);
 
@@ -874,14 +870,6 @@ extern int ide_do_drive_cmd(ide_drive_t *, struct request *, ide_action_t);
 
 extern void ide_end_drive_cmd(ide_drive_t *, u8, u8);
 
-/*
- * Issue ATA command and wait for completion.
- * Use for implementing commands in kernel
- *
- *  (ide_drive_t *drive, u8 cmd, u8 nsect, u8 feature, u8 sectors, u8 *buf)
- */
-extern int ide_wait_cmd(ide_drive_t *, u8, u8, u8, u8, u8 *);
-
 enum {
         IDE_TFLAG_LBA48                 = (1 << 0),
         IDE_TFLAG_NO_SELECT_MASK        = (1 << 1),
@@ -934,6 +922,14 @@ enum {
         IDE_TFLAG_IN_TF                 = IDE_TFLAG_IN_NSECT |
                                           IDE_TFLAG_IN_LBA,
         IDE_TFLAG_IN_DEVICE             = (1 << 29),
+        IDE_TFLAG_HOB                   = IDE_TFLAG_OUT_HOB |
+                                          IDE_TFLAG_IN_HOB,
+        IDE_TFLAG_TF                    = IDE_TFLAG_OUT_TF |
+                                          IDE_TFLAG_IN_TF,
+        IDE_TFLAG_DEVICE                = IDE_TFLAG_OUT_DEVICE |
+                                          IDE_TFLAG_IN_DEVICE,
+        /* force 16-bit I/O operations */
+        IDE_TFLAG_IO_16BIT              = (1 << 30),
 };
 
 struct ide_taskfile {
@@ -988,6 +984,10 @@ void ide_pktcmd_tf_load(ide_drive_t *, u32, u16, u8);
 
 ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *);
 
+void task_end_request(ide_drive_t *, struct request *, u8);
+
+u8 wait_drive_not_busy(ide_drive_t *);
+
 int ide_raw_taskfile(ide_drive_t *, ide_task_t *, u8 *, u16);
 int ide_no_data_taskfile(ide_drive_t *, ide_task_t *);
 
@@ -1015,10 +1015,9 @@ extern void do_ide_request(struct request_queue *);
 
 void ide_init_disk(struct gendisk *, ide_drive_t *);
 
-extern int ideprobe_init(void);
-
 #ifdef CONFIG_IDEPCI_PCIBUS_ORDER
-extern void ide_scan_pcibus(int scan_direction) __init;
+extern int ide_scan_direction;
+int __init ide_scan_pcibus(void);
 extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner, const char *mod_name);
 #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE, KBUILD_MODNAME)
 #else
@@ -1095,6 +1094,8 @@ enum {
         /* unmask IRQs */
         IDE_HFLAG_UNMASK_IRQS           = (1 << 25),
         IDE_HFLAG_ABUSE_SET_DMA_MODE    = (1 << 26),
+        /* host is CY82C693 */
+        IDE_HFLAG_CY82C693              = (1 << 27),
 };
 
 #ifdef CONFIG_BLK_DEV_OFFBOARD
@@ -1109,7 +1110,6 @@ struct ide_port_info {
         void                    (*init_iops)(ide_hwif_t *);
         void                    (*init_hwif)(ide_hwif_t *);
         void                    (*init_dma)(ide_hwif_t *, unsigned long);
-        void                    (*fixup)(ide_hwif_t *);
         ide_pci_enablebit_t     enablebits[2];
         hwif_chipset_t          chipset;
         u8                      extra;
@@ -1147,7 +1147,9 @@ static inline u8 ide_max_dma_mode(ide_drive_t *drive)
         return ide_find_dma_mode(drive, XFER_UDMA_6);
 }
 
+void ide_dma_off_quietly(ide_drive_t *);
 void ide_dma_off(ide_drive_t *);
+void ide_dma_on(ide_drive_t *);
 int ide_set_dma(ide_drive_t *);
 ide_startstop_t ide_dma_intr(ide_drive_t *);
 
@@ -1158,10 +1160,7 @@ extern void ide_destroy_dmatable(ide_drive_t *);
 extern int ide_release_dma(ide_hwif_t *);
 extern void ide_setup_dma(ide_hwif_t *, unsigned long, unsigned int);
 
-void ide_dma_host_off(ide_drive_t *);
-void ide_dma_off_quietly(ide_drive_t *);
-void ide_dma_host_on(ide_drive_t *);
-extern int __ide_dma_on(ide_drive_t *);
+void ide_dma_host_set(ide_drive_t *, int);
 extern int ide_dma_setup(ide_drive_t *);
 extern void ide_dma_start(ide_drive_t *);
 extern int __ide_dma_end(ide_drive_t *);
@@ -1173,7 +1172,9 @@ extern void ide_dma_timeout(ide_drive_t *);
 static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; }
 static inline u8 ide_find_dma_mode(ide_drive_t *drive, u8 speed) { return 0; }
 static inline u8 ide_max_dma_mode(ide_drive_t *drive) { return 0; }
+static inline void ide_dma_off_quietly(ide_drive_t *drive) { ; }
 static inline void ide_dma_off(ide_drive_t *drive) { ; }
+static inline void ide_dma_on(ide_drive_t *drive) { ; }
 static inline void ide_dma_verbose(ide_drive_t *drive) { ; }
 static inline int ide_set_dma(ide_drive_t *drive) { return 1; }
 #endif /* CONFIG_BLK_DEV_IDEDMA */
@@ -1203,8 +1204,9 @@ extern void ide_unregister (unsigned int index);
 void ide_register_region(struct gendisk *);
 void ide_unregister_region(struct gendisk *);
 
-void ide_undecoded_slave(ide_hwif_t *);
+void ide_undecoded_slave(ide_drive_t *);
 
+int ide_device_add_all(u8 *idx);
 int ide_device_add(u8 idx[4]);
 
 static inline void *ide_get_hwifdata (ide_hwif_t * hwif)
@@ -1302,4 +1304,9 @@ static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive)
         return &hwif->drives[(drive->dn ^ 1) & 1];
 }
 
+static inline void ide_set_irq(ide_drive_t *drive, int on)
+{
+        drive->hwif->OUTB(drive->ctl | (on ? 0 : 2), IDE_CONTROL_REG);
+}
+
 #endif /* _IDE_H */