Commit abad2ec9 authored Aug 07, 2008 by Jesse Barnes

PCI: fully restore MSI state at resume time



With the recent change to avoid masking MSIs using the MSI enable bit, devices
without an MSI mask bit will have their MSI capability always enabled when MSI
is in use, so we need to restore it regardless of the mask bit state.

Fixes kernel bz 11178.

Acked-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

parent cb3952bf

drivers/pci/msi.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -308,8 +308,7 @@ static void __pci_restore_msi_state(struct pci_dev *dev)
		entry->msi_attrib.masked);

		pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control);
		control &= ~(PCI_MSI_FLAGS_QSIZE \| PCI_MSI_FLAGS_ENABLE);
		if (entry->msi_attrib.maskbit \|\| !entry->msi_attrib.masked)
		control &= ~PCI_MSI_FLAGS_QSIZE;
		control \|= PCI_MSI_FLAGS_ENABLE;
		pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control);
		}

Admin message