Commit 1d0a92e4 authored by Andy Grover's avatar Andy Grover

Merge groveronline.com:/root/bk/linux-2.5

into groveronline.com:/root/bk/linux-acpi
parents 063e9f83 d7d51fa4
...@@ -1027,8 +1027,19 @@ void __init mp_config_ioapic_for_sci(int irq) ...@@ -1027,8 +1027,19 @@ void __init mp_config_ioapic_for_sci(int irq)
while ((void *) entry < madt_end) { while ((void *) entry < madt_end) {
if (entry->header.type == ACPI_MADT_INT_SRC_OVR && if (entry->header.type == ACPI_MADT_INT_SRC_OVR &&
acpi_fadt.sci_int == entry->global_irq) acpi_fadt.sci_int == entry->bus_irq) {
/*
* See the note at the end of ACPI 2.0b section
* 5.2.10.8 for what this is about.
*/
if (entry->bus_irq != entry->global_irq) {
acpi_fadt.sci_int = entry->global_irq;
irq = entry->global_irq;
break;
}
else
return; return;
}
entry = (struct acpi_table_int_src_ovr *) entry = (struct acpi_table_int_src_ovr *)
((unsigned long) entry + entry->header.length); ((unsigned long) entry + entry->header.length);
......
...@@ -223,6 +223,13 @@ acpi_irq(int irq, void *dev_id, struct pt_regs *regs) ...@@ -223,6 +223,13 @@ acpi_irq(int irq, void *dev_id, struct pt_regs *regs)
acpi_status acpi_status
acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context) acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context)
{ {
/*
* Ignore the irq from the core, and use the value in our copy of the
* FADT. It may not be the same if an interrupt source override exists
* for the SCI.
*/
irq = acpi_fadt.sci_int;
#ifdef CONFIG_IA64 #ifdef CONFIG_IA64
irq = gsi_to_vector(irq); irq = gsi_to_vector(irq);
#endif #endif
......
...@@ -306,6 +306,7 @@ acpi_pci_link_set ( ...@@ -306,6 +306,7 @@ acpi_pci_link_set (
memset(&resource, 0, sizeof(resource)); memset(&resource, 0, sizeof(resource));
/* NOTE: PCI interrupts are always level / active_low / shared. */ /* NOTE: PCI interrupts are always level / active_low / shared. */
if (irq <= 15) {
resource.res.id = ACPI_RSTYPE_IRQ; resource.res.id = ACPI_RSTYPE_IRQ;
resource.res.length = sizeof(struct acpi_resource); resource.res.length = sizeof(struct acpi_resource);
resource.res.data.irq.edge_level = ACPI_LEVEL_SENSITIVE; resource.res.data.irq.edge_level = ACPI_LEVEL_SENSITIVE;
...@@ -313,6 +314,18 @@ acpi_pci_link_set ( ...@@ -313,6 +314,18 @@ acpi_pci_link_set (
resource.res.data.irq.shared_exclusive = ACPI_SHARED; resource.res.data.irq.shared_exclusive = ACPI_SHARED;
resource.res.data.irq.number_of_interrupts = 1; resource.res.data.irq.number_of_interrupts = 1;
resource.res.data.irq.interrupts[0] = irq; resource.res.data.irq.interrupts[0] = irq;
}
else {
resource.res.id = ACPI_RSTYPE_EXT_IRQ;
resource.res.length = sizeof(struct acpi_resource);
resource.res.data.extended_irq.producer_consumer = ACPI_CONSUMER;
resource.res.data.extended_irq.edge_level = ACPI_LEVEL_SENSITIVE;
resource.res.data.extended_irq.active_high_low = ACPI_ACTIVE_LOW;
resource.res.data.extended_irq.shared_exclusive = ACPI_SHARED;
resource.res.data.extended_irq.number_of_interrupts = 1;
resource.res.data.extended_irq.interrupts[0] = irq;
/* ignore resource_source, it's optional */
}
resource.end.id = ACPI_RSTYPE_END_TAG; resource.end.id = ACPI_RSTYPE_END_TAG;
status = acpi_set_current_resources(link->handle, &buffer); status = acpi_set_current_resources(link->handle, &buffer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment