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

Commit 20447027 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files

ACPI: GPE enabling should happen after EC installation 

GPE could try to access EC region, so should not be enabled before
EC is installed

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



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent b69d3987

drivers/acpi/utilities/utxface.c

+17 −18
Original line number Diff line number Diff line
@@ -192,24 +192,6 @@ acpi_status acpi_enable_subsystem(u32 flags) 
		}

	}



	/*

	 * Complete the GPE initialization for the GPE blocks defined in the FADT

	 * (GPE block 0 and 1).

	 *

	 * Note1: This is where the _PRW methods are executed for the GPEs. These

	 * methods can only be executed after the SCI and Global Lock handlers are

	 * installed and initialized.

	 *

	 * Note2: Currently, there seems to be no need to run the _REG methods

	 * before execution of the _PRW methods and enabling of the GPEs.

	 */

	if (!(flags & ACPI_NO_EVENT_INIT)) {

		status = acpi_ev_install_fadt_gpes();

		if (ACPI_FAILURE(status)) {

			return (status);

		}

	}



	return_ACPI_STATUS(status);

}
@@ -279,6 +261,23 @@ acpi_status acpi_initialize_objects(u32 flags) 
		}

	}



	/*

	 * Complete the GPE initialization for the GPE blocks defined in the FADT

	 * (GPE block 0 and 1).

	 *

	 * Note1: This is where the _PRW methods are executed for the GPEs. These

	 * methods can only be executed after the SCI and Global Lock handlers are

	 * installed and initialized.

	 *

	 * Note2: Currently, there seems to be no need to run the _REG methods

	 * before execution of the _PRW methods and enabling of the GPEs.

	 */

	if (!(flags & ACPI_NO_EVENT_INIT)) {

		status = acpi_ev_install_fadt_gpes();

		if (ACPI_FAILURE(status))

			return (status);

	}



	/*

	 * Empty the caches (delete the cached objects) on the assumption that

	 * the table load filled them up more than they will be at runtime --