aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan <alan@lxorguk.ukuu.org.uk>2006-11-22 11:59:07 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-01 22:46:52 -0500
commit7f72a379146913dc5f2751383722cdedb8998bc9 (patch)
tree4068fa874406dba6d6f6f253f52ba0de5513715a
parent8501120f1df1aa6abe38b51ab91df08ccaa1b971 (diff)
[PATCH] 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 <alan@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/ata/pata_cmd64x.c22
1 files changed, 20 insertions, 2 deletions
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index 29a60df465da..3376f3f4bad9 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -31,7 +31,7 @@
31#include <linux/libata.h> 31#include <linux/libata.h>
32 32
33#define DRV_NAME "pata_cmd64x" 33#define DRV_NAME "pata_cmd64x"
34#define DRV_VERSION "0.2.1" 34#define DRV_VERSION "0.2.2"
35 35
36/* 36/*
37 * CMD64x specific registers definition. 37 * CMD64x specific registers definition.
@@ -277,6 +277,8 @@ static struct scsi_host_template cmd64x_sht = {
277 .slave_configure = ata_scsi_slave_config, 277 .slave_configure = ata_scsi_slave_config,
278 .slave_destroy = ata_scsi_slave_destroy, 278 .slave_destroy = ata_scsi_slave_destroy,
279 .bios_param = ata_std_bios_param, 279 .bios_param = ata_std_bios_param,
280 .resume = ata_scsi_device_resume,
281 .suspend = ata_scsi_device_suspend,
280}; 282};
281 283
282static struct ata_port_operations cmd64x_port_ops = { 284static struct ata_port_operations cmd64x_port_ops = {
@@ -469,6 +471,20 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
469 return ata_pci_init_one(pdev, port_info, 2); 471 return ata_pci_init_one(pdev, port_info, 2);
470} 472}
471 473
474static int cmd64x_reinit_one(struct pci_dev *pdev)
475{
476 u8 mrdmode;
477 pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 64);
478 pci_read_config_byte(pdev, MRDMODE, &mrdmode);
479 mrdmode &= ~ 0x30; /* IRQ set up */
480 mrdmode |= 0x02; /* Memory read line enable */
481 pci_write_config_byte(pdev, MRDMODE, mrdmode);
482#ifdef CONFIG_PPC
483 pci_write_config_byte(pdev, UDIDETCR0, 0xF0);
484#endif
485 return ata_pci_device_resume(pdev);
486}
487
472static const struct pci_device_id cmd64x[] = { 488static const struct pci_device_id cmd64x[] = {
473 { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_643), 0 }, 489 { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_643), 0 },
474 { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_646), 1 }, 490 { PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_646), 1 },
@@ -482,7 +498,9 @@ static struct pci_driver cmd64x_pci_driver = {
482 .name = DRV_NAME, 498 .name = DRV_NAME,
483 .id_table = cmd64x, 499 .id_table = cmd64x,
484 .probe = cmd64x_init_one, 500 .probe = cmd64x_init_one,
485 .remove = ata_pci_remove_one 501 .remove = ata_pci_remove_one,
502 .suspend = ata_pci_device_suspend,
503 .resume = cmd64x_reinit_one,
486}; 504};
487 505
488static int __init cmd64x_init(void) 506static int __init cmd64x_init(void)