* RE: [PATCH] PCI: Clean up printks in msi.c
@ 2005-01-10 18:33 Nguyen, Tom L
0 siblings, 0 replies; 7+ messages in thread
From: Nguyen, Tom L @ 2005-01-10 18:33 UTC (permalink / raw)
To: Roland Dreier; +Cc: Zwane Mwaikambo, linux-kernel, Nguyen, Tom L, Greg KH
On Monday, January 10, 2005 9:39 AM, Roland Dreier wrote:
> No problem, here's the patch without any "success" message.
Look great.
Thanks,
Long
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] PCI: Clean up printks in msi.c
2005-01-17 22:01 [PATCH] PCI: pci_ids.h correction for Intel ICH7 - 2.6.10-bk13 Greg KH
@ 2005-01-17 22:01 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2005-01-17 22:01 UTC (permalink / raw)
To: linux-kernel; +Cc: roland
ChangeSet 1.2329.2.4, 2005/01/14 15:57:49-08:00, roland@topspin.com
[PATCH] PCI: Clean up printks in msi.c
Add "PCI:" prefixes and fix up the formatting and grammar of printks
in drivers/pci/msi.c. The main motivation was to fix the shouting
"MSI INIT SUCCESS" message printed when an MSI-using driver is first
started, but while we're at it we might as well tidy up all the messages.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/pci/msi.c | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff -Nru a/drivers/pci/msi.c b/drivers/pci/msi.c
--- a/drivers/pci/msi.c 2005-01-17 13:56:08 -08:00
+++ b/drivers/pci/msi.c 2005-01-17 13:56:08 -08:00
@@ -374,19 +374,18 @@
if ((status = msi_cache_init()) < 0) {
pci_msi_enable = 0;
- printk(KERN_INFO "WARNING: MSI INIT FAILURE\n");
+ printk(KERN_WARNING "PCI: MSI cache init failed\n");
return status;
}
last_alloc_vector = assign_irq_vector(AUTO_ASSIGN);
if (last_alloc_vector < 0) {
pci_msi_enable = 0;
- printk(KERN_INFO "WARNING: ALL VECTORS ARE BUSY\n");
+ printk(KERN_WARNING "PCI: No interrupt vectors available for MSI\n");
status = -EBUSY;
return status;
}
vector_irq[last_alloc_vector] = 0;
nr_released_vectors++;
- printk(KERN_INFO "MSI INIT SUCCESS\n");
return status;
}
@@ -736,7 +735,9 @@
/* Check whether driver already requested for MSI-X vectors */
if ((pos = pci_find_capability(dev, PCI_CAP_ID_MSIX)) > 0 &&
!msi_lookup_vector(dev, PCI_CAP_ID_MSIX)) {
- printk(KERN_INFO "Can't enable MSI. Device already had MSI-X vectors assigned\n");
+ printk(KERN_INFO "PCI: %s: Can't enable MSI. "
+ "Device already has MSI-X vectors assigned\n",
+ pci_name(dev));
dev->irq = temp;
return -EINVAL;
}
@@ -774,9 +775,9 @@
}
if (entry->msi_attrib.state) {
spin_unlock_irqrestore(&msi_lock, flags);
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on vector->%d\n",
- dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn),
- dev->irq);
+ printk(KERN_WARNING "PCI: %s: pci_disable_msi() called without "
+ "free_irq() on MSI vector %d\n",
+ pci_name(dev), dev->irq);
BUG_ON(entry->msi_attrib.state > 0);
} else {
vector_irq[dev->irq] = 0; /* free it */
@@ -982,7 +983,9 @@
/* Check whether driver already requested for MSI vector */
if (pci_find_capability(dev, PCI_CAP_ID_MSI) > 0 &&
!msi_lookup_vector(dev, PCI_CAP_ID_MSI)) {
- printk(KERN_INFO "Can't enable MSI-X. Device already had MSI vector assigned\n");
+ printk(KERN_INFO "PCI: %s: Can't enable MSI-X. "
+ "Device already has an MSI vector assigned\n",
+ pci_name(dev));
dev->irq = temp;
return -EINVAL;
}
@@ -1050,9 +1053,9 @@
spin_unlock_irqrestore(&msi_lock, flags);
if (warning) {
dev->irq = temp;
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on all vectors\n",
- dev->bus->number, PCI_SLOT(dev->devfn),
- PCI_FUNC(dev->devfn));
+ printk(KERN_WARNING "PCI: %s: pci_disable_msix() called without "
+ "free_irq() on all MSI-X vectors\n",
+ pci_name(dev));
BUG_ON(warning > 0);
} else {
dev->irq = temp;
@@ -1088,9 +1091,9 @@
state = msi_desc[dev->irq]->msi_attrib.state;
spin_unlock_irqrestore(&msi_lock, flags);
if (state) {
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on vector->%d\n",
- dev->bus->number, PCI_SLOT(dev->devfn),
- PCI_FUNC(dev->devfn), dev->irq);
+ printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
+ "called without free_irq() on MSI vector %d\n",
+ pci_name(dev), dev->irq);
BUG_ON(state > 0);
} else /* Release MSI vector assigned to this device */
msi_free_vector(dev, dev->irq, 0);
@@ -1132,9 +1135,9 @@
iounmap(base);
release_mem_region(phys_addr, PCI_MSIX_ENTRY_SIZE *
multi_msix_capable(control));
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on all vectors\n",
- dev->bus->number, PCI_SLOT(dev->devfn),
- PCI_FUNC(dev->devfn));
+ printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
+ "called without free_irq() on all MSI-X vectors\n",
+ pci_name(dev));
BUG_ON(warning > 0);
}
dev->irq = temp; /* Restore IOAPIC IRQ */
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] PCI: Clean up printks in msi.c
2005-01-10 17:39 ` Roland Dreier
@ 2005-01-12 0:37 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2005-01-12 0:37 UTC (permalink / raw)
To: Roland Dreier; +Cc: Zwane Mwaikambo, linux-kernel, tom.l.nguyen
On Mon, Jan 10, 2005 at 09:39:02AM -0800, Roland Dreier wrote:
> Greg> I agree. Roland, care to change it?
>
> No problem, here's the patch without any "success" message.
>
>
> Add "PCI:" prefixes and fix up the formatting and grammar of printks
> in drivers/pci/msi.c. The main motivation was to fix the shouting
> "MSI INIT SUCCESS" message printed when an MSI-using driver is first
> started, but while we're at it we might as well tidy up all the messages.
>
> Signed-off-by: Roland Dreier <roland@topspin.com>
Applied, thanks.
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] PCI: Clean up printks in msi.c
2005-01-10 17:31 ` Greg KH
@ 2005-01-10 17:39 ` Roland Dreier
2005-01-12 0:37 ` Greg KH
0 siblings, 1 reply; 7+ messages in thread
From: Roland Dreier @ 2005-01-10 17:39 UTC (permalink / raw)
To: Greg KH; +Cc: Zwane Mwaikambo, linux-kernel, tom.l.nguyen
Greg> I agree. Roland, care to change it?
No problem, here's the patch without any "success" message.
Add "PCI:" prefixes and fix up the formatting and grammar of printks
in drivers/pci/msi.c. The main motivation was to fix the shouting
"MSI INIT SUCCESS" message printed when an MSI-using driver is first
started, but while we're at it we might as well tidy up all the messages.
Signed-off-by: Roland Dreier <roland@topspin.com>
Index: linux-bk/drivers/pci/msi.c
===================================================================
--- linux-bk.orig/drivers/pci/msi.c 2005-01-10 08:32:50.208912010 -0800
+++ linux-bk/drivers/pci/msi.c 2005-01-10 09:37:37.868724920 -0800
@@ -374,19 +374,18 @@
if ((status = msi_cache_init()) < 0) {
pci_msi_enable = 0;
- printk(KERN_INFO "WARNING: MSI INIT FAILURE\n");
+ printk(KERN_WARNING "PCI: MSI cache init failed\n");
return status;
}
last_alloc_vector = assign_irq_vector(AUTO_ASSIGN);
if (last_alloc_vector < 0) {
pci_msi_enable = 0;
- printk(KERN_INFO "WARNING: ALL VECTORS ARE BUSY\n");
+ printk(KERN_WARNING "PCI: No interrupt vectors available for MSI\n");
status = -EBUSY;
return status;
}
vector_irq[last_alloc_vector] = 0;
nr_released_vectors++;
- printk(KERN_INFO "MSI INIT SUCCESS\n");
return status;
}
@@ -736,7 +735,9 @@
/* Check whether driver already requested for MSI-X vectors */
if ((pos = pci_find_capability(dev, PCI_CAP_ID_MSIX)) > 0 &&
!msi_lookup_vector(dev, PCI_CAP_ID_MSIX)) {
- printk(KERN_INFO "Can't enable MSI. Device already had MSI-X vectors assigned\n");
+ printk(KERN_INFO "PCI: %s: Can't enable MSI. "
+ "Device already has MSI-X vectors assigned\n",
+ pci_name(dev));
dev->irq = temp;
return -EINVAL;
}
@@ -774,9 +775,9 @@
}
if (entry->msi_attrib.state) {
spin_unlock_irqrestore(&msi_lock, flags);
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on vector->%d\n",
- dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn),
- dev->irq);
+ printk(KERN_WARNING "PCI: %s: pci_disable_msi() called without "
+ "free_irq() on MSI vector %d\n",
+ pci_name(dev), dev->irq);
BUG_ON(entry->msi_attrib.state > 0);
} else {
vector_irq[dev->irq] = 0; /* free it */
@@ -982,7 +983,9 @@
/* Check whether driver already requested for MSI vector */
if (pci_find_capability(dev, PCI_CAP_ID_MSI) > 0 &&
!msi_lookup_vector(dev, PCI_CAP_ID_MSI)) {
- printk(KERN_INFO "Can't enable MSI-X. Device already had MSI vector assigned\n");
+ printk(KERN_INFO "PCI: %s: Can't enable MSI-X. "
+ "Device already has an MSI vector assigned\n",
+ pci_name(dev));
dev->irq = temp;
return -EINVAL;
}
@@ -1050,9 +1053,9 @@
spin_unlock_irqrestore(&msi_lock, flags);
if (warning) {
dev->irq = temp;
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on all vectors\n",
- dev->bus->number, PCI_SLOT(dev->devfn),
- PCI_FUNC(dev->devfn));
+ printk(KERN_WARNING "PCI: %s: pci_disable_msix() called without "
+ "free_irq() on all MSI-X vectors\n",
+ pci_name(dev));
BUG_ON(warning > 0);
} else {
dev->irq = temp;
@@ -1088,9 +1091,9 @@
state = msi_desc[dev->irq]->msi_attrib.state;
spin_unlock_irqrestore(&msi_lock, flags);
if (state) {
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on vector->%d\n",
- dev->bus->number, PCI_SLOT(dev->devfn),
- PCI_FUNC(dev->devfn), dev->irq);
+ printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
+ "called without free_irq() on MSI vector %d\n",
+ pci_name(dev), dev->irq);
BUG_ON(state > 0);
} else /* Release MSI vector assigned to this device */
msi_free_vector(dev, dev->irq, 0);
@@ -1132,9 +1135,9 @@
iounmap(base);
release_mem_region(phys_addr, PCI_MSIX_ENTRY_SIZE *
multi_msix_capable(control));
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on all vectors\n",
- dev->bus->number, PCI_SLOT(dev->devfn),
- PCI_FUNC(dev->devfn));
+ printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
+ "called without free_irq() on all MSI-X vectors\n",
+ pci_name(dev));
BUG_ON(warning > 0);
}
dev->irq = temp; /* Restore IOAPIC IRQ */
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] PCI: Clean up printks in msi.c
2005-01-10 17:23 ` Zwane Mwaikambo
@ 2005-01-10 17:31 ` Greg KH
2005-01-10 17:39 ` Roland Dreier
0 siblings, 1 reply; 7+ messages in thread
From: Greg KH @ 2005-01-10 17:31 UTC (permalink / raw)
To: Zwane Mwaikambo; +Cc: Roland Dreier, linux-kernel, tom.l.nguyen
On Mon, Jan 10, 2005 at 10:23:22AM -0700, Zwane Mwaikambo wrote:
> On Mon, 10 Jan 2005, Roland Dreier wrote:
>
> > Add "PCI:" prefixes and fix up the formatting and grammar of printks
> > in drivers/pci/msi.c. The main motivation was to fix the shouting
> > "MSI INIT SUCCESS" message printed when an MSI-using driver is first
> > started, but while we're at it we might as well tidy up all the messages.
>
> I reckon just get rid of that MSI init success message entirely.
I agree. Roland, care to change it?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] PCI: Clean up printks in msi.c
2005-01-10 17:11 Roland Dreier
@ 2005-01-10 17:23 ` Zwane Mwaikambo
2005-01-10 17:31 ` Greg KH
0 siblings, 1 reply; 7+ messages in thread
From: Zwane Mwaikambo @ 2005-01-10 17:23 UTC (permalink / raw)
To: Roland Dreier; +Cc: greg, linux-kernel, tom.l.nguyen
On Mon, 10 Jan 2005, Roland Dreier wrote:
> Add "PCI:" prefixes and fix up the formatting and grammar of printks
> in drivers/pci/msi.c. The main motivation was to fix the shouting
> "MSI INIT SUCCESS" message printed when an MSI-using driver is first
> started, but while we're at it we might as well tidy up all the messages.
I reckon just get rid of that MSI init success message entirely.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] PCI: Clean up printks in msi.c
@ 2005-01-10 17:11 Roland Dreier
2005-01-10 17:23 ` Zwane Mwaikambo
0 siblings, 1 reply; 7+ messages in thread
From: Roland Dreier @ 2005-01-10 17:11 UTC (permalink / raw)
To: greg; +Cc: linux-kernel, tom.l.nguyen
Add "PCI:" prefixes and fix up the formatting and grammar of printks
in drivers/pci/msi.c. The main motivation was to fix the shouting
"MSI INIT SUCCESS" message printed when an MSI-using driver is first
started, but while we're at it we might as well tidy up all the messages.
Signed-off-by: Roland Dreier <roland@topspin.com>
Index: linux-bk/drivers/pci/msi.c
===================================================================
--- linux-bk.orig/drivers/pci/msi.c 2005-01-10 08:32:50.208912010 -0800
+++ linux-bk/drivers/pci/msi.c 2005-01-10 09:04:04.866314348 -0800
@@ -374,19 +374,19 @@
if ((status = msi_cache_init()) < 0) {
pci_msi_enable = 0;
- printk(KERN_INFO "WARNING: MSI INIT FAILURE\n");
+ printk(KERN_WARNING "PCI: MSI cache init failed\n");
return status;
}
last_alloc_vector = assign_irq_vector(AUTO_ASSIGN);
if (last_alloc_vector < 0) {
pci_msi_enable = 0;
- printk(KERN_INFO "WARNING: ALL VECTORS ARE BUSY\n");
+ printk(KERN_WARNING "PCI: No interrupt vectors available for MSI\n");
status = -EBUSY;
return status;
}
vector_irq[last_alloc_vector] = 0;
nr_released_vectors++;
- printk(KERN_INFO "MSI INIT SUCCESS\n");
+ printk(KERN_INFO "PCI: MSI subsystem initialized\n");
return status;
}
@@ -736,7 +736,9 @@
/* Check whether driver already requested for MSI-X vectors */
if ((pos = pci_find_capability(dev, PCI_CAP_ID_MSIX)) > 0 &&
!msi_lookup_vector(dev, PCI_CAP_ID_MSIX)) {
- printk(KERN_INFO "Can't enable MSI. Device already had MSI-X vectors assigned\n");
+ printk(KERN_INFO "PCI: %s: Can't enable MSI. "
+ "Device already has MSI-X vectors assigned\n",
+ pci_name(dev));
dev->irq = temp;
return -EINVAL;
}
@@ -774,9 +776,9 @@
}
if (entry->msi_attrib.state) {
spin_unlock_irqrestore(&msi_lock, flags);
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on vector->%d\n",
- dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn),
- dev->irq);
+ printk(KERN_WARNING "PCI: %s: pci_disable_msi() called without "
+ "free_irq() on MSI vector %d\n",
+ pci_name(dev), dev->irq);
BUG_ON(entry->msi_attrib.state > 0);
} else {
vector_irq[dev->irq] = 0; /* free it */
@@ -982,7 +984,9 @@
/* Check whether driver already requested for MSI vector */
if (pci_find_capability(dev, PCI_CAP_ID_MSI) > 0 &&
!msi_lookup_vector(dev, PCI_CAP_ID_MSI)) {
- printk(KERN_INFO "Can't enable MSI-X. Device already had MSI vector assigned\n");
+ printk(KERN_INFO "PCI: %s: Can't enable MSI-X. "
+ "Device already has an MSI vector assigned\n",
+ pci_name(dev));
dev->irq = temp;
return -EINVAL;
}
@@ -1050,9 +1054,9 @@
spin_unlock_irqrestore(&msi_lock, flags);
if (warning) {
dev->irq = temp;
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on all vectors\n",
- dev->bus->number, PCI_SLOT(dev->devfn),
- PCI_FUNC(dev->devfn));
+ printk(KERN_WARNING "PCI: %s: pci_disable_msix() called without "
+ "free_irq() on all MSI-X vectors\n",
+ pci_name(dev));
BUG_ON(warning > 0);
} else {
dev->irq = temp;
@@ -1088,9 +1092,9 @@
state = msi_desc[dev->irq]->msi_attrib.state;
spin_unlock_irqrestore(&msi_lock, flags);
if (state) {
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on vector->%d\n",
- dev->bus->number, PCI_SLOT(dev->devfn),
- PCI_FUNC(dev->devfn), dev->irq);
+ printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
+ "called without free_irq() on MSI vector %d\n",
+ pci_name(dev), dev->irq);
BUG_ON(state > 0);
} else /* Release MSI vector assigned to this device */
msi_free_vector(dev, dev->irq, 0);
@@ -1132,9 +1136,9 @@
iounmap(base);
release_mem_region(phys_addr, PCI_MSIX_ENTRY_SIZE *
multi_msix_capable(control));
- printk(KERN_DEBUG "Driver[%d:%d:%d] unloaded wo doing free_irq on all vectors\n",
- dev->bus->number, PCI_SLOT(dev->devfn),
- PCI_FUNC(dev->devfn));
+ printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
+ "called without free_irq() on all MSI-X vectors\n",
+ pci_name(dev));
BUG_ON(warning > 0);
}
dev->irq = temp; /* Restore IOAPIC IRQ */
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2005-01-17 23:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-01-10 18:33 [PATCH] PCI: Clean up printks in msi.c Nguyen, Tom L
-- strict thread matches above, loose matches on Subject: below --
2005-01-17 22:01 [PATCH] PCI: pci_ids.h correction for Intel ICH7 - 2.6.10-bk13 Greg KH
2005-01-17 22:01 ` [PATCH] PCI: Clean up printks in msi.c Greg KH
2005-01-10 17:11 Roland Dreier
2005-01-10 17:23 ` Zwane Mwaikambo
2005-01-10 17:31 ` Greg KH
2005-01-10 17:39 ` Roland Dreier
2005-01-12 0:37 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).