[PATCH] 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 <alan@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
7f72a37914
commit
38e0d56e67
1 changed files with 30 additions and 2 deletions
|
@ -41,7 +41,7 @@
|
||||||
#include <linux/libata.h>
|
#include <linux/libata.h>
|
||||||
|
|
||||||
#define DRV_NAME "pata_serverworks"
|
#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_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) */
|
#define SVWKS_CSB6_REVISION 0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
|
||||||
|
@ -327,6 +327,8 @@ static struct scsi_host_template serverworks_sht = {
|
||||||
.slave_configure = ata_scsi_slave_config,
|
.slave_configure = ata_scsi_slave_config,
|
||||||
.slave_destroy = ata_scsi_slave_destroy,
|
.slave_destroy = ata_scsi_slave_destroy,
|
||||||
.bios_param = ata_std_bios_param,
|
.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 = {
|
static struct ata_port_operations serverworks_osb4_port_ops = {
|
||||||
|
@ -554,6 +556,30 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
|
||||||
return ata_pci_init_one(pdev, port_info, ports);
|
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[] = {
|
static const struct pci_device_id serverworks[] = {
|
||||||
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE), 0},
|
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE), 0},
|
||||||
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE), 2},
|
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE), 2},
|
||||||
|
@ -568,7 +594,9 @@ static struct pci_driver serverworks_pci_driver = {
|
||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
.id_table = serverworks,
|
.id_table = serverworks,
|
||||||
.probe = serverworks_init_one,
|
.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)
|
static int __init serverworks_init(void)
|
||||||
|
|
Loading…
Add table
Reference in a new issue