mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
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: b4e008dc53 (ACPI, APEI, EINJ, Refine the fix of resource conflict)
Signed-off-by: Yazen Ghannam <[email protected]>
Acked-by: Tony Luck <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
This commit is contained in:
parent
c4335fdd38
commit
1d5d820b8f
1 changed files with 1 additions and 1 deletions
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Reference in a new issue