3 files changed, 314 insertions, 0 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 03f6338acc8f..b38e2c325ea7 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -483,6 +483,13 @@ config PATA_WINBOND
 
           If unsure, say N.
 
+config PATA_WINBOND_VLB
+        tristate "Winbond W83759A VLB PATA support (Experimental)"
+        depends on ISA && EXPERIMENTAL
+        help
+          Support for the Winbond W83759A controller on Vesa Local Bus
+          systems.
+
 endif
 endmenu
 
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 72243a677f9b..ff6c6db22baf 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -51,6 +51,7 @@ obj-$(CONFIG_PATA_SERVERWORKS)	+= pata_serverworks.o
 obj-$(CONFIG_PATA_SIL680)       += pata_sil680.o
 obj-$(CONFIG_PATA_VIA)          += pata_via.o
 obj-$(CONFIG_PATA_WINBOND)      += pata_sl82c105.o
+obj-$(CONFIG_PATA_WINBOND_VLB)  += pata_winbond.o
 obj-$(CONFIG_PATA_SIS)          += pata_sis.o
 obj-$(CONFIG_PATA_TRIFLEX)      += pata_triflex.o
 # Should be last but one libata driver
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
new file mode 100644
index 000000000000..48941d0757e9
--- /dev/null
+++ b/drivers/ata/pata_winbond.c
@@ -0,0 +1,306 @@
+/*
+ *    pata_winbond.c - Winbond VLB ATA controllers
+ *      (C) 2006 Red Hat <alan@redhat.com>
+ *
+ *    Support for the Winbond 83759A when operating in advanced mode.
+ *    Multichip mode is not currently supported.
+ */
+ 
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/blkdev.h>
+#include <linux/delay.h>
+#include <scsi/scsi_host.h>
+#include <linux/libata.h>
+#include <linux/platform_device.h>
+
+#define DRV_NAME "pata_winbond"
+#define DRV_VERSION "0.0.1"
+
+#define NR_HOST 4       /* Two winbond controllers, two channels each */
+
+struct winbond_data {
+        unsigned long config;
+        struct platform_device *platform_dev;
+};
+
+static struct ata_host *winbond_host[NR_HOST];
+static struct winbond_data winbond_data[NR_HOST];
+static int nr_winbond_host;
+
+#ifdef MODULE
+static int probe_winbond = 1;
+#else
+static int probe_winbond;
+#endif
+
+static spinlock_t winbond_lock = SPIN_LOCK_UNLOCKED;
+
+static void winbond_writecfg(unsigned long port, u8 reg, u8 val)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&winbond_lock, flags);
+        outb(reg, port + 0x01);
+        outb(val, port + 0x02);
+        spin_unlock_irqrestore(&winbond_lock, flags);
+}
+
+static u8 winbond_readcfg(unsigned long port, u8 reg)
+{
+        u8 val;
+
+        unsigned long flags;
+        spin_lock_irqsave(&winbond_lock, flags);
+        outb(reg, port + 0x01);
+        val = inb(port + 0x02);
+        spin_unlock_irqrestore(&winbond_lock, flags);
+
+        return val;
+}
+
+static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
+{
+        struct ata_timing t;
+        struct winbond_data *winbond = ap->host->private_data;
+        int active, recovery;
+        u8 reg;
+        int timing = 0x88 + (ap->port_no * 4) + (adev->devno * 2);
+
+        reg = winbond_readcfg(winbond->config, 0x81);
+        
+        /* Get the timing data in cycles */
+        if (reg & 0x40)         /* Fast VLB bus, assume 50MHz */
+                ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000);
+        else
+                ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
+
+        active = (FIT(t.active, 3, 17) - 1) & 0x0F;
+        recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F;
+        timing = (active << 4) | recovery;
+        winbond_writecfg(winbond->config, timing, reg);
+        
+        /* Load the setup timing */
+        
+        reg = 0x35;
+        if (adev->class != ATA_DEV_ATA)
+                reg |= 0x08;    /* FIFO off */
+        if (!ata_pio_need_iordy(adev))
+                reg |= 0x02;    /* IORDY off */
+        reg |= (FIT(t.setup, 0, 3) << 6);
+        winbond_writecfg(winbond->config, timing + 1, reg);
+}
+
+
+static void winbond_data_xfer(struct ata_device *adev, unsigned char *buf, unsigned int buflen, int write_data)
+{
+        struct ata_port *ap = adev->ap;
+        int slop = buflen & 3;
+
+        if (ata_id_has_dword_io(adev->id)) {
+                if (write_data)
+                        outsl(ap->ioaddr.data_addr, buf, buflen >> 2);
+                else
+                        insl(ap->ioaddr.data_addr, buf, buflen >> 2);
+
+                if (unlikely(slop)) {
+                        u32 pad;
+                        if (write_data) {
+                                memcpy(&pad, buf + buflen - slop, slop);
+                                outl(le32_to_cpu(pad), ap->ioaddr.data_addr);
+                        } else {
+                                pad = cpu_to_le16(inl(ap->ioaddr.data_addr));
+                                memcpy(buf + buflen - slop, &pad, slop);
+                        }
+                }
+        } else
+                ata_pio_data_xfer(adev, buf, buflen, write_data);
+}
+
+static struct scsi_host_template winbond_sht = {
+        .module                 = THIS_MODULE,
+        .name                   = DRV_NAME,
+        .ioctl                  = ata_scsi_ioctl,
+        .queuecommand           = ata_scsi_queuecmd,
+        .can_queue              = ATA_DEF_QUEUE,
+        .this_id                = ATA_SHT_THIS_ID,
+        .sg_tablesize           = LIBATA_MAX_PRD,
+        .max_sectors            = ATA_MAX_SECTORS,
+        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
+        .emulated               = ATA_SHT_EMULATED,
+        .use_clustering         = ATA_SHT_USE_CLUSTERING,
+        .proc_name              = DRV_NAME,
+        .dma_boundary           = ATA_DMA_BOUNDARY,
+        .slave_configure        = ata_scsi_slave_config,
+        .bios_param             = ata_std_bios_param,
+};
+
+static struct ata_port_operations winbond_port_ops = {
+        .port_disable   = ata_port_disable,
+        .set_piomode    = winbond_set_piomode,
+
+        .tf_load        = ata_tf_load,
+        .tf_read        = ata_tf_read,
+        .check_status   = ata_check_status,
+        .exec_command   = ata_exec_command,
+        .dev_select     = ata_std_dev_select,
+
+        .freeze         = ata_bmdma_freeze,
+        .thaw           = ata_bmdma_thaw,
+        .error_handler  = ata_bmdma_error_handler,
+        .post_internal_cmd = ata_bmdma_post_internal_cmd,
+
+        .qc_prep        = ata_qc_prep,
+        .qc_issue       = ata_qc_issue_prot,
+
+        .data_xfer      = winbond_data_xfer,
+
+        .irq_handler    = ata_interrupt,
+        .irq_clear      = ata_bmdma_irq_clear,
+
+        .port_start     = ata_port_start,
+        .port_stop      = ata_port_stop,
+        .host_stop      = ata_host_stop
+};
+
+/**
+ *      winbond_init_one                -       attach a winbond interface
+ *      @type: Type to display
+ *      @io: I/O port start
+ *      @irq: interrupt line
+ *      @fast: True if on a > 33Mhz VLB
+ *
+ *      Register a VLB bus IDE interface. Such interfaces are PIO and we
+ *      assume do not support IRQ sharing.
+ */
+
+static __init int winbond_init_one(unsigned long port)
+{
+        struct ata_probe_ent ae;
+        struct platform_device *pdev;
+        int ret;
+        u8 reg;
+        int i;
+
+        reg = winbond_readcfg(port, 0x81);
+        reg |= 0x80;    /* jumpered mode off */
+        winbond_writecfg(port, 0x81, reg);
+        reg = winbond_readcfg(port, 0x83);
+        reg |= 0xF0;    /* local control */
+        winbond_writecfg(port, 0x83, reg);
+        reg = winbond_readcfg(port, 0x85);
+        reg |= 0xF0;    /* programmable timing */
+        winbond_writecfg(port, 0x85, reg);
+
+        reg = winbond_readcfg(port, 0x81);
+        
+        if (!(reg & 0x03))              /* Disabled */
+                return 0;
+
+        for (i = 0; i < 2 ; i ++) {
+
+                if (reg & (1 << i)) {           
+                        /*
+                         *      Fill in a probe structure first of all
+                         */
+
+                        pdev = platform_device_register_simple(DRV_NAME, nr_winbond_host, NULL, 0);
+                        if (pdev == NULL)
+                                return -ENOMEM;
+
+                        memset(&ae, 0, sizeof(struct ata_probe_ent));
+                        INIT_LIST_HEAD(&ae.node);
+                        ae.dev = &pdev->dev;
+
+                        ae.port_ops = &winbond_port_ops;
+                        ae.pio_mask = 0x1F;
+
+                        ae.sht = &winbond_sht;
+        
+                        ae.n_ports = 1;
+                        ae.irq = 14 + i;
+                        ae.irq_flags = 0;
+                        ae.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;
+                        ae.port[0].cmd_addr = 0x1F0 - (0x80 * i);
+                        ae.port[0].altstatus_addr = ae.port[0].cmd_addr + 0x0206;
+                        ae.port[0].ctl_addr = ae.port[0].altstatus_addr;
+                        ata_std_ports(&ae.port[0]);
+                        /*
+                         *      Hook in a private data structure per channel
+                         */
+                        ae.private_data = &winbond_data[nr_winbond_host];
+                        winbond_data[nr_winbond_host].config = port;
+                        winbond_data[nr_winbond_host].platform_dev = pdev;
+
+                        ret = ata_device_add(&ae);
+                        if (ret == 0) {
+                                platform_device_unregister(pdev);
+                                return -ENODEV;
+                        }
+                        winbond_host[nr_winbond_host++] = dev_get_drvdata(&pdev->dev);
+                }
+        }
+
+        return 0;
+}
+
+/**
+ *      winbond_init            -       attach winbond interfaces
+ *
+ *      Attach winbond IDE interfaces by scanning the ports it may occupy.
+ */
+
+static __init int winbond_init(void)
+{
+        static const unsigned long config[2] = { 0x130, 0x1B0 };
+
+        int ct = 0;
+        int i;
+        
+        if (probe_winbond == 0)
+                return -ENODEV;
+
+        /*
+         *      Check both base addresses
+         */
+
+        for (i = 0; i < 2; i++) {
+                if (probe_winbond & (1<<i)) {
+                        int ret = 0;
+                        unsigned long port = config[i];
+
+                        if (request_region(port, 2, "pata_winbond")) {
+                                ret = winbond_init_one(port);
+                                if(ret <= 0)
+                                        release_region(port, 2);
+                                else ct+= ret;
+                        }
+                }
+        }
+        if (ct != 0)
+                return 0;
+        return -ENODEV;
+}
+
+static __exit void winbond_exit(void)
+{
+        int i;
+
+        for (i = 0; i < nr_winbond_host; i++) {
+                ata_host_remove(winbond_host[i]);
+                release_region(winbond_data[i].config, 2);
+                platform_device_unregister(winbond_data[i].platform_dev);
+        }
+}
+
+MODULE_AUTHOR("Alan Cox");
+MODULE_DESCRIPTION("low-level driver for Winbond VL ATA");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+module_init(winbond_init);
+module_exit(winbond_exit);
+
+module_param(probe_winbond, int, 0);
+