From 45f8dcb445a7dd6833a226b97430755a39616789 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 17 Feb 2011 11:18:00 -0500
Subject: [PATCH] --- yaml --- r: 255279 b: refs/heads/master c:
 c288b67b9b4d65790e1a1a1fd982330730b68f46 h: refs/heads/master i:   255277:
 bf0bb6fb110367276e6b612b4f5db4458b1e1735   255275:
 b7c2e56d529cf3178b3ff69ef2f76605f5a2276a   255271:
 01bbbc00663b6f5c17e0bddc5e9d7b16f03a98e4   255263:
 2f28d8e984f7c54866eed0d92e30b2c5f2a8e649 v: v3

---
 [refs]                                        |  2 +-
 .../xen-pciback/conf_space_capability_msi.c   | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a18fbd4df0e4..10dc9d4c7f0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e17ab35f05cb8b3d19c70454a41ea67207caf484
+refs/heads/master: c288b67b9b4d65790e1a1a1fd982330730b68f46
diff --git a/trunk/drivers/xen/xen-pciback/conf_space_capability_msi.c b/trunk/drivers/xen/xen-pciback/conf_space_capability_msi.c
index d0d2255b5da9..6e876b600e66 100644
--- a/trunk/drivers/xen/xen-pciback/conf_space_capability_msi.c
+++ b/trunk/drivers/xen/xen-pciback/conf_space_capability_msi.c
@@ -16,6 +16,9 @@ int pciback_enable_msi(struct pciback_device *pdev,
 	int otherend = pdev->xdev->otherend_id;
 	int status;
 
+	if (unlikely(verbose_request))
+		printk(KERN_DEBUG "pciback: %s: enable MSI\n", pci_name(dev));
+
 	status = pci_enable_msi(dev);
 
 	if (status) {
@@ -29,9 +32,14 @@ int pciback_enable_msi(struct pciback_device *pdev,
 	 * the local domain's IRQ number. */
 
 	op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
+	if (unlikely(verbose_request))
+		printk(KERN_DEBUG "pciback: %s: MSI: %d\n", pci_name(dev),
+			op->value);
+
 	dev_data = pci_get_drvdata(dev);
 	if (dev_data)
 		dev_data->ack_intr = 0;
+
 	return 0;
 }
 
@@ -39,9 +47,16 @@ int pciback_disable_msi(struct pciback_device *pdev,
 		struct pci_dev *dev, struct xen_pci_op *op)
 {
 	struct pciback_dev_data *dev_data;
+
+	if (unlikely(verbose_request))
+		printk(KERN_DEBUG "pciback: %s: disable MSI\n", pci_name(dev));
+
 	pci_disable_msi(dev);
 
 	op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
+	if (unlikely(verbose_request))
+		printk(KERN_DEBUG "pciback: %s: MSI: %d\n", pci_name(dev),
+			op->value);
 	dev_data = pci_get_drvdata(dev);
 	if (dev_data)
 		dev_data->ack_intr = 1;
@@ -55,6 +70,10 @@ int pciback_enable_msix(struct pciback_device *pdev,
 	int i, result;
 	struct msix_entry *entries;
 
+	if (unlikely(verbose_request))
+		printk(KERN_DEBUG "pciback: %s: enable MSI-X\n",
+		       pci_name(dev));
+
 	if (op->value > SH_INFO_MAX_VEC)
 		return -EINVAL;
 
@@ -75,6 +94,11 @@ int pciback_enable_msix(struct pciback_device *pdev,
 			if (entries[i].vector)
 				op->msix_entries[i].vector =
 					xen_pirq_from_irq(entries[i].vector);
+				if (unlikely(verbose_request))
+					printk(KERN_DEBUG "pciback: %s: " \
+						"MSI-X[%d]: %d\n",
+						pci_name(dev), i,
+						op->msix_entries[i].vector);
 		}
 	} else {
 		printk(KERN_WARNING "pciback: %s: failed to enable MSI-X: err %d!\n",
@@ -95,6 +119,10 @@ int pciback_disable_msix(struct pciback_device *pdev,
 {
 	struct pciback_dev_data *dev_data;
 
+	if (unlikely(verbose_request))
+		printk(KERN_DEBUG "pciback: %s: disable MSI-X\n",
+		       pci_name(dev));
+
 	pci_disable_msix(dev);
 
 	/*
@@ -102,6 +130,9 @@ int pciback_disable_msix(struct pciback_device *pdev,
 	 * an undefined IRQ value of zero.
 	 */
 	op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
+	if (unlikely(verbose_request))
+		printk(KERN_DEBUG "pciback: %s: MSI-X: %d\n", pci_name(dev),
+			op->value);
 	dev_data = pci_get_drvdata(dev);
 	if (dev_data)
 		dev_data->ack_intr = 1;