Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20edac8a authored by David S. Miller's avatar David S. Miller
Browse files

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent e87dc350

arch/sparc64/kernel/pci.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -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;

}

}

arch/sparc64/kernel/pci_common.c

+17 −11
Original line number Original line Diff line number Diff line
@@ -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),