|
@@ -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.
|
|
@@ -277,6 +277,8 @@ static struct scsi_host_template cmd64x_sht = {
|
|
|
.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 cmd64x_port_ops = {
|
|
@@ -469,6 +471,20 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
|
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 },
|
|
@@ -482,7 +498,9 @@ static struct pci_driver cmd64x_pci_driver = {
|
|
|
.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)
|