falconide/q40ide: add ->atapi_*put_bytes and ->ata_*put_data methods (take 2)

* Add ->atapi_{in,out}put_bytes and ->ata_{in,out}put_data methods to
  falconide and q40ide host drivers (->ata_* methods are implemented on
  top of ->atapi_* methods so they also do byte-swapping now).

* Cleanup atapi_{in,out}put_bytes().

v2:
* Add 'struct request *rq' argument to ->ata_{in,out}put_data methods
  and don't byte-swap disk fs requests (we shouldn't un-swap fs requests
  because fs itself is stored byte-swapped on the disk) - this is how
  things were done before the patch (ideally device mapper should be
  used instead but it would break existing setups and would have some
  performance impact).

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Richard Zidlicky <rz@linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 34 insertions, 0 deletions

diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index f9210458aea0..deae3d2ca65e 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -72,7 +72,35 @@ static void q40_ide_setup_ports(hw_regs_t *hw, unsigned long base,
         hw->ack_intr = ack_intr;
 }
 
+static void q40ide_atapi_input_bytes(ide_drive_t *drive, void *buf,
+                                     unsigned int len)
+{
+        insw_swapw(drive->hwif->io_ports.data_addr, buf, (len + 1) / 2);
+}
 
+static void q40ide_atapi_output_bytes(ide_drive_t *drive, void *buf,
+                                      unsigned int len)
+{
+        outsw_swapw(drive->hwif->io_ports.data_addr, buf, (len + 1) / 2);
+}
+
+static void q40ide_ata_input_data(ide_drive_t *drive, struct request *rq,
+                                  void *buf, unsigned int wcount)
+{
+        if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS)
+                return insw(drive->hwif->io_ports.data_addr, buf, wcount * 2);
+
+        q40ide_atapi_input_bytes(drive, buf, wcount * 4);
+}
+
+static void q40ide_ata_output_data(ide_drive_t *drive, struct request *rq,
+                                   void *buf, unsigned int wcount)
+{
+        if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS)
+                return outsw(drive->hwif->io_ports.data_addr, buf, wcount * 2);
+
+        q40ide_atapi_output_bytes(drive, buf, wcount * 4);
+}
 
 /* 
  * the static array is needed to have the name reported in /proc/ioports,
@@ -123,6 +151,12 @@ static int __init q40ide_init(void)
                 ide_init_port_data(hwif, hwif->index);
                 ide_init_port_hw(hwif, &hw);
 
+                /* Q40 has a byte-swapped IDE interface */
+                hwif->atapi_input_bytes  = q40ide_atapi_input_bytes;
+                hwif->atapi_output_bytes = q40ide_atapi_output_bytes;
+                hwif->ata_input_data     = q40ide_ata_input_data;
+                hwif->ata_output_data    = q40ide_ata_output_data;
+
                 idx[i] = hwif->index;
         }
     }