# HG changeset patch
# User Stefano Stabellini <sstabellini@xxxxxxxxxxxxx>
# Date 1281635780 -3600
# Node ID ddb9f47ef2e2848e795a56496ff09a0ff06935f0
# Parent 51147d5b17c33182985c3a1cff8262a9168b9983
# Parent 774dfc178c39bd3fe2ec14b4f96e60b78391b397
merge
---
tools/python/xen/util/vscsi_util.py | 2 +-
xen/arch/x86/msi.c | 22 ++++++++++++++++------
2 files changed, 17 insertions(+), 7 deletions(-)
diff -r 51147d5b17c3 -r ddb9f47ef2e2 tools/python/xen/util/vscsi_util.py
--- a/tools/python/xen/util/vscsi_util.py Thu Aug 12 18:55:16 2010 +0100
+++ b/tools/python/xen/util/vscsi_util.py Thu Aug 12 18:56:20 2010 +0100
@@ -97,7 +97,7 @@ def _vscsi_get_scsidevices_by_lsscsi(opt
devices = []
for scsiinfo in os.popen('{ lsscsi -g %s; } 2>/dev/null' %
option).readlines():
-Â Â Â Â Â Â Â s = scsiinfo.replace(']', '] ').split()
+ s = scsiinfo.replace(']', '] ').split()
hctl = s[0][1:-1]
try:
devname = s[-2].split('/dev/')[1]
diff -r 51147d5b17c3 -r ddb9f47ef2e2 xen/arch/x86/msi.c
--- a/xen/arch/x86/msi.c Thu Aug 12 18:55:16 2010 +0100
+++ b/xen/arch/x86/msi.c Thu Aug 12 18:56:20 2010 +0100
@@ -607,30 +607,35 @@ static int msix_capability_init(struct p
* indicates the successful setup of an entry zero with the new MSI
* irq or non-zero for otherwise.
**/
+
static int __pci_enable_msi(struct msi_info *msi, struct msi_desc **desc)
{
int status;
struct pci_dev *pdev;
+ struct msi_desc *old_desc;
ASSERT(spin_is_locked(&pcidevs_lock));
pdev = pci_get_pdev(msi->bus, msi->devfn);
if ( !pdev )
return -ENODEV;
- if ( find_msi_entry(pdev, msi->irq, PCI_CAP_ID_MSI) )
+ old_desc = find_msi_entry(pdev, msi->irq, PCI_CAP_ID_MSI);
+ if ( old_desc )
{
dprintk(XENLOG_WARNING, "irq %d has already mapped to MSI on "
"device %02x:%02x.%01x.\n", msi->irq, msi->bus,
PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn));
+ *desc = old_desc;
return 0;
}
- if ( find_msi_entry(pdev, -1, PCI_CAP_ID_MSIX) )
+ old_desc = find_msi_entry(pdev, -1, PCI_CAP_ID_MSIX);
+ if ( old_desc )
{
dprintk(XENLOG_WARNING, "MSI-X is already in use on "
"device %02x:%02x.%01x\n", msi->bus,
PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn));
- return 0;
+ pci_disable_msi(old_desc);
}
status = msi_capability_init(pdev, msi->irq, desc);
@@ -679,6 +684,7 @@ static int __pci_enable_msix(struct msi_
u16 control;
u8 slot = PCI_SLOT(msi->devfn);
u8 func = PCI_FUNC(msi->devfn);
+ struct msi_desc *old_desc;
ASSERT(spin_is_locked(&pcidevs_lock));
pdev = pci_get_pdev(msi->bus, msi->devfn);
@@ -691,20 +697,24 @@ static int __pci_enable_msix(struct msi_
if (msi->entry_nr >= nr_entries)
return -EINVAL;
- if ( find_msi_entry(pdev, msi->irq, PCI_CAP_ID_MSIX) )
+ old_desc = find_msi_entry(pdev, msi->irq, PCI_CAP_ID_MSIX);
+ if ( old_desc )
{
dprintk(XENLOG_WARNING, "irq %d has already mapped to MSIX on "
"device %02x:%02x.%01x.\n", msi->irq, msi->bus,
PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn));
+ *desc = old_desc;
return 0;
}
- if ( find_msi_entry(pdev, -1, PCI_CAP_ID_MSI) )
+ old_desc = find_msi_entry(pdev, -1, PCI_CAP_ID_MSI);
+ if ( old_desc )
{
dprintk(XENLOG_WARNING, "MSI is already in use on "
"device %02x:%02x.%01x\n", msi->bus,
PCI_SLOT(msi->devfn), PCI_FUNC(msi->devfn));
- return 0;
+ pci_disable_msi(old_desc);
+
}
status = msix_capability_init(pdev, msi, desc);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home