The patch titled
pata_serverworks suspend/resume
has been added to the -mm tree. Its filename is
pata_serverworks-suspend-resume.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pata_serverworks suspend/resume
From: Alan Cox <alan@xxxxxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ata/pata_serverworks.c | 32 +++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff -puN drivers/ata/pata_serverworks.c~pata_serverworks-suspend-resume drivers/ata/pata_serverworks.c
--- a/drivers/ata/pata_serverworks.c~pata_serverworks-suspend-resume
+++ a/drivers/ata/pata_serverworks.c
@@ -41,7 +41,7 @@
#include <linux/libata.h>
#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_CSB6_REVISION 0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
@@ -326,6 +326,8 @@ static struct scsi_host_template serverw
.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 serverworks_osb4_port_ops = {
@@ -553,6 +555,30 @@ static int serverworks_init_one(struct p
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[] = {
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE), 0},
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE), 2},
@@ -567,7 +593,9 @@ static struct pci_driver serverworks_pci
.name = DRV_NAME,
.id_table = serverworks,
.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)
_
Patches currently in -mm which might be from alan@xxxxxxxxxx are
git-libata-all.patch
pata_hpt366-more-enable-bits.patch
pci-move-pci_vdevice-from-libata-to-core.patch
pata-libata-suspend-resume-simple-cases.patch
pata-libata-suspend-resume-simple-cases-fix.patch
pata_cmd64x-suspend-resume.patch
pata_cs5520-resume-support.patch
pata_jmicron-fix-jmb368-support-add-suspend-resume.patch
pata_cs5530-suspend-resume-support.patch
pata_cs5530-suspend-resume-support-tweak.patch
pata_rz1000-force-readahead-off-on-resume.patch
pata_ali-suspend-resume-support.patch
pata_sil680-suspend-resume.patch
pata_sil680-suspend-resume-tidy.patch
pata_it821x-suspend-resume-support.patch
pata_serverworks-suspend-resume.patch
pata_via-suspend-resume-support.patch
pata_amd-suspend-resume.patch
hpt36x-suspend-resume-support.patch
pata_hpt3x3-suspend-resume-support.patch
pata-more-drivers-that-need-only-standard-suspend-and.patch
pata_marvell-merge-mandriva-patches.patch
git-mtd.patch
git-netdev-all.patch
resend-iphase-64bit-cleanup.patch
pci-introduce-pci_find_present.patch
pci-fix-multiple-problems-with-via-hardware.patch
pci-fix-multiple-problems-with-via-hardware-warning-fix.patch
pci_module_init-convertion-in-tmscsimc.patch
x86_64-smpboot-remove-unused-variable.patch
alpha-switch-to-pci_get-api.patch
ioremap-balanced-with-iounmap-for-drivers-char-rio-rio_linuxc.patch
ioremap-balanced-with-iounmap-for-drivers-char-moxac.patch
ioremap-balanced-with-iounmap-for-drivers-char-istallionc.patch
ide-complete-switch-to-pci_get.patch
remove-drivers-pci-searchcpci_find_device_reverse.patch
via82cxxx-handle-error-condition-properly.patch
hz-300hz-support.patch
tty-signal-tty-locking.patch
tty-signal-tty-locking-3270-fix.patch
pci-mxser-pci-refcounts.patch
tty-preparatory-structures-for-termios-revamp.patch
tty-preparatory-structures-for-termios-revamp-strip-fix.patch
tty-switch-to-ktermios-and-new-framework.patch
tty-switch-to-ktermios-and-new-framework-warning-fix.patch
tty-switch-to-ktermios-and-new-framework-irda-fix.patch
tty-switch-to-ktermios.patch
tty-switch-to-ktermios-nozomi-fix.patch
tty-switch-to-ktermios-sclp-fix.patch
tty-switch-to-ktermios-powerpc-fix.patch
tty-switch-to-ktermios-uml-fix-2.patch
tty_ioctl-use-termios-for-the-old-structure-and-termios2.patch
tty_ioctl-use-termios-for-the-old-structure-and-termios2-fix.patch
tty_ioctl-use-termios-for-the-old-structure-and-termios2-update.patch
termios-enable-new-style-termios-ioctls-on-x86-64.patch
char-isicom-expand-function.patch
char-isicom-rename-init-function.patch
char-isicom-remove-isa-code.patch
char-isicom-remove-unneeded-memset.patch
char-isicom-move-to-tty_register_device.patch
char-isicom-use-pci_request_region.patch
char-isicom-check-kmalloc-retval.patch
drivers-isdn-trivial-vsnprintf-conversion.patch
ide-more-conversion-to-pci_get-apis.patch
igafb-switch-to-pci_get-api.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
