: pata_serverworks suspend/resume
PATCH 1/1 : pata_serverworks suspend/resume
The Serverworks chips need various fixups doing on a resume from RAM. Conveniently the needed functions were already split out ready for re-use
Signed-off-by Alan Cox <[email protected]>
drivers/ata/pata_serverworks.c +30 -2
@@ -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) */
@@ -326,6 +326,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .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 = {
@@ -553,6 +555,30 @@return ata_pci_init_one (pdev, port_info, ports); } +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 },
@@ -567,7 +593,9 @@ .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 )