提交 20edac8a 编写于 作者: D David S. Miller

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

Allow them to be enabled with "pci=irq_verbose" on the
boot command line.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 e87dc350
...@@ -406,8 +406,14 @@ void pcibios_bus_to_resource(struct pci_dev *pdev, struct resource *res, ...@@ -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;
} }
......
...@@ -10,6 +10,9 @@ ...@@ -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,9 +559,10 @@ static inline unsigned int pci_slot_swivel(struct pci_pbm_info *pbm, ...@@ -556,9 +559,10 @@ 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;
printk("%s: %s IRQ Swivel %s [%x:%x] -> [%x]\n", if (pci_irq_verbose)
pbm->name, pci_name(toplevel_pdev), pci_name(pdev), printk("%s: %s IRQ Swivel %s [%x:%x] -> [%x]\n",
interrupt, PCI_SLOT(pdev->devfn), ret); pbm->name, pci_name(toplevel_pdev), pci_name(pdev),
interrupt, PCI_SLOT(pdev->devfn), ret);
return ret; return ret;
} }
...@@ -616,10 +620,11 @@ static inline unsigned int pci_apply_intmap(struct pci_pbm_info *pbm, ...@@ -616,10 +620,11 @@ static inline unsigned int pci_apply_intmap(struct pci_pbm_info *pbm,
} }
} }
printk("%s: %s MAP BUS %s DEV %s [%x] -> [%x]\n", if (pci_irq_verbose)
pbm->name, pci_name(toplevel_pdev), printk("%s: %s MAP BUS %s DEV %s [%x] -> [%x]\n",
pci_name(pbus), pci_name(pdev), pbm->name, pci_name(toplevel_pdev),
orig_interrupt, interrupt); pci_name(pbus), pci_name(pdev),
orig_interrupt, interrupt);
no_intmap: no_intmap:
return interrupt; return interrupt;
...@@ -714,10 +719,11 @@ static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt ...@@ -714,10 +719,11 @@ static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt
return 0; return 0;
success: success:
printk("%s: Routing bus[%2x] slot[%2x] to INO[%02x]\n", if (pci_irq_verbose)
pbm->name, printk("%s: Routing bus[%2x] slot[%2x] to INO[%02x]\n",
pdev->bus->number, PCI_SLOT(pdev->devfn), pbm->name,
*interrupt); pdev->bus->number, PCI_SLOT(pdev->devfn),
*interrupt);
return 1; return 1;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册