diff -uprN linux-2.6.12/drivers/scsi/ahci.c linux-2.6.12.patched/drivers/scsi/ahci.c --- linux-2.6.12/drivers/scsi/ahci.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/ahci.c 2005-06-19 10:25:04.000000000 +0200 @@ -202,6 +202,8 @@ static Scsi_Host_Template ahci_sht = { .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; static struct ata_port_operations ahci_ops = { @@ -273,6 +275,8 @@ static struct pci_driver ahci_pci_driver .id_table = ahci_pci_tbl, .probe = ahci_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; diff -uprN linux-2.6.12/drivers/scsi/ata_piix.c linux-2.6.12.patched/drivers/scsi/ata_piix.c --- linux-2.6.12/drivers/scsi/ata_piix.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/ata_piix.c 2005-06-19 10:25:04.000000000 +0200 @@ -104,6 +104,8 @@ static struct pci_driver piix_pci_driver .id_table = piix_pci_tbl, .probe = piix_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; static Scsi_Host_Template piix_sht = { @@ -124,6 +126,8 @@ static Scsi_Host_Template piix_sht = { .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; static struct ata_port_operations piix_pata_ops = { diff -uprN linux-2.6.12/drivers/scsi/libata-core.c linux-2.6.12.patched/drivers/scsi/libata-core.c --- linux-2.6.12/drivers/scsi/libata-core.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/libata-core.c 2005-06-19 10:25:04.000000000 +0200 @@ -3632,6 +3632,104 @@ err_out: * LOCKING: */ +/* + * Execute a 'simple' command, that only consists of the opcode 'cmd' itself, + * without filling any other registers + */ +static int ata_do_simple_cmd(struct ata_port *ap, struct ata_device *dev, + u8 cmd) +{ + DECLARE_COMPLETION(wait); + struct ata_queued_cmd *qc; + unsigned long flags; + int rc; + + qc = ata_qc_new_init(ap, dev); + BUG_ON(qc == NULL); + + qc->tf.command = cmd; + qc->tf.flags |= ATA_TFLAG_DEVICE; + qc->tf.protocol = ATA_PROT_NODATA; + + qc->waiting = &wait; + qc->complete_fn = ata_qc_complete_noop; + + spin_lock_irqsave(&ap->host_set->lock, flags); + rc = ata_qc_issue(qc); + spin_unlock_irqrestore(&ap->host_set->lock, flags); + + if (!rc) + wait_for_completion(&wait); + + return rc; +} + +static int ata_flush_cache(struct ata_port *ap, struct ata_device *dev) +{ + u8 cmd; + + if (!ata_try_flush_cache(dev)) + return 0; + + if (ata_id_has_flush_ext(dev->id)) + cmd = ATA_CMD_FLUSH_EXT; + else + cmd = ATA_CMD_FLUSH; + + return ata_do_simple_cmd(ap, dev, cmd); +} + +static int ata_standby_drive(struct ata_port *ap, struct ata_device *dev) +{ + return ata_do_simple_cmd(ap, dev, ATA_CMD_STANDBYNOW1); +} + +static int ata_start_drive(struct ata_port *ap, struct ata_device *dev) +{ + return ata_do_simple_cmd(ap, dev, ATA_CMD_IDLEIMMEDIATE); +} + +/** + * ata_device_resume - wakeup a previously suspended devices + * + * Kick the drive back into action, by sending it an idle immediate + * command and making sure its transfer mode matches between drive + * and host. + * + */ +int ata_device_resume(struct ata_port *ap, struct ata_device *dev) +{ + if (ap->flags & ATA_FLAG_SUSPENDED) { + ap->flags &= ~ATA_FLAG_SUSPENDED; + ata_set_mode(ap); + } + if (!ata_dev_present(dev)) + return 0; + if (dev->class == ATA_DEV_ATA) + ata_start_drive(ap, dev); + + return 0; +} + +/** + * ata_device_suspend - prepare a device for suspend + * + * Flush the cache on the drive, if appropriate, then issue a + * standbynow command. + * + */ +int ata_device_suspend(struct ata_port *ap, struct ata_device *dev) +{ + if (!ata_dev_present(dev)) + return 0; + if (dev->class == ATA_DEV_ATA) + ata_flush_cache(ap, dev); + + ata_standby_drive(ap, dev); + ap->flags |= ATA_FLAG_SUSPENDED; + return 0; +} + int ata_port_start (struct ata_port *ap) { struct device *dev = ap->host_set->dev; @@ -4337,6 +4435,23 @@ int pci_test_config_bits(struct pci_dev return (tmp == bits->val) ? 1 : 0; } + +int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state) +{ + pci_save_state(pdev); + pci_disable_device(pdev); + pci_set_power_state(pdev, PCI_D3hot); + return 0; +} + +int ata_pci_device_resume(struct pci_dev *pdev) +{ + pci_set_power_state(pdev, PCI_D0); + pci_restore_state(pdev); + pci_enable_device(pdev); + pci_set_master(pdev); + return 0; +} #endif /* CONFIG_PCI */ @@ -4413,4 +4528,11 @@ EXPORT_SYMBOL_GPL(pci_test_config_bits); EXPORT_SYMBOL_GPL(ata_pci_init_native_mode); EXPORT_SYMBOL_GPL(ata_pci_init_one); EXPORT_SYMBOL_GPL(ata_pci_remove_one); +EXPORT_SYMBOL_GPL(ata_pci_device_suspend); +EXPORT_SYMBOL_GPL(ata_pci_device_resume); #endif /* CONFIG_PCI */ + +EXPORT_SYMBOL_GPL(ata_device_suspend); +EXPORT_SYMBOL_GPL(ata_device_resume); +EXPORT_SYMBOL_GPL(ata_scsi_device_suspend); +EXPORT_SYMBOL_GPL(ata_scsi_device_resume); diff -uprN linux-2.6.12/drivers/scsi/libata-scsi.c linux-2.6.12.patched/drivers/scsi/libata-scsi.c --- linux-2.6.12/drivers/scsi/libata-scsi.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/libata-scsi.c 2005-06-19 10:25:04.000000000 +0200 @@ -390,6 +390,22 @@ int ata_scsi_error(struct Scsi_Host *hos return 0; } +int ata_scsi_device_resume(struct scsi_device *sdev) +{ + struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0]; + struct ata_device *dev = &ap->device[sdev->id]; + + return ata_device_resume(ap, dev); +} + +int ata_scsi_device_suspend(struct scsi_device *sdev) +{ + struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0]; + struct ata_device *dev = &ap->device[sdev->id]; + + return ata_device_suspend(ap, dev); +} + /** * ata_scsi_flush_xlat - Translate SCSI SYNCHRONIZE CACHE command * @qc: Storage for translated ATA taskfile diff -uprN linux-2.6.12/drivers/scsi/sata_nv.c linux-2.6.12.patched/drivers/scsi/sata_nv.c --- linux-2.6.12/drivers/scsi/sata_nv.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/sata_nv.c 2005-06-19 10:25:04.000000000 +0200 @@ -187,6 +187,8 @@ static struct pci_driver nv_pci_driver = .id_table = nv_pci_tbl, .probe = nv_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; static Scsi_Host_Template nv_sht = { @@ -207,6 +209,8 @@ static Scsi_Host_Template nv_sht = { .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; static struct ata_port_operations nv_ops = { diff -uprN linux-2.6.12/drivers/scsi/sata_promise.c linux-2.6.12.patched/drivers/scsi/sata_promise.c --- linux-2.6.12/drivers/scsi/sata_promise.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/sata_promise.c 2005-06-19 10:25:04.000000000 +0200 @@ -103,6 +103,8 @@ static Scsi_Host_Template pdc_ata_sht = .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; static struct ata_port_operations pdc_ata_ops = { @@ -181,6 +183,8 @@ static struct pci_driver pdc_ata_pci_dri .id_table = pdc_ata_pci_tbl, .probe = pdc_ata_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; diff -uprN linux-2.6.12/drivers/scsi/sata_qstor.c linux-2.6.12.patched/drivers/scsi/sata_qstor.c --- linux-2.6.12/drivers/scsi/sata_qstor.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/sata_qstor.c 2005-06-19 10:25:04.000000000 +0200 @@ -140,6 +140,8 @@ static Scsi_Host_Template qs_ata_sht = { .dma_boundary = QS_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 qs_ata_ops = { @@ -191,6 +193,8 @@ static struct pci_driver qs_ata_pci_driv .id_table = qs_ata_pci_tbl, .probe = qs_ata_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; static int qs_check_atapi_dma(struct ata_queued_cmd *qc) diff -uprN linux-2.6.12/drivers/scsi/sata_sil.c linux-2.6.12.patched/drivers/scsi/sata_sil.c --- linux-2.6.12/drivers/scsi/sata_sil.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/sata_sil.c 2005-06-19 10:25:04.000000000 +0200 @@ -116,6 +116,8 @@ static struct pci_driver sil_pci_driver .id_table = sil_pci_tbl, .probe = sil_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; static Scsi_Host_Template sil_sht = { @@ -136,6 +138,8 @@ static Scsi_Host_Template sil_sht = { .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; static struct ata_port_operations sil_ops = { diff -uprN linux-2.6.12/drivers/scsi/sata_sis.c linux-2.6.12.patched/drivers/scsi/sata_sis.c --- linux-2.6.12/drivers/scsi/sata_sis.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/sata_sis.c 2005-06-19 10:25:04.000000000 +0200 @@ -71,6 +71,8 @@ static struct pci_driver sis_pci_driver .id_table = sis_pci_tbl, .probe = sis_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; static Scsi_Host_Template sis_sht = { @@ -91,6 +93,8 @@ static Scsi_Host_Template sis_sht = { .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; static struct ata_port_operations sis_ops = { diff -uprN linux-2.6.12/drivers/scsi/sata_svw.c linux-2.6.12.patched/drivers/scsi/sata_svw.c --- linux-2.6.12/drivers/scsi/sata_svw.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/sata_svw.c 2005-06-19 10:25:04.000000000 +0200 @@ -289,6 +289,8 @@ static Scsi_Host_Template k2_sata_sht = #endif .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; @@ -459,6 +461,8 @@ static struct pci_driver k2_sata_pci_dri .id_table = k2_sata_pci_tbl, .probe = k2_sata_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; diff -uprN linux-2.6.12/drivers/scsi/sata_sx4.c linux-2.6.12.patched/drivers/scsi/sata_sx4.c --- linux-2.6.12/drivers/scsi/sata_sx4.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/sata_sx4.c 2005-06-19 10:25:04.000000000 +0200 @@ -189,6 +189,8 @@ static Scsi_Host_Template pdc_sata_sht = .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; static struct ata_port_operations pdc_20621_ops = { @@ -235,6 +237,8 @@ static struct pci_driver pdc_sata_pci_dr .id_table = pdc_sata_pci_tbl, .probe = pdc_sata_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; diff -uprN linux-2.6.12/drivers/scsi/sata_uli.c linux-2.6.12.patched/drivers/scsi/sata_uli.c --- linux-2.6.12/drivers/scsi/sata_uli.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/sata_uli.c 2005-06-19 10:25:04.000000000 +0200 @@ -63,6 +63,8 @@ static struct pci_driver uli_pci_driver .id_table = uli_pci_tbl, .probe = uli_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; static Scsi_Host_Template uli_sht = { @@ -83,6 +85,8 @@ static Scsi_Host_Template uli_sht = { .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; static struct ata_port_operations uli_ops = { diff -uprN linux-2.6.12/drivers/scsi/sata_via.c linux-2.6.12.patched/drivers/scsi/sata_via.c --- linux-2.6.12/drivers/scsi/sata_via.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/sata_via.c 2005-06-19 10:25:04.000000000 +0200 @@ -83,6 +83,8 @@ static struct pci_driver svia_pci_driver .id_table = svia_pci_tbl, .probe = svia_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; static Scsi_Host_Template svia_sht = { @@ -103,6 +105,8 @@ static Scsi_Host_Template svia_sht = { .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; static struct ata_port_operations svia_sata_ops = { diff -uprN linux-2.6.12/drivers/scsi/sata_vsc.c linux-2.6.12.patched/drivers/scsi/sata_vsc.c --- linux-2.6.12/drivers/scsi/sata_vsc.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/sata_vsc.c 2005-06-19 10:25:04.000000000 +0200 @@ -207,6 +207,8 @@ static Scsi_Host_Template vsc_sata_sht = .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, .ordered_flush = 1, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, }; @@ -384,6 +386,8 @@ static struct pci_driver vsc_sata_pci_dr .id_table = vsc_sata_pci_tbl, .probe = vsc_sata_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, }; diff -uprN linux-2.6.12/drivers/scsi/scsi_lib.c linux-2.6.12.patched/drivers/scsi/scsi_lib.c --- linux-2.6.12/drivers/scsi/scsi_lib.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/scsi_lib.c 2005-06-19 10:25:04.000000000 +0200 @@ -1855,8 +1855,9 @@ EXPORT_SYMBOL(scsi_device_quiesce); void scsi_device_resume(struct scsi_device *sdev) { - if(scsi_device_set_state(sdev, SDEV_RUNNING)) + if (scsi_device_set_state(sdev, SDEV_RUNNING)) return; + scsi_run_queue(sdev->request_queue); } EXPORT_SYMBOL(scsi_device_resume); diff -uprN linux-2.6.12/drivers/scsi/scsi_sysfs.c linux-2.6.12.patched/drivers/scsi/scsi_sysfs.c --- linux-2.6.12/drivers/scsi/scsi_sysfs.c 2005-06-19 10:21:06.000000000 +0200 +++ linux-2.6.12.patched/drivers/scsi/scsi_sysfs.c 2005-06-19 10:25:04.000000000 +0200 @@ -199,9 +199,40 @@ static int scsi_bus_match(struct device return (sdp->inq_periph_qual == SCSI_INQ_PQ_CON)? 1: 0; } +static int scsi_bus_suspend(struct device * dev, pm_message_t state) +{ + struct scsi_device *sdev = to_scsi_device(dev); + struct scsi_host_template *sht = sdev->host->hostt; + int err; + + err = scsi_device_quiesce(sdev); + if (err) + return err; + + if (sht->suspend) + err = sht->suspend(sdev); + + return err; +} + +static int scsi_bus_resume(struct device * dev) +{ + struct scsi_device *sdev = to_scsi_device(dev); + struct scsi_host_template *sht = sdev->host->hostt; + int err = 0; + + if (sht->resume) + err = sht->resume(sdev); + + scsi_device_resume(sdev); + return err; +} + struct bus_type scsi_bus_type = { .name = "scsi", .match = scsi_bus_match, + .suspend = scsi_bus_suspend, + .resume = scsi_bus_resume, }; int scsi_sysfs_register(void) diff -uprN linux-2.6.12/include/linux/ata.h linux-2.6.12.patched/include/linux/ata.h --- linux-2.6.12/include/linux/ata.h 2005-03-02 08:38:10.000000000 +0100 +++ linux-2.6.12.patched/include/linux/ata.h 2005-06-19 10:25:04.000000000 +0200 @@ -125,6 +125,8 @@ enum { ATA_CMD_PACKET = 0xA0, ATA_CMD_VERIFY = 0x40, ATA_CMD_VERIFY_EXT = 0x42, + ATA_CMD_STANDBYNOW1 = 0xE0, + ATA_CMD_IDLEIMMEDIATE = 0xE1, /* SETFEATURES stuff */ SETFEATURES_XFER = 0x03, diff -uprN linux-2.6.12/include/linux/libata.h linux-2.6.12.patched/include/linux/libata.h --- linux-2.6.12/include/linux/libata.h 2005-06-19 10:21:07.000000000 +0200 +++ linux-2.6.12.patched/include/linux/libata.h 2005-06-19 10:25:04.000000000 +0200 @@ -113,6 +113,7 @@ enum { ATA_FLAG_MMIO = (1 << 6), /* use MMIO, not PIO */ ATA_FLAG_SATA_RESET = (1 << 7), /* use COMRESET */ ATA_FLAG_PIO_DMA = (1 << 8), /* PIO cmds via DMA */ + ATA_FLAG_SUSPENDED = (1 << 9), /* port is suspended */ ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */ ATA_QCFLAG_SG = (1 << 3), /* have s/g table? */ @@ -387,6 +388,8 @@ extern void ata_std_ports(struct ata_iop extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, unsigned int n_ports); extern void ata_pci_remove_one (struct pci_dev *pdev); +extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state); +extern int ata_pci_device_resume(struct pci_dev *pdev); #endif /* CONFIG_PCI */ extern int ata_device_add(struct ata_probe_ent *ent); extern int ata_scsi_detect(Scsi_Host_Template *sht); @@ -395,6 +398,10 @@ extern int ata_scsi_queuecmd(struct scsi extern int ata_scsi_error(struct Scsi_Host *host); extern int ata_scsi_release(struct Scsi_Host *host); extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); +extern int ata_scsi_device_resume(struct scsi_device *); +extern int ata_scsi_device_suspend(struct scsi_device *); +extern int ata_device_resume(struct ata_port *, struct ata_device *); +extern int ata_device_suspend(struct ata_port *, struct ata_device *); /* * Default driver ops implementations */ diff -uprN linux-2.6.12/include/scsi/scsi_host.h linux-2.6.12.patched/include/scsi/scsi_host.h --- linux-2.6.12/include/scsi/scsi_host.h 2005-06-19 10:21:07.000000000 +0200 +++ linux-2.6.12.patched/include/scsi/scsi_host.h 2005-06-19 10:25:04.000000000 +0200 @@ -270,6 +270,12 @@ struct scsi_host_template { int (*proc_info)(struct Scsi_Host *, char *, char **, off_t, int, int); /* + * suspend support + */ + int (*resume)(struct scsi_device *); + int (*suspend)(struct scsi_device *); + + /* * Name of proc directory */ char *proc_name;