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

Commit 7b404b34 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Tony Luck
Browse files

[IA64] remove "pci=routeirq" option 



Remove "pci=routeirq" option for ia64.  This was a workaround
after ACPI IRQ routing was changed from "all at boot for everything
in _PRT" to "do it when the device is enabled" in case there were
drivers that didn't use pci_enable_device().

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 0393eed5

arch/ia64/pci/pci.c

+0 −20
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
#include <asm/hw_irq.h>





static int pci_routeirq;



/*

 * Low-level SAL-based PCI configuration access functions. Note that SAL

 * calls are already serialized (via sal_lock), so we don't need another
@@ -139,24 +137,8 @@ static void acpi_map_iosapics(void) 
static int __init

pci_acpi_init (void)

{

	struct pci_dev *dev = NULL;



	printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");



	acpi_map_iosapics();



	if (pci_routeirq) {

		/*

		 * PCI IRQ routing is set up by pci_enable_device(), but we

		 * also do it here in case there are still broken drivers that

		 * don't use pci_enable_device().

		 */

		printk(KERN_INFO "PCI: Routing interrupts for all devices because \"pci=routeirq\" specified\n");

		for_each_pci_dev(dev)

			acpi_pci_irq_enable(dev);

	} else

		printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\".  If it helps, post a report\n");



	return 0;

}
@@ -500,8 +482,6 @@ pcibios_align_resource (void *data, struct resource *res, 
char * __init

pcibios_setup (char *str)

{

	if (!strcmp(str, "routeirq"))

		pci_routeirq = 1;

	return NULL;

}