Re: iommu breaks usb after resume

[Pavel Machek]

Hi!

> > CONFIG_AGP=y
> > CONFIG_AGP_AMD64=y
> > CONFIG_AGP_INTEL=y
> > # CONFIG_AGP_SIS is not set
> > CONFIG_AGP_VIA=y
> > CONFIG_DRM=y
> > # CONFIG_DRM_TDFX is not set
> > 
> > ...do I need to enable something more?
> 
> Should have worked then. Ok modulo bugs. Maybe the ordering
> is wrong now (AGP resume would need to run before anything
> using the IOMMU)

So agp_amd64_resume() is responsible for reiniting iommu on new amd64
boxes?

It is registered as normal pci driver:

static struct pci_driver agp_amd64_pci_driver = {
	.name		= "agpgart-amd64",
	.id_table	= agp_amd64_pci_table,
	.probe		= agp_amd64_probe,
	.remove		= agp_amd64_remove,
#ifdef CONFIG_PM
	.suspend	= agp_amd64_suspend,
	.resume		= agp_amd64_resume,
#endif
};

...should it be modified to run early, as other pci devices (USB
controllers) may rely on this?

I did this... I'll verify it in 10 hours or so. If someone has amd64
system with >=4G ram, there should be hibernation problems. This
should fix it:

diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index d8200ac..4e85178 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -594,12 +594,14 @@ static int agp_amd64_suspend(struct pci_
 
 static int agp_amd64_resume(struct pci_dev *pdev)
 {
+	printk("agp_amd64: resume\n");
 	pci_set_power_state(pdev, PCI_D0);
 	pci_restore_state(pdev);
 
 	if (pdev->vendor == PCI_VENDOR_ID_NVIDIA)
 		nforce3_agp_init(pdev);
 
+	printk("agp_amd64: 8151 configure\n");
 	return amd_8151_configure();
 }
 
@@ -733,8 +735,8 @@ static struct pci_driver agp_amd64_pci_d
 	.probe		= agp_amd64_probe,
 	.remove		= agp_amd64_remove,
 #ifdef CONFIG_PM
-	.suspend	= agp_amd64_suspend,
-	.resume		= agp_amd64_resume,
+	.suspend_late	= agp_amd64_suspend,
+	.resume_early	= agp_amd64_resume,
 #endif
 };
 


								Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
pomozte zachranit klanovicky les:  http://www.ujezdskystrom.info/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/