Commit c9c3e457 authored by David Shaohua Li's avatar David Shaohua Li Committed by Len Brown
Browse files

[ACPI] PNPACPI vs sound IRQ 

http://bugme.osdl.org/show_bug.cgi?id=4016



Written-by: default avatarDavid Shaohua Li <shaohua.li@intel.com>
Acked-by: default avatarAdam Belay <abelay@novell.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent acf05f4b

arch/frv/mb93090-mb00/pci-irq.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void __init pcibios_fixup_irqs(void) 
	}

}



void __init pcibios_penalize_isa_irq(int irq)

void __init pcibios_penalize_isa_irq(int irq, int active)

{

}

arch/i386/pci/irq.c

+10 −6
Original line number Diff line number Diff line
@@ -1006,24 +1006,28 @@ static int __init pcibios_irq_init(void) 
subsys_initcall(pcibios_irq_init);





static void pirq_penalize_isa_irq(int irq)

static void pirq_penalize_isa_irq(int irq, int active)

{

	/*

	 *  If any ISAPnP device reports an IRQ in its list of possible

	 *  IRQ's, we try to avoid assigning it to PCI devices.

	 */

	if (irq < 16)

	if (irq < 16) {

		if (active)

			pirq_penalty[irq] += 1000;

		else

			pirq_penalty[irq] += 100;

	}

}



void pcibios_penalize_isa_irq(int irq)

void pcibios_penalize_isa_irq(int irq, int active)

{

#ifdef CONFIG_ACPI_PCI

	if (!acpi_noirq)

		acpi_penalize_isa_irq(irq);

		acpi_penalize_isa_irq(irq, active);

	else

#endif

		pirq_penalize_isa_irq(irq);

		pirq_penalize_isa_irq(irq, active);

}



static int pirq_enable_irq(struct pci_dev *dev)

arch/i386/pci/visws.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int pci_visws_enable_irq(struct pci_dev *dev) { return 0; } 


int (*pcibios_enable_irq)(struct pci_dev *dev) = &pci_visws_enable_irq;



void __init pcibios_penalize_isa_irq(int irq) {}

void __init pcibios_penalize_isa_irq(int irq, int active) {}





unsigned int pci_bus0, pci_bus1;

drivers/acpi/pci_link.c

+5 −2
Original line number Diff line number Diff line
@@ -804,8 +804,11 @@ static int __init acpi_irq_penalty_update(char *str, int used) 
 * There is no ISA_POSSIBLE weight, so we simply use

 * the (small) PCI_USING penalty.

 */

void acpi_penalize_isa_irq(int irq)

void acpi_penalize_isa_irq(int irq, int active)

{

	if (active)

		acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;

	else

		acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;

}

drivers/pnp/pnpacpi/rsparser.c

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, 
				acpi_register_gsi(res->data.irq.interrupts[0],

					res->data.irq.edge_level,

					res->data.irq.active_high_low));

			pcibios_penalize_isa_irq(res->data.irq.interrupts[0]);

			pcibios_penalize_isa_irq(res->data.irq.interrupts[0], 1);

		}

		break;
@@ -171,7 +171,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, 
				acpi_register_gsi(res->data.extended_irq.interrupts[0],

					res->data.extended_irq.edge_level,

					res->data.extended_irq.active_high_low));

			pcibios_penalize_isa_irq(res->data.extended_irq.interrupts[0]);

			pcibios_penalize_isa_irq(res->data.extended_irq.interrupts[0], 1);

		}

		break;

	case ACPI_RSTYPE_DMA: