diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2010-03-03 13:38:43 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-19 20:58:31 -0400 |
| commit | a2be65fd363831502afdf0babdf48149b3959cde (patch) | |
| tree | 07d69e95d8abb66eca6c13e59ee22dd1e6b6bb20 /drivers/xen | |
| parent | fd5b221b348adf63d413de9adad030e4f13664b7 (diff) | |
| download | linux-3.10-a2be65fd363831502afdf0babdf48149b3959cde.tar.gz linux-3.10-a2be65fd363831502afdf0babdf48149b3959cde.tar.bz2 linux-3.10-a2be65fd363831502afdf0babdf48149b3959cde.zip | |
xen/pciback: Disable MSI/MSI-X when reseting a device
In cases where the guest is abruptly killed and has not disabled
MSI/MSI-X interrupts we want to do it for it.
Otherwise when the guest is started up and enables MSI, we would
get a WARN() that the device already had been enabled.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/xen-pciback/pciback_ops.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c index 2b9a93e1fde..011db675e43 100644 --- a/drivers/xen/xen-pciback/pciback_ops.c +++ b/drivers/xen/xen-pciback/pciback_ops.c @@ -23,6 +23,14 @@ void pciback_reset_device(struct pci_dev *dev) /* Disable devices (but not bridges) */ if (dev->hdr_type == PCI_HEADER_TYPE_NORMAL) { +#ifdef CONFIG_PCI_MSI + /* The guest could have been abruptly killed without + * disabling MSI/MSI-X interrupts.*/ + if (dev->msix_enabled) + pci_disable_msix(dev); + if (dev->msi_enabled) + pci_disable_msi(dev); +#endif pci_disable_device(dev); pci_write_config_word(dev, PCI_COMMAND, 0); |