From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 13 Jan 2009 15:53:47 +0000 (+0000)
Subject: x86: Call msix_set_enable for MSI-x interrupt
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14014^2~69
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=248ba473c4f82346993b5c94ba83239e6761bb6c;p=xen.git

x86: Call msix_set_enable for MSI-x interrupt

For MSI-x, we should call msix_set_enable() instead of
msi_set_enable().

Signed-off-by: Jiang Yunhong <yunhong.jiang@intel.com>
---

diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c
index fdca2453ce..44e617c5ac 100644
--- a/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c
@@ -671,7 +671,7 @@ static void __pci_disable_msix(struct msi_desc *entry)
 
     pos = pci_find_cap_offset(bus, slot, func, PCI_CAP_ID_MSIX);
     control = pci_conf_read16(bus, slot, func, msix_control_reg(pos));
-    msi_set_enable(dev, 0);
+    msix_set_enable(dev, 0);
 
     BUG_ON(list_empty(&dev->msi_list));
 
@@ -770,11 +770,20 @@ int pci_restore_msi_state(struct pci_dev *pdev)
             return -EINVAL;
         }
 
-        msi_set_enable(pdev, 0);
+        if ( entry->msi_attrib.type == PCI_CAP_ID_MSI )
+            msi_set_enable(pdev, 0);
+        else if ( entry->msi_attrib.type == PCI_CAP_ID_MSIX )
+            msix_set_enable(pdev, 0);
+
         write_msi_msg(entry, &entry->msg);
 
-        msi_set_enable(pdev, 1);
         msi_set_mask_bit(vector, entry->msi_attrib.masked);
+
+        if ( entry->msi_attrib.type == PCI_CAP_ID_MSI )
+            msi_set_enable(pdev, 1);
+        else if ( entry->msi_attrib.type == PCI_CAP_ID_MSIX )
+            msix_set_enable(pdev, 1);
+
         spin_unlock_irqrestore(&desc->lock, flags);
     }