From: Jesse Barnes Date: Thu, 7 Aug 2008 15:52:37 +0000 (-0700) Subject: PCI: fully restore MSI state at resume time X-Git-Tag: v2.6.27-rc3~57^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=abad2ec98f2ef357d62026cbc3989dabf33f2435;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Alan Jenkins Signed-off-by: Jesse Barnes --- diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 18354817173..4a10b5624f7 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -308,9 +308,8 @@ 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_ENABLE; + control &= ~PCI_MSI_FLAGS_QSIZE; + control |= PCI_MSI_FLAGS_ENABLE; pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control); }