lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SPARC64]: Disable verbose PCI IRQ probing messages by default.

Browse Source 
Allow them to be enabled with "pci=irq_verbose" on the
boot command line.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2006-06-21 22:07:21 -07:00
parent e87dc35020
commit 20edac8ad4
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sparc64/kernel/pci.c
View File

@@ -406,8 +406,14 @@ void pcibios_bus_to_resource(struct pci_dev *pdev, struct resource *res,
} }
EXPORT_SYMBOL(pcibios_bus_to_resource); EXPORT_SYMBOL(pcibios_bus_to_resource);
extern int pci_irq_verbose;
char * __init pcibios_setup(char *str) char * __init pcibios_setup(char *str)
{ {
if (!strcmp(str, "irq_verbose")) {
pci_irq_verbose = 1;
return NULL;
}
return str; return str;
} }

6
arch/sparc64/kernel/pci_common.c
View File

@@ -10,6 +10,9 @@
#include <asm/pbm.h> #include <asm/pbm.h>
/* Pass "pci=irq_verbose" on the kernel command line to enable this. */
int pci_irq_verbose;
/* Fix self device of BUS and hook it into BUS->self. /* Fix self device of BUS and hook it into BUS->self.
* The pci_scan_bus does not do this for the host bridge. * The pci_scan_bus does not do this for the host bridge.
*/ */
@@ -556,6 +559,7 @@ static inline unsigned int pci_slot_swivel(struct pci_pbm_info *pbm,
ret = ((interrupt - 1 + (PCI_SLOT(pdev->devfn) & 3)) & 3) + 1; ret = ((interrupt - 1 + (PCI_SLOT(pdev->devfn) & 3)) & 3) + 1;
if (pci_irq_verbose)
printk("%s: %s IRQ Swivel %s [%x:%x] -> [%x]\n", printk("%s: %s IRQ Swivel %s [%x:%x] -> [%x]\n",
pbm->name, pci_name(toplevel_pdev), pci_name(pdev), pbm->name, pci_name(toplevel_pdev), pci_name(pdev),
interrupt, PCI_SLOT(pdev->devfn), ret); interrupt, PCI_SLOT(pdev->devfn), ret);
@@ -616,6 +620,7 @@ static inline unsigned int pci_apply_intmap(struct pci_pbm_info *pbm,
} }
} }
if (pci_irq_verbose)
printk("%s: %s MAP BUS %s DEV %s [%x] -> [%x]\n", printk("%s: %s MAP BUS %s DEV %s [%x] -> [%x]\n",
pbm->name, pci_name(toplevel_pdev), pbm->name, pci_name(toplevel_pdev),
pci_name(pbus), pci_name(pdev), pci_name(pbus), pci_name(pdev),
@@ -714,6 +719,7 @@ fail:
return 0; return 0;
success: success:
if (pci_irq_verbose)
printk("%s: Routing bus[%2x] slot[%2x] to INO[%02x]\n", printk("%s: Routing bus[%2x] slot[%2x] to INO[%02x]\n",
pbm->name, pbm->name,
pdev->bus->number, PCI_SLOT(pdev->devfn), pdev->bus->number, PCI_SLOT(pdev->devfn),