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

Commit 7bdd21ce authored by Len Brown's avatar Len Brown
Browse files

Revert "ACPI: SCI interrupt source override" 

This reverts commit 281ea49b,
which broke ACPI Interrupt source overrides that move
the SCI from one IRQ in PIC mode to another in IOAPIC mode.

If the SCI shared an interrupt line with another device,
this would result in a "irq 18: nobody cared" type failure.

http://bugzilla.kernel.org/show_bug.cgi?id=7601



Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 0215ffb0

arch/i386/kernel/acpi/boot.c

+5 −5
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end) 
/*

 * Parse Interrupt Source Override for the ACPI SCI

 */

static void acpi_sci_ioapic_setup(u32 bus_irq, u32 gsi, u16 polarity, u16 trigger)

static void acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)

{

	if (trigger == 0)	/* compatible SCI trigger is level */

		trigger = 3;
@@ -353,13 +353,13 @@ static void acpi_sci_ioapic_setup(u32 bus_irq, u32 gsi, u16 polarity, u16 trigge 
	 * If GSI is < 16, this will update its flags,

	 * else it will create a new mp_irqs[] entry.

	 */

	mp_override_legacy_irq(bus_irq, polarity, trigger, gsi);

	mp_override_legacy_irq(gsi, polarity, trigger, gsi);



	/*

	 * stash over-ride to indicate we've been here

	 * and for later update of acpi_fadt

	 */

	acpi_sci_override_gsi = bus_irq;

	acpi_sci_override_gsi = gsi;

	return;

}
@@ -377,7 +377,7 @@ acpi_parse_int_src_ovr(acpi_table_entry_header * header, 
	acpi_table_print_madt_entry(header);



	if (intsrc->bus_irq == acpi_fadt.sci_int) {

		acpi_sci_ioapic_setup(intsrc->bus_irq, intsrc->global_irq,

		acpi_sci_ioapic_setup(intsrc->global_irq,

				      intsrc->flags.polarity,

				      intsrc->flags.trigger);

		return 0;
@@ -880,7 +880,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
	 * pretend we got one so we can set the SCI flags.

	 */

	if (!acpi_sci_override_gsi)

		acpi_sci_ioapic_setup(acpi_fadt.sci_int, acpi_fadt.sci_int, 0, 0);

		acpi_sci_ioapic_setup(acpi_fadt.sci_int, 0, 0);



	/* Fill in identity legacy mapings where no override */

	mp_config_acpi_legacy_irqs();