hpt36x: Suspend/resume support
PATCH 1/1 hpt36x: Suspend/resume support
Another chipset which needs some reconfiguration after a resume. All the chip setup is moved to a new function called in both setup and resume.
Signed-off-by Alan Cox <[email protected]>
drivers/ata/pata_hpt366.c +35 -14
@@ -27,7 +27,7 @@#include <linux/libata.h> #define DRV_NAME "pata_hpt366" -#define DRV_VERSION "0.5.1" +#define DRV_VERSION "0.5.3"struct hpt_clock {u8 xfer_speed;
@@ -338,6 +338,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, };/*
@@ -380,6 +382,27 @@ };/** +* hpt36x_init_chipset - common chip setup +* @dev: PCI device +* +* Perform the chip setup work that must be done at both init and +* resume time +*/ + +static void hpt36x_init_chipset (struct pci_dev *dev) +{ +u8 drive_fast; +pci_write_config_byte (dev,PCI_CACHE_LINE_SIZE , (L1_CACHE_BYTES /4 )); +pci_write_config_byte (dev,PCI_LATENCY_TIMER ,0x78 ); +pci_write_config_byte (dev,PCI_MIN_GNT ,0x08 ); +pci_write_config_byte (dev,PCI_MAX_LAT ,0x08 ); + +pci_read_config_byte (dev,0x51 , &drive_fast); +if (drive_fast &0x80 ) +pci_write_config_byte (dev,0x51 , drive_fast & ~0x80 ); +} + +/** * hpt36x_init_one - Initialise an HPT366/368 * @dev: PCI device * @id: Entry in match table
@@ -414,7 +437,6 @@u32 class_rev;u32 reg1; -u8 drive_fast;pci_read_config_dword (dev,PCI_CLASS_REVISION , &class_rev); class_rev &=0xFF ;
@@ -424,14 +446,7 @@if (class_rev >2 )return -ENODEV ; -pci_write_config_byte (dev,PCI_CACHE_LINE_SIZE , (L1_CACHE_BYTES /4 )); -pci_write_config_byte (dev,PCI_LATENCY_TIMER ,0x78 ); -pci_write_config_byte (dev,PCI_MIN_GNT ,0x08 ); -pci_write_config_byte (dev,PCI_MAX_LAT ,0x08 ); - -pci_read_config_byte (dev,0x51 , &drive_fast); -if (drive_fast &0x80 ) -pci_write_config_byte (dev,0x51 , drive_fast & ~0x80 ); +hpt36x_init_chipset (dev);pci_read_config_dword (dev,0x40 , ®1);
@@ -452,9 +467,15 @@return ata_pci_init_one (dev, port_info,2 ); } +static int hpt36x_reinit_one (struct pci_dev *dev) +{ +hpt36x_init_chipset (dev); +return ata_pci_device_resume (dev); +} + +static const struct pci_device_id hpt36x[] = { {PCI_VDEVICE (TTI ,PCI_DEVICE_ID_TTI_HPT366 ), }, - { }, };
@@ -462,7 +483,9 @@ .name = DRV_NAME, .id_table = hpt36x, .probe = hpt36x_init_one, - .remove = ata_pci_remove_one + .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = hpt36x_reinit_one, };static int __init hpt36x_init (void )
@@ -470,13 +493,11 @@return pci_register_driver (&hpt36x_pci_driver); } - static void __exit hpt36x_exit(void) {pci_unregister_driver (&hpt36x_pci_driver); } -MODULE_AUTHOR ("Alan Cox" );MODULE_DESCRIPTION ("low-level driver for the Highpoint HPT366/368" );MODULE_LICENSE ("GPL" );