projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[package] iwinfo: factor txpower offset into info display output, recompile if driver...
[openwrt.git] / target / linux / adm5120 / files / drivers / ata / pata_rb153_cf.c
diff --git a/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c b/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c
index 7dd6977..f5cae63 100644 (file)
--- a/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c
+++ b/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c
@@ -2,7 +2,7 @@
  *  A low-level PATA driver to handle a Compact Flash connected on the
  *  Mikrotik's RouterBoard 153 board.
  *
  *  A low-level PATA driver to handle a Compact Flash connected on the
  *  Mikrotik's RouterBoard 153 board.
  *
- *  Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org>
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
  *
  *  This file was based on: drivers/ata/pata_ixp4xx_cf.c
  *     Copyright (C) 2006-07 Tower Technologies
  *
  *  This file was based on: drivers/ata/pata_ixp4xx_cf.c
  *     Copyright (C) 2006-07 Tower Technologies
@@ -20,19 +20,17 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/platform_device.h>
-
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
 
 #include <linux/libata.h>
 #include <scsi/scsi_host.h>
 
 
 #include <linux/libata.h>
 #include <scsi/scsi_host.h>
 
-#include <asm/gpio.h>
-
 #define DRV_NAME       "pata-rb153-cf"
 #define DRV_NAME       "pata-rb153-cf"
-#define DRV_VERSION    "0.4.0"
+#define DRV_VERSION    "0.5.0"
 #define DRV_DESC       "PATA driver for RouterBOARD 153 Compact Flash"
 
 #define RB153_CF_MAXPORTS      1
 #define DRV_DESC       "PATA driver for RouterBOARD 153 Compact Flash"
 
 #define RB153_CF_MAXPORTS      1
@@ -43,45 +41,50 @@
 #define RB153_CF_REG_DATA      0x0C00
 
 struct rb153_cf_info {
 #define RB153_CF_REG_DATA      0x0C00
 
 struct rb153_cf_info {
-       unsigned int    irq;
        void __iomem    *iobase;
        unsigned int    gpio_line;
        int             frozen;
        void __iomem    *iobase;
        unsigned int    gpio_line;
        int             frozen;
+       unsigned int    irq;
 };
 
 };
 
-/* ------------------------------------------------------------------------ */
-
 static inline void rb153_pata_finish_io(struct ata_port *ap)
 {
        struct rb153_cf_info *info = ap->host->private_data;
 
 static inline void rb153_pata_finish_io(struct ata_port *ap)
 {
        struct rb153_cf_info *info = ap->host->private_data;
 
-       ata_altstatus(ap);
+       /* FIXME: Keep previous delay. If this is merely a fence then
+        * ata_sff_sync might be sufficient. */
+       ata_sff_dma_pause(ap);
        ndelay(RB153_CF_IO_DELAY);
 
        set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
 }
 
 static void rb153_pata_exec_command(struct ata_port *ap,
        ndelay(RB153_CF_IO_DELAY);
 
        set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
 }
 
 static void rb153_pata_exec_command(struct ata_port *ap,
-                               const struct ata_taskfile *tf)
+                                       const struct ata_taskfile *tf)
 {
        writeb(tf->command, ap->ioaddr.command_addr);
        rb153_pata_finish_io(ap);
 }
 
 {
        writeb(tf->command, ap->ioaddr.command_addr);
        rb153_pata_finish_io(ap);
 }
 
-static void rb153_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
-                               unsigned int buflen, int write_data)
+static unsigned int rb153_pata_data_xfer(struct ata_device *adev,
+                                       unsigned char *buf,
+                                       unsigned int buflen,
+                                       int write_data)
 {
        void __iomem *ioaddr = adev->link->ap->ioaddr.data_addr;
 {
        void __iomem *ioaddr = adev->link->ap->ioaddr.data_addr;
+       unsigned int t;
 
 
+       t = buflen;
        if (write_data) {
        if (write_data) {
-               for (; buflen > 0; buflen--, buf++)
+               for (; t > 0; t--, buf++)
                        writeb(*buf, ioaddr);
        } else {
                        writeb(*buf, ioaddr);
        } else {
-               for (; buflen > 0; buflen--, buf++)
+               for (; t > 0; t--, buf++)
                        *buf = readb(ioaddr);
        }
 
        rb153_pata_finish_io(adev->link->ap);
                        *buf = readb(ioaddr);
        }
 
        rb153_pata_finish_io(adev->link->ap);
+       return buflen;
 }
 
 static void rb153_pata_freeze(struct ata_port *ap)
 }
 
 static void rb153_pata_freeze(struct ata_port *ap)
@@ -106,7 +109,7 @@ static irqreturn_t rb153_pata_irq_handler(int irq, void *dev_instance)
        if (gpio_get_value(info->gpio_line)) {
                set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW);
                if (!info->frozen)
        if (gpio_get_value(info->gpio_line)) {
                set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW);
                if (!info->frozen)
-                       ata_interrupt(irq, dev_instance);
+                       ata_sff_interrupt(irq, dev_instance);
        } else {
                set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
        }
        } else {
                set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
        }
@@ -114,76 +117,36 @@ static irqreturn_t rb153_pata_irq_handler(int irq, void *dev_instance)
        return IRQ_HANDLED;
 }
 
        return IRQ_HANDLED;
 }
 
-static void rb153_pata_irq_clear(struct ata_port *ap)
-{
-}
-
-static int rb153_pata_port_start(struct ata_port *ap)
-{
-       return 0;
-}
-
 static struct ata_port_operations rb153_pata_port_ops = {
 static struct ata_port_operations rb153_pata_port_ops = {
-       .tf_load                = ata_tf_load,
-       .tf_read                = ata_tf_read,
-
-       .exec_command           = rb153_pata_exec_command,
-       .check_status           = ata_check_status,
-       .dev_select             = ata_std_dev_select,
-
-       .data_xfer              = rb153_pata_data_xfer,
-
-       .qc_prep                = ata_qc_prep,
-       .qc_issue               = ata_qc_issue_prot,
-
+       .inherits               = &ata_sff_port_ops,
+       .sff_exec_command       = rb153_pata_exec_command,
+       .sff_data_xfer          = rb153_pata_data_xfer,
        .freeze                 = rb153_pata_freeze,
        .thaw                   = rb153_pata_thaw,
        .freeze                 = rb153_pata_freeze,
        .thaw                   = rb153_pata_thaw,
-       .error_handler          = ata_bmdma_error_handler,
-       .cable_detect           = ata_cable_40wire,
-
-       .irq_handler            = rb153_pata_irq_handler,
-       .irq_clear              = rb153_pata_irq_clear,
-       .irq_on                 = ata_irq_on,
-
-       .port_start             = rb153_pata_port_start,
 };
 
 };
 
-/* ------------------------------------------------------------------------ */
-
 static struct scsi_host_template rb153_pata_sht = {
 static struct scsi_host_template rb153_pata_sht = {
-       .module                 = THIS_MODULE,
-       .name                   = DRV_NAME,
-       .ioctl                  = ata_scsi_ioctl,
-       .queuecommand           = ata_scsi_queuecmd,
-       .slave_configure        = ata_scsi_slave_config,
-       .slave_destroy          = ata_scsi_slave_destroy,
-       .bios_param             = ata_std_bios_param,
-       .proc_name              = DRV_NAME,
-
-       .can_queue              = ATA_DEF_QUEUE,
-       .this_id                = ATA_SHT_THIS_ID,
-       .sg_tablesize           = LIBATA_MAX_PRD,
-       .dma_boundary           = ATA_DMA_BOUNDARY,
-       .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
-       .emulated               = ATA_SHT_EMULATED,
-       .use_clustering         = ATA_SHT_USE_CLUSTERING,
+       ATA_PIO_SHT(DRV_NAME),
 };
 
 };
 
-/* ------------------------------------------------------------------------ */
-
-static void rb153_pata_setup_port(struct ata_port *ap,
-                       struct rb153_cf_info *info, unsigned long raw_cmd)
+static void rb153_pata_setup_port(struct ata_host *ah)
 {
 {
+       struct rb153_cf_info *info = ah->private_data;
+       struct ata_port *ap;
+
+       ap = ah->ports[0];
+
+       ap->ops         = &rb153_pata_port_ops;
+       ap->pio_mask    = 0x1f; /* PIO4 */
+       ap->flags       = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;
+
        ap->ioaddr.cmd_addr     = info->iobase + RB153_CF_REG_CMD;
        ap->ioaddr.ctl_addr     = info->iobase + RB153_CF_REG_CTRL;
        ap->ioaddr.altstatus_addr = info->iobase + RB153_CF_REG_CTRL;
 
        ap->ioaddr.cmd_addr     = info->iobase + RB153_CF_REG_CMD;
        ap->ioaddr.ctl_addr     = info->iobase + RB153_CF_REG_CTRL;
        ap->ioaddr.altstatus_addr = info->iobase + RB153_CF_REG_CTRL;
 
-       ata_std_ports(&ap->ioaddr);
-
-       ap->ioaddr.data_addr    = info->iobase + RB153_CF_REG_DATA;
+       ata_sff_std_ports(&ap->ioaddr);
 
 
-       ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", raw_cmd,
-                               raw_cmd + RB153_CF_REG_CTRL);
+       ap->ioaddr.data_addr = info->iobase + RB153_CF_REG_DATA;
 }
 
 static __devinit int rb153_pata_driver_probe(struct platform_device *pdev)
 }
 
 static __devinit int rb153_pata_driver_probe(struct platform_device *pdev)
@@ -192,7 +155,6 @@ static __devinit int rb153_pata_driver_probe(struct platform_device *pdev)
        int gpio;
        struct resource *res;
        struct ata_host *ah;
        int gpio;
        struct resource *res;
        struct ata_host *ah;
-       struct ata_port *ap;
        struct rb153_cf_info *info;
        int ret;
 
        struct rb153_cf_info *info;
        int ret;
 
@@ -220,7 +182,6 @@ static __devinit int rb153_pata_driver_probe(struct platform_device *pdev)
                return ret;
        }
 
                return ret;
        }
 
-       /* allocate host */
        ah = ata_host_alloc(&pdev->dev, RB153_CF_MAXPORTS);
        if (!ah)
                return -ENOMEM;
        ah = ata_host_alloc(&pdev->dev, RB153_CF_MAXPORTS);
        if (!ah)
                return -ENOMEM;
@@ -247,13 +208,7 @@ static __devinit int rb153_pata_driver_probe(struct platform_device *pdev)
                goto err_free_gpio;
        }
 
                goto err_free_gpio;
        }
 
-       ap = ah->ports[0];
-
-       ap->ops         = &rb153_pata_port_ops;
-       ap->pio_mask    = 0x1f; /* PIO4 */
-       ap->flags       = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;
-
-       rb153_pata_setup_port(ap, info, res->start);
+       rb153_pata_setup_port(ah);
 
        ret = ata_host_activate(ah, irq, rb153_pata_irq_handler,
                                IRQF_TRIGGER_LOW, &rb153_pata_sht);
 
        ret = ata_host_activate(ah, irq, rb153_pata_irq_handler,
                                IRQF_TRIGGER_LOW, &rb153_pata_sht);
@@ -304,7 +259,7 @@ static void __exit rb153_pata_module_exit(void)
        platform_driver_unregister(&rb153_pata_platform_driver);
 }
 
        platform_driver_unregister(&rb153_pata_platform_driver);
 }
 
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
 MODULE_DESCRIPTION(DRV_DESC);
 MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION(DRV_DESC);
 MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL v2");
Personal OpenWRT clone
This page took 0.034829 seconds and 4 git commands to generate.