The following commit has been merged in the linux branch: commit cf6f3bf7e587a00217d7509b440f694711c76b2e Author: David Woodhouse David.Woodhouse@intel.com Date: Mon Oct 12 12:51:22 2009 +0100
Run pci_apply_final_quirks() sooner.
Having this as a device_initcall() means that some real device drivers can actually initialise _before_ the quirks are run, which is wrong.
We want it to run _before_ device_initcall(), but _after_ fs_initcall(), since some arch-specific PCI initialisation like pcibios_assign_resources() is done at fs_initcall().
We could use rootfs_initcall() but I actually want to use that for the IOMMU initialisation, which has to come after the quirks, but still before the real devices. So use fs_initcall_sync() instead -- since this is entirely synchronous, it doesn't hurt that it'll escape the synchronisation.
Signed-off-by: David Woodhouse David.Woodhouse@intel.com
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 77bf620..4e1b1b8 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2584,7 +2584,7 @@ static int __init pci_apply_final_quirks(void) return 0; }
-device_initcall(pci_apply_final_quirks); +fs_initcall_sync(pci_apply_final_quirks); #else void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev) {} #endif