From: Rajesh Shah We recently ran into a problem where the e1000 device failed to work properly on the kexec kernel. MSI was enabled for the device in the main kernel when it crashed. The e1000 driver tried to enable MSI on the kexec kernel, but the code bailed early when it found that MSI was already enabled in the hardware, even though the software state was not properly set up in the kexec'd kernel. This patch fixes the problem by moving the early return to after making sure that the software state is properly initialized. Signed-off-by: Rajesh Shah Cc: Greg KH Cc: "Nguyen, Tom L" Cc: Shaohua Li Signed-off-by: Andrew Morton --- drivers/pci/msi.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff -puN drivers/pci/msi.c~allow-msi-to-work-on-kexec-kernel drivers/pci/msi.c --- 25/drivers/pci/msi.c~allow-msi-to-work-on-kexec-kernel Fri May 26 12:46:22 2006 +++ 25-akpm/drivers/pci/msi.c Fri May 26 12:51:42 2006 @@ -938,14 +938,13 @@ int pci_enable_msi(struct pci_dev* dev) if (!pos) return -EINVAL; - pci_read_config_word(dev, msi_control_reg(pos), &control); - if (control & PCI_MSI_FLAGS_ENABLE) - return 0; /* Already in MSI mode */ - if (!msi_lookup_vector(dev, PCI_CAP_ID_MSI)) { /* Lookup Sucess */ unsigned long flags; + pci_read_config_word(dev, msi_control_reg(pos), &control); + if (control & PCI_MSI_FLAGS_ENABLE) + return 0; /* Already in MSI mode */ spin_lock_irqsave(&msi_lock, flags); if (!vector_irq[dev->irq]) { msi_desc[dev->irq]->msi_attrib.state = 0; _