linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [BK PATCH] PCI fixes and PCI Express drivers for 2.6.11-rc1
@ 2005-01-17 22:01 Greg KH
  2005-01-17 22:01 ` [PATCH] PCI: add PCI Express Port Bus Driver subsystem Greg KH
  0 siblings, 1 reply; 17+ messages in thread
From: Greg KH @ 2005-01-17 22:01 UTC (permalink / raw)
  To: torvalds, akpm; +Cc: linux-kernel

Hi,

Here are some small PCI patches for 2.6.11-rc1, and the addition of a
new PCI Express subsystem (it's self contained, if you don't have PCI
Express, or select it, the code never gets built.)  All of these patches
have been in the past few -mm releases.

Please pull from:
	bk://kernel.bkbits.net/gregkh/linux/pci-2.6

thanks,

greg k-h

p.s. I'll send these as patches in response to this email to lkml for
those who want to see them.


 Documentation/PCIEBUS-HOWTO.txt   |  217 ++++++++++++++++++
 arch/i386/Kconfig                 |    4 
 arch/i386/pci/pcbios.c            |    4 
 drivers/Makefile                  |    2 
 drivers/pci/Makefile              |    2 
 drivers/pci/access.c              |    2 
 drivers/pci/hotplug/Kconfig       |   21 -
 drivers/pci/hotplug/pciehp.h      |    3 
 drivers/pci/hotplug/pciehp_core.c |   83 ++++--
 drivers/pci/hotplug/pciehp_hpc.c  |   21 -
 drivers/pci/msi.c                 |   39 +--
 drivers/pci/pci.c                 |    2 
 drivers/pci/pci.h                 |    2 
 drivers/pci/pcie/Kconfig          |   38 +++
 drivers/pci/pcie/Makefile         |    7 
 drivers/pci/pcie/portdrv.h        |   42 +++
 drivers/pci/pcie/portdrv_bus.c    |   88 +++++++
 drivers/pci/pcie/portdrv_core.c   |  453 ++++++++++++++++++++++++++++++++++++++
 drivers/pci/pcie/portdrv_pci.c    |  138 +++++++++++
 drivers/pci/probe.c               |   10 
 drivers/pci/remove.c              |   13 -
 drivers/pci/rom.c                 |   80 +++---
 drivers/pci/search.c              |    2 
 include/linux/pci_ids.h           |    4 
 include/linux/pcieport_if.h       |   74 ++++++
 25 files changed, 1209 insertions(+), 142 deletions(-)
-----


<jason.d.gaston:intel.com>:
  o PCI: pci_ids.h correction for Intel ICH7 - 2.6.10-bk13

Bjorn Helgaas:
  o PCI: use modern format for PCI addresses

David Howells:
  o PCI: Downgrade printk that complains about unsupported PCI PM caps

Greg Kroah-Hartman:
  o PCI: move pcie build into the drivers/pci/ subdirectory

Jesse Barnes:
  o PCI: rom.c cleanups

John Rose:
  o PCI: fix release_pcibus_dev() crash

Roland Dreier:
  o PCI: Clean up printks in msi.c

Thomas Gleixner:
  o PCI: Lock initializer cleanup - batch 4

Tom L. Nguyen:
  o PCI: add PCI Express Port Bus Driver subsystem


^ permalink raw reply	[flat|nested] 17+ messages in thread
* RE: [PATCH] PCI: Clean up printks in msi.c
@ 2005-01-10 18:33 Nguyen, Tom L
  0 siblings, 0 replies; 17+ 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] 17+ 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; 17+ 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] 17+ messages in thread

end of thread, other threads:[~2005-01-17 23:53 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-01-17 22:01 [BK PATCH] PCI fixes and PCI Express drivers for 2.6.11-rc1 Greg KH
2005-01-17 22:01 ` [PATCH] PCI: add PCI Express Port Bus Driver subsystem Greg KH
2005-01-17 22:01   ` [PATCH] PCI: use modern format for PCI addresses Greg KH
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-17 22:01         ` [PATCH] PCI: rom.c cleanups Greg KH
2005-01-17 22:01           ` [PATCH] PCI: Downgrade printk that complains about unsupported PCI PM caps Greg KH
2005-01-17 22:01             ` [PATCH] PCI: Lock initializer cleanup - batch 4 Greg KH
2005-01-17 22:01               ` [PATCH] PCI: fix release_pcibus_dev() crash Greg KH
2005-01-17 22:01                 ` PCI: move pcie build into the drivers/pci/ subdirectory Greg KH
2005-01-17 23:49   ` [PATCH] PCI: add PCI Express Port Bus Driver subsystem Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2005-01-10 18:33 [PATCH] PCI: Clean up printks in msi.c Nguyen, Tom L
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).