Merge branch 'master' into for_paulus

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

diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index a5c8d7e121d148ed992e25be28367d26dc02f92d..ad5b43fef3d1a94914d090fc88476ed100a0e2a1 100644 (file)
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_serverworks"
-#define DRV_VERSION "0.3.7"
+#define DRV_VERSION "0.3.9"
 
 #define SVWKS_CSB5_REVISION_NEW        0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
 #define SVWKS_CSB6_REVISION    0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
@@ -218,25 +218,18 @@ static unsigned long serverworks_osb4_filter(const struct ata_port *ap, struct a
 static unsigned long serverworks_csb_filter(const struct ata_port *ap, struct ata_device *adev, unsigned long mask)
 {
        const char *p;
-       char model_num[40];
-       int len, i;
+       char model_num[ATA_ID_PROD_LEN + 1];
+       int i;
 
        /* Disk, UDMA */
        if (adev->class != ATA_DEV_ATA)
                return ata_pci_default_filter(ap, adev, mask);
 
        /* Actually do need to check */
-       ata_id_string(adev->id, model_num, ATA_ID_PROD_OFS, sizeof(model_num));
-       /* Precuationary - why not do this in the libata core ?? */
+       ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
 
-       len = strlen(model_num);
-       while ((len > 0) && (model_num[len - 1] == ' ')) {
-               len--;
-               model_num[len] = 0;
-       }
-
-       for(i = 0; (p = csb_bad_ata100[i]) != NULL; i++) {
-               if (!strncmp(p, model_num, len))
+       for (i = 0; (p = csb_bad_ata100[i]) != NULL; i++) {
+               if (!strcmp(p, model_num))
                        mask &= ~(0x1F << ATA_SHIFT_UDMA);
        }
        return ata_pci_default_filter(ap, adev, mask);
@@ -318,14 +311,16 @@ static struct scsi_host_template serverworks_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 serverworks_osb4_port_ops = {
@@ -353,14 +348,14 @@ static struct ata_port_operations serverworks_osb4_port_ops = {
        .qc_prep        = ata_qc_prep,
        .qc_issue       = ata_qc_issue_prot,
 
-       .data_xfer      = ata_pio_data_xfer,
+       .data_xfer      = ata_data_xfer,
 
        .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 struct ata_port_operations serverworks_csb_port_ops = {
@@ -388,14 +383,14 @@ static struct ata_port_operations serverworks_csb_port_ops = {
        .qc_prep        = ata_qc_prep,
        .qc_issue       = ata_qc_issue_prot,
 
-       .data_xfer      = ata_pio_data_xfer,
+       .data_xfer      = ata_data_xfer,
 
        .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 serverworks_fixup_osb4(struct pci_dev *pdev)
@@ -553,20 +548,47 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
        return ata_pci_init_one(pdev, port_info, ports);
 }
 
-static struct pci_device_id serverworks[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE), 0},
-       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE), 2},
-       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE), 2},
-       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2), 2},
-       { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000IDE), 2},
-       { 0, },
+static int serverworks_reinit_one(struct pci_dev *pdev)
+{
+       /* Force master latency timer to 64 PCI clocks */
+       pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x40);
+
+       switch (pdev->device)
+       {
+               case PCI_DEVICE_ID_SERVERWORKS_OSB4IDE:
+                       serverworks_fixup_osb4(pdev);
+                       break;
+               case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE:
+                       ata_pci_clear_simplex(pdev);
+                       /* fall through */
+               case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE:
+               case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2:
+                       serverworks_fixup_csb(pdev);
+                       break;
+               case PCI_DEVICE_ID_SERVERWORKS_HT1000IDE:
+                       serverworks_fixup_ht1000(pdev);
+                       break;
+       }
+       return ata_pci_device_resume(pdev);
+}
+
+static const struct pci_device_id serverworks[] = {
+       { PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE), 0},
+       { PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE), 2},
+       { PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE), 2},
+       { PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2), 2},
+       { PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000IDE), 2},
+
+       { },
 };
 
 static struct pci_driver serverworks_pci_driver = {
        .name           = DRV_NAME,
        .id_table       = serverworks,
        .probe          = serverworks_init_one,
-       .remove         = ata_pci_remove_one
+       .remove         = ata_pci_remove_one,
+       .suspend        = ata_pci_device_suspend,
+       .resume         = serverworks_reinit_one,
 };
 
 static int __init serverworks_init(void)
@@ -574,13 +596,11 @@ static int __init serverworks_init(void)
        return pci_register_driver(&serverworks_pci_driver);
 }
 
-
 static void __exit serverworks_exit(void)
 {
        pci_unregister_driver(&serverworks_pci_driver);
 }
 
-
 MODULE_AUTHOR("Alan Cox");
 MODULE_DESCRIPTION("low-level driver for Serverworks OSB4/CSB5/CSB6");
 MODULE_LICENSE("GPL");