Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / ata / pata_rz1000.c

diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index eccc6fd45032b4992091d74ddb2a608640186bea..71a2bac09e0d90ee7638d9ecc129d7ef1141b5d7 100644 (file)
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -21,7 +21,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "pata_rz1000"
-#define DRV_VERSION    "0.2.2"
+#define DRV_VERSION    "0.2.3"
 
 
 /**
@@ -52,19 +52,20 @@ static void rz1000_error_handler(struct ata_port *ap)
 /**
  *     rz1000_set_mode         -       mode setting function
  *     @ap: ATA interface
+ *     @unused: returned device on set_mode failure
  *
  *     Use a non standard set_mode function. We don't want to be tuned. We
  *     would prefer to be BIOS generic but for the fact our hardware is
  *     whacked out.
  */
 
-static void rz1000_set_mode(struct ata_port *ap)
+static int rz1000_set_mode(struct ata_port *ap, struct ata_device **unused)
 {
        int i;
 
        for (i = 0; i < ATA_MAX_DEVICES; i++) {
                struct ata_device *dev = &ap->device[i];
-               if (ata_dev_enabled(dev)) {
+               if (ata_dev_ready(dev)) {
                        /* We don't really care */
                        dev->pio_mode = XFER_PIO_0;
                        dev->xfer_mode = XFER_PIO_0;
@@ -72,6 +73,7 @@ static void rz1000_set_mode(struct ata_port *ap)
                        dev->flags |= ATA_DFLAG_PIO;
                }
        }
+       return 0;
 }
 
 
@@ -83,14 +85,16 @@ static struct scsi_host_template rz1000_sht = {
        .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,
+       .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
+       .resume                 = ata_scsi_device_resume,
+       .suspend                = ata_scsi_device_suspend,
 };
 
 static struct ata_port_operations rz1000_port_ops = {
@@ -103,8 +107,6 @@ static struct ata_port_operations rz1000_port_ops = {
        .exec_command   = ata_exec_command,
        .dev_select     = ata_std_dev_select,
 
-       .error_handler  = rz1000_error_handler,
-
        .bmdma_setup    = ata_bmdma_setup,
        .bmdma_start    = ata_bmdma_start,
        .bmdma_stop     = ata_bmdma_stop,
@@ -113,7 +115,7 @@ static struct ata_port_operations rz1000_port_ops = {
        .qc_prep        = ata_qc_prep,
        .qc_issue       = ata_qc_issue_prot,
 
-       .data_xfer      = ata_pio_data_xfer,
+       .data_xfer      = ata_data_xfer,
 
        .freeze         = ata_bmdma_freeze,
        .thaw           = ata_bmdma_thaw,
@@ -122,12 +124,25 @@ static struct ata_port_operations rz1000_port_ops = {
 
        .irq_handler    = ata_interrupt,
        .irq_clear      = ata_bmdma_irq_clear,
+       .irq_on         = ata_irq_on,
+       .irq_ack        = ata_irq_ack,
 
        .port_start     = ata_port_start,
-       .port_stop      = ata_port_stop,
-       .host_stop      = ata_host_stop
 };
 
+static int rz1000_fifo_disable(struct pci_dev *pdev)
+{
+       u16 reg;
+       /* Be exceptionally paranoid as we must be sure to apply the fix */
+       if (pci_read_config_word(pdev, 0x40, &reg) != 0)
+               return -1;
+       reg &= 0xDFFF;
+       if (pci_write_config_word(pdev, 0x40, reg) != 0)
+               return -1;
+       printk(KERN_INFO DRV_NAME ": disabled chipset readahead.\n");
+       return 0;
+}
+
 /**
  *     rz1000_init_one - Register RZ1000 ATA PCI device with kernel services
  *     @pdev: PCI device to register
@@ -142,7 +157,6 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en
 {
        static int printed_version;
        struct ata_port_info *port_info[2];
-       u16 reg;
        static struct ata_port_info info = {
                .sht = &rz1000_sht,
                .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
@@ -153,37 +167,41 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en
        if (!printed_version++)
                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
 
-       /* Be exceptionally paranoid as we must be sure to apply the fix */
-       if (pci_read_config_word(pdev, 0x40, &reg) != 0)
-               goto fail;
-       reg &= 0xDFFF;
-       if (pci_write_config_word(pdev, 0x40, reg) != 0)
-               goto fail;
-       printk(KERN_INFO DRV_NAME ": disabled chipset readahead.\n");
-
-       port_info[0] = &info;
-       port_info[1] = &info;
-       return ata_pci_init_one(pdev, port_info, 2);
-fail:
+       if (rz1000_fifo_disable(pdev) == 0) {
+               port_info[0] = &info;
+               port_info[1] = &info;
+               return ata_pci_init_one(pdev, port_info, 2);
+       }
        printk(KERN_ERR DRV_NAME ": failed to disable read-ahead on chipset..\n");
        /* Not safe to use so skip */
        return -ENODEV;
 }
 
-static struct pci_device_id pata_rz1000[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1000), },
-       { PCI_DEVICE(PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1001), },
-       { 0, },
+static int rz1000_reinit_one(struct pci_dev *pdev)
+{
+       /* If this fails on resume (which is a "cant happen" case), we
+          must stop as any progress risks data loss */
+       if (rz1000_fifo_disable(pdev))
+               panic("rz1000 fifo");
+       return ata_pci_device_resume(pdev);
+}
+
+static const struct pci_device_id pata_rz1000[] = {
+       { PCI_VDEVICE(PCTECH, PCI_DEVICE_ID_PCTECH_RZ1000), },
+       { PCI_VDEVICE(PCTECH, PCI_DEVICE_ID_PCTECH_RZ1001), },
+
+       { },
 };
 
 static struct pci_driver rz1000_pci_driver = {
-        .name          = DRV_NAME,
+       .name           = DRV_NAME,
        .id_table       = pata_rz1000,
        .probe          = rz1000_init_one,
-       .remove         = ata_pci_remove_one
+       .remove         = ata_pci_remove_one,
+       .suspend        = ata_pci_device_suspend,
+       .resume         = rz1000_reinit_one,
 };
 
-
 static int __init rz1000_init(void)
 {
        return pci_register_driver(&rz1000_pci_driver);