Attachment 617528 Details for Bug 849223 – write_msi_msg_desc() debug messages (v2), now with WARN

[patch] write_msi_msg_desc() debug messages (v2), now with WARN

0001-add-debug-messages-to-write_msi_msg_desc.patch (text/plain), 3.33 KB, created by Laszlo Ersek on 2012-09-26 11:41:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laszlo Ersek

Created: 2012-09-26 11:41:35 UTC

Size: 3.33 KB

patch

obsolete

>From b398ecee30f47211a35e94bea445f666df43d683 Mon Sep 17 00:00:00 2001
>From: Laszlo Ersek <lersek@redhat.com>
>Date: Wed, 19 Sep 2012 23:06:50 +0200
>Subject: [PATCH] add debug messages to write_msi_msg_desc()
> (cherry picked from commit 4ff8fa82f5f783b6bb2236c9a3a06a6e7a1af5f9)
>
>
>Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>---
> drivers/pci/msi.c |   46 ++++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 46 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
>index ce38438..a00b16b 100644
>--- a/drivers/pci/msi.c
>+++ b/drivers/pci/msi.c
>@@ -260,11 +260,20 @@ void write_msi_msg_desc(struct irq_desc *desc, struct msi_msg *msg)
> 
> 	if (entry->dev->current_state != PCI_D0) {
> 		/* Don't touch the hardware now */
>+		dev_printk(KERN_DEBUG, &entry->dev->dev,
>+			   "%s: don't touch the hardware now\n", __FUNCTION__);
> 	} else if (entry->msi_attrib.is_msix) {
> 		void __iomem *base;
> 		base = entry->mask_base +
> 			entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE;
> 
>+		dev_printk(KERN_DEBUG, &entry->dev->dev, "%s: branch 2: "
>+			   "address_lo=%08x address_hi=%08x data=%08x "
>+			   "mask_base=%p entry_nr=%d base=%p\n", __FUNCTION__,
>+			   msg->address_lo, msg->address_hi, msg->data,
>+			   (void *)entry->mask_base,
>+			   entry->msi_attrib.entry_nr, (void *)base);
>+
> 		writel(msg->address_lo, base + PCI_MSIX_ENTRY_LOWER_ADDR);
> 		writel(msg->address_hi, base + PCI_MSIX_ENTRY_UPPER_ADDR);
> 		writel(msg->data, base + PCI_MSIX_ENTRY_DATA);
>@@ -272,25 +281,62 @@ void write_msi_msg_desc(struct irq_desc *desc, struct msi_msg *msg)
> 		struct pci_dev *dev = entry->dev;
> 		int pos = entry->msi_attrib.pos;
> 		u16 msgctl;
>+		int r;
> 
>+		dev_printk(KERN_DEBUG, &dev->dev, "%s: branch 3: pos=%d "
>+			   "msi_control_reg=%04x\n", __FUNCTION__, pos,
>+			   (unsigned)msi_control_reg(pos));
>+		r =
> 		pci_read_config_word(dev, msi_control_reg(pos), &msgctl);
>+		dev_printk(KERN_DEBUG, &dev->dev, "read msgctl=%04x r=%d\n",
>+			   msgctl, r);
>+
> 		msgctl &= ~PCI_MSI_FLAGS_QSIZE;
> 		msgctl |= entry->msi_attrib.multiple << 4;
>+		r =
> 		pci_write_config_word(dev, msi_control_reg(pos), msgctl);
>+		dev_printk(KERN_DEBUG, &dev->dev, "wrote msgctl=%04x r=%d\n",
>+			   msgctl, r);
> 
>+		r =
> 		pci_write_config_dword(dev, msi_lower_address_reg(pos),
> 					msg->address_lo);
>+		dev_printk(KERN_DEBUG, &dev->dev, "msi_lower_address_reg=%04x "
>+			   "address_lo=%08x r=%d\n",
>+			   (unsigned)msi_lower_address_reg(pos),
>+			   msg->address_lo, r);
>+
> 		if (entry->msi_attrib.is_64) {
>+			int r2;
>+
>+			r =
> 			pci_write_config_dword(dev, msi_upper_address_reg(pos),
> 						msg->address_hi);
>+			r2 =
> 			pci_write_config_word(dev, msi_data_reg(pos, 1),
> 						msg->data);
>+			dev_printk(KERN_DEBUG, &dev->dev, "is-64: "
>+				   "msi_upper_address_reg=%04x "
>+				   "address_hi=%08x "
>+				   "msi_data_reg=%04x "
>+				   "data=%08x r=%d r2=%d\n",
>+				   (unsigned)msi_upper_address_reg(pos),
>+				   msg->address_hi,
>+				   (unsigned)msi_data_reg(pos, 1),
>+				   msg->data, r, r2);
> 		} else {
>+			r =
> 			pci_write_config_word(dev, msi_data_reg(pos, 0),
> 						msg->data);
>+			dev_printk(KERN_DEBUG, &dev->dev, "is-not-64: "
>+				   "msi_data_reg=%04x "
>+				   "data=%08x r=%d\n",
>+				   (unsigned)msi_data_reg(pos, 0),
>+				   msg->data, r);
> 		}
> 	}
> 	entry->msg = *msg;
>+	WARN_ON(1);
> }
> 
> void write_msi_msg(unsigned int irq, struct msi_msg *msg)
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 849223: 606043 | 606044 | 606045 | 606046 | 606050 | 606051 | 606365 | 606370 | 606639 | 610520 | 611505 | 613668 | 614372 | 614373 | 614374 | 614596 | 615391 | 615392 | 615482 | 616740 | 617217 | 617218 | 617260 | 617261 | 617528 | 617541 | 617718 | 618009 | 618145 | 618240 | 618241 | 618312