diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-06-22 01:07:21 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-24 02:15:09 -0400 |
commit | 20edac8ad487b784a286c1e59cc24819cb8d3b86 (patch) | |
tree | 1801d81a1164c07c6d136fd755fe181de4affa7f /arch/sparc64/kernel/pci_common.c | |
parent | e87dc35020bc555969810452f44bceaf8394eafa (diff) |
[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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci_common.c')
-rw-r--r-- | arch/sparc64/kernel/pci_common.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c index fc71b28795a0..2319d732b13e 100644 --- a/arch/sparc64/kernel/pci_common.c +++ b/arch/sparc64/kernel/pci_common.c | |||
@@ -10,6 +10,9 @@ | |||
10 | 10 | ||
11 | #include <asm/pbm.h> | 11 | #include <asm/pbm.h> |
12 | 12 | ||
13 | /* Pass "pci=irq_verbose" on the kernel command line to enable this. */ | ||
14 | int pci_irq_verbose; | ||
15 | |||
13 | /* Fix self device of BUS and hook it into BUS->self. | 16 | /* Fix self device of BUS and hook it into BUS->self. |
14 | * The pci_scan_bus does not do this for the host bridge. | 17 | * The pci_scan_bus does not do this for the host bridge. |
15 | */ | 18 | */ |
@@ -556,9 +559,10 @@ static inline unsigned int pci_slot_swivel(struct pci_pbm_info *pbm, | |||
556 | 559 | ||
557 | ret = ((interrupt - 1 + (PCI_SLOT(pdev->devfn) & 3)) & 3) + 1; | 560 | ret = ((interrupt - 1 + (PCI_SLOT(pdev->devfn) & 3)) & 3) + 1; |
558 | 561 | ||
559 | printk("%s: %s IRQ Swivel %s [%x:%x] -> [%x]\n", | 562 | if (pci_irq_verbose) |
560 | pbm->name, pci_name(toplevel_pdev), pci_name(pdev), | 563 | printk("%s: %s IRQ Swivel %s [%x:%x] -> [%x]\n", |
561 | interrupt, PCI_SLOT(pdev->devfn), ret); | 564 | pbm->name, pci_name(toplevel_pdev), pci_name(pdev), |
565 | interrupt, PCI_SLOT(pdev->devfn), ret); | ||
562 | 566 | ||
563 | return ret; | 567 | return ret; |
564 | } | 568 | } |
@@ -616,10 +620,11 @@ static inline unsigned int pci_apply_intmap(struct pci_pbm_info *pbm, | |||
616 | } | 620 | } |
617 | } | 621 | } |
618 | 622 | ||
619 | printk("%s: %s MAP BUS %s DEV %s [%x] -> [%x]\n", | 623 | if (pci_irq_verbose) |
620 | pbm->name, pci_name(toplevel_pdev), | 624 | printk("%s: %s MAP BUS %s DEV %s [%x] -> [%x]\n", |
621 | pci_name(pbus), pci_name(pdev), | 625 | pbm->name, pci_name(toplevel_pdev), |
622 | orig_interrupt, interrupt); | 626 | pci_name(pbus), pci_name(pdev), |
627 | orig_interrupt, interrupt); | ||
623 | 628 | ||
624 | no_intmap: | 629 | no_intmap: |
625 | return interrupt; | 630 | return interrupt; |
@@ -714,10 +719,11 @@ fail: | |||
714 | return 0; | 719 | return 0; |
715 | 720 | ||
716 | success: | 721 | success: |
717 | printk("%s: Routing bus[%2x] slot[%2x] to INO[%02x]\n", | 722 | if (pci_irq_verbose) |
718 | pbm->name, | 723 | printk("%s: Routing bus[%2x] slot[%2x] to INO[%02x]\n", |
719 | pdev->bus->number, PCI_SLOT(pdev->devfn), | 724 | pbm->name, |
720 | *interrupt); | 725 | pdev->bus->number, PCI_SLOT(pdev->devfn), |
726 | *interrupt); | ||
721 | return 1; | 727 | return 1; |
722 | } | 728 | } |
723 | 729 | ||