diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-07 08:52:37 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-07 08:52:37 -0700 |
| commit | abad2ec98f2ef357d62026cbc3989dabf33f2435 (patch) | |
| tree | a2ffd7c8dd29d67dac2e78f23e26125dc413cb06 /drivers/pci/msi.c | |
| parent | cb3952bf7853667a1cb3515e67f27e67f0fce9e8 (diff) | |
| download | kernel-crypto-abad2ec98f2ef357d62026cbc3989dabf33f2435.tar.gz kernel-crypto-abad2ec98f2ef357d62026cbc3989dabf33f2435.tar.xz kernel-crypto-abad2ec98f2ef357d62026cbc3989dabf33f2435.zip | |
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>
Diffstat (limited to 'drivers/pci/msi.c')
| -rw-r--r-- | drivers/pci/msi.c | 5 |
1 files changed, 2 insertions, 3 deletions
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); } |