Attachment #68857 for bug #151517

View | Details | Raw Unified | Return to bug 151517
Collapse All | Expand All

Lines 803-808 static int irqrouter_resume(struct sys_d Link Here

(-)linux-2.6.15/drivers/acpi/pci_link.c.orig (+2 lines)
803	struct list_head *node = NULL;	803	struct list_head *node = NULL;
804	struct acpi_pci_link *link = NULL;	804	struct acpi_pci_link *link = NULL;
805		805
		806	printk(KERN_DEBUG "irqrouter_resume: ENTER\n");
806	ACPI_FUNCTION_TRACE("irqrouter_resume");	807	ACPI_FUNCTION_TRACE("irqrouter_resume");
807		808
808	acpi_in_resume = 1;	809	acpi_in_resume = 1;
Lines 815-820 static int irqrouter_resume(struct sys_d Link Here
815	acpi_pci_link_resume(link);	816	acpi_pci_link_resume(link);
816	}	817	}
817	acpi_in_resume = 0;	818	acpi_in_resume = 0;
		819	printk(KERN_DEBUG "irqrouter_resume: EXIT\n");
818	return_VALUE(0);	820	return_VALUE(0);
819	}	821	}
820		822




 */
int ata_device_resume(struct ata_port *ap, struct ata_device *dev)
{
	printk(KERN_DEBUG "ata%d: resume device\n", ap->id);

	WARN_ON (irqs_disabled());

	if (!ata_dev_present(dev))
		return 0;
	ata_acpi_exec_tfs(ap);
	if (ap->flags & ATA_FLAG_SUSPENDED) {
		ap->flags &= ~ATA_FLAG_SUSPENDED;
		ata_set_mode(ap);
	}
	if (!ata_dev_present(dev))
		return 0;
	ata_acpi_exec_tfs(ap);
	if (dev->class == ATA_DEV_ATA)
		ata_start_drive(ap, dev);


 */
int ata_device_suspend(struct ata_port *ap, struct ata_device *dev)
{
	printk(KERN_DEBUG "ata%d: suspend device\n", ap->id);
	if (!ata_dev_present(dev))
		return 0;
	if (dev->class == ATA_DEV_ATA)


int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state)
{
	dev_printk(KERN_DEBUG, &pdev->dev, "suspend PCI device\n");
	pci_save_state(pdev);
	pci_disable_device(pdev);
	pci_set_power_state(pdev, PCI_D3hot);


int ata_pci_device_resume(struct pci_dev *pdev)
{
	dev_printk(KERN_DEBUG, &pdev->dev, "resume PCI device\n");
	pci_set_power_state(pdev, PCI_D0);
	pci_restore_state(pdev);
	pci_enable_device(pdev);

Return to bug 151517

Lines 4296-4308 static int ata_start_drive(struct ata_po Link Here

(-)linux-2.6.15/drivers/scsi/libata-core.c.orig (-3 / +10 lines)
4296	*/	4296	*/
4297	int ata_device_resume(struct ata_port ap, struct ata_device dev)	4297	int ata_device_resume(struct ata_port ap, struct ata_device dev)
4298	{	4298	{
		4299	printk(KERN_DEBUG "ata%d: resume device\n", ap->id);
		4300
		4301	WARN_ON (irqs_disabled());
		4302
		4303	if (!ata_dev_present(dev))
		4304	return 0;
		4305	ata_acpi_exec_tfs(ap);
4299	if (ap->flags & ATA_FLAG_SUSPENDED) {	4306	if (ap->flags & ATA_FLAG_SUSPENDED) {
4300	ap->flags &= ~ATA_FLAG_SUSPENDED;	4307	ap->flags &= ~ATA_FLAG_SUSPENDED;
4301	ata_set_mode(ap);	4308	ata_set_mode(ap);
4302	}	4309	}
4303	if (!ata_dev_present(dev))
4304	return 0;
4305	ata_acpi_exec_tfs(ap);
4306	if (dev->class == ATA_DEV_ATA)	4310	if (dev->class == ATA_DEV_ATA)
4307	ata_start_drive(ap, dev);	4311	ata_start_drive(ap, dev);
4308		4312
Lines 4318-4323 int ata_device_resume(struct ata_port *a Link Here
4318	*/	4322	*/
4319	int ata_device_suspend(struct ata_port ap, struct ata_device dev)	4323	int ata_device_suspend(struct ata_port ap, struct ata_device dev)
4320	{	4324	{
		4325	printk(KERN_DEBUG "ata%d: suspend device\n", ap->id);
4321	if (!ata_dev_present(dev))	4326	if (!ata_dev_present(dev))
4322	return 0;	4327	return 0;
4323	if (dev->class == ATA_DEV_ATA)	4328	if (dev->class == ATA_DEV_ATA)
Lines 5098-5103 int pci_test_config_bits(struct pci_dev Link Here
5098		5103
5099	int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state)	5104	int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state)
5100	{	5105	{
		5106	dev_printk(KERN_DEBUG, &pdev->dev, "suspend PCI device\n");
5101	pci_save_state(pdev);	5107	pci_save_state(pdev);
5102	pci_disable_device(pdev);	5108	pci_disable_device(pdev);
5103	pci_set_power_state(pdev, PCI_D3hot);	5109	pci_set_power_state(pdev, PCI_D3hot);
Lines 5106-5111 int ata_pci_device_suspend(struct pci_de Link Here
5106		5112
5107	int ata_pci_device_resume(struct pci_dev *pdev)	5113	int ata_pci_device_resume(struct pci_dev *pdev)
5108	{	5114	{
		5115	dev_printk(KERN_DEBUG, &pdev->dev, "resume PCI device\n");
5109	pci_set_power_state(pdev, PCI_D0);	5116	pci_set_power_state(pdev, PCI_D0);
5110	pci_restore_state(pdev);	5117	pci_restore_state(pdev);
5111	pci_enable_device(pdev);	5118	pci_enable_device(pdev);