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

Commit 1d5d820b authored by Yazen Ghannam's avatar Yazen Ghannam Committed by Rafael J. Wysocki
Browse files

ACPI, APEI, EINJ: Subtract any matching Register Region from Trigger resources 



ACPI defines a number of instructions to use for triggering errors. However
we are currently removing the address resources from the trigger resources
for only the WRITE_REGISTER_VALUE instruction. This leads to a resource
conflict for any other valid instruction.

Check that the instruction is less than or equal to the
WRITE_REGISTER_VALUE instruction. This allows all valid memory access
instructions and protects against invalid instructions.

Fixes: b4e008dc (ACPI, APEI, EINJ, Refine the fix of resource conflict)
Signed-off-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c4335fdd

drivers/acpi/apei/einj.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static struct acpi_generic_address *einj_get_trigger_parameter_region( 
		((char *)trigger_tab + sizeof(struct acpi_einj_trigger));

	for (i = 0; i < trigger_tab->entry_count; i++) {

		if (entry->action == ACPI_EINJ_TRIGGER_ERROR &&

		entry->instruction == ACPI_EINJ_WRITE_REGISTER_VALUE &&

		entry->instruction <= ACPI_EINJ_WRITE_REGISTER_VALUE &&

		entry->register_region.space_id ==

			ACPI_ADR_SPACE_SYSTEM_MEMORY &&

		(entry->register_region.address & param2) == (param1 & param2))