pata_cmd64x: suspend/resume
PATCH 1/1 pata_cmd64x: suspend/resume
On a resume of the CMD64x we must restore MRDMODE and latency if the BIOS didn't get them right originally.
Signed-off-by Alan Cox <[email protected]>
drivers/ata/pata_cmd64x.c +20 -2
@@ -31,7 +31,7 @@#include <linux/libata.h> #define DRV_NAME "pata_cmd64x" -#define DRV_VERSION "0.2.1" +#define DRV_VERSION "0.2.2"/* * CMD64x specific registers definition.
@@ -276,6 +276,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 cmd64x_port_ops = {
@@ -468,6 +470,20 @@return ata_pci_init_one (pdev, port_info,2 ); } +static int cmd64x_reinit_one (struct pci_dev *pdev) +{ +u8 mrdmode; +pci_write_config_byte (pdev,PCI_LATENCY_TIMER ,64 ); +pci_read_config_byte (pdev,MRDMODE , &mrdmode); + mrdmode &= ~0x30 ;/* IRQ set up */ + mrdmode |=0x02 ;/* Memory read line enable */ +pci_write_config_byte (pdev,MRDMODE , mrdmode); +#ifdef CONFIG_PPC +pci_write_config_byte (pdev,UDIDETCR0 ,0xF0 ); +#endif +return ata_pci_device_resume (pdev); +} +static const struct pci_device_id cmd64x[] = { {PCI_VDEVICE (CMD ,PCI_DEVICE_ID_CMD_643 ),0 }, {PCI_VDEVICE (CMD ,PCI_DEVICE_ID_CMD_646 ),1 },
@@ -481,7 +497,9 @@ .name = DRV_NAME, .id_table = cmd64x, .probe = cmd64x_init_one, - .remove = ata_pci_remove_one + .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = cmd64x_reinit_one, };static int __init cmd64x_init (void )