Commit bba6f6fc authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] MSI-X: fix resume crash 



So I think the right solution is to simply make pci_enable_device just
flip enable bits and move the rest of the work someplace else.

However a thorough cleanup is a little extreme for this point in the
release cycle, so I think a quick hack that makes the code not stomp the
irq when msi irq's are enabled should be the first fix.  Then we can
later make the code not change the irqs at all.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4dfc896e

arch/cris/arch-v32/drivers/pci/bios.c

+3 −1
Original line number Diff line number Diff line
@@ -100,7 +100,9 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
	if ((err = pcibios_enable_resources(dev, mask)) < 0)

		return err;



	return pcibios_enable_irq(dev);

	if (!dev->msi_enabled)

		pcibios_enable_irq(dev);

	return 0;

}



int pcibios_assign_resources(void)

arch/frv/mb93090-mb00/pci-vdk.c

+2 −1
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 


	if ((err = pcibios_enable_resources(dev, mask)) < 0)

		return err;

	if (!dev->msi_enabled)

		pcibios_enable_irq(dev);

	return 0;

}

arch/i386/pci/common.c

+4 −2
Original line number Diff line number Diff line
@@ -434,11 +434,13 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
	if ((err = pcibios_enable_resources(dev, mask)) < 0)

		return err;



	if (!dev->msi_enabled)

		return pcibios_enable_irq(dev);

	return 0;

}



void pcibios_disable_device (struct pci_dev *dev)

{

	if (pcibios_disable_irq)

	if (!dev->msi_enabled && pcibios_disable_irq)

		pcibios_disable_irq(dev);

}

arch/ia64/pci/pci.c

+6 −2
Original line number Diff line number Diff line
@@ -557,14 +557,18 @@ pcibios_enable_device (struct pci_dev *dev, int mask) 
	if (ret < 0)

		return ret;



	if (!dev->msi_enabled)

		return acpi_pci_irq_enable(dev);

	return 0;

}



void

pcibios_disable_device (struct pci_dev *dev)

{

	BUG_ON(atomic_read(&dev->enable_cnt));

	if (!dev->msi_enabled)

		acpi_pci_irq_disable(dev);

	return 0;

}



void

CRA Git | Maintained and supported by SUSTech CRA and CCSE