Message ID | 20250506213814.2365788-2-zaidal@os.amperecomputing.com |
---|---|
State | New |
Headers | show |
Series | Enable EINJv2 Support | expand |
On Tue, May 6, 2025 at 11:38 PM Zaid Alali <zaidal@os.amperecomputing.com> wrote: > > ACPI specs[1] define Error Injection Actions in hex values. > This commit intends to update values from decimal to hex to be > consistent with ACPI specs. This commit and the following one are > not to be merged and will come form ACPICA project see pull request[2]. > > Link: https://uefi.org/specs/ACPI/6.5/18_Platform_Error_Interfaces.html [1] > Link: https://github.com/acpica/acpica/pull/977 [2] > > Signed-off-by: Zaid Alali <zaidal@os.amperecomputing.com> An equivalent patch is already there in linux-next: https://web.git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=linux-next&id=5d2f7e76b70121fe06fd12315a6ea439e3bf0414 > --- > include/acpi/actbl1.h | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h > index 387fc821703a..c701c434976c 100644 > --- a/include/acpi/actbl1.h > +++ b/include/acpi/actbl1.h > @@ -1024,18 +1024,18 @@ struct acpi_einj_entry { > /* Values for Action field above */ > > enum acpi_einj_actions { > - ACPI_EINJ_BEGIN_OPERATION = 0, > - ACPI_EINJ_GET_TRIGGER_TABLE = 1, > - ACPI_EINJ_SET_ERROR_TYPE = 2, > - ACPI_EINJ_GET_ERROR_TYPE = 3, > - ACPI_EINJ_END_OPERATION = 4, > - ACPI_EINJ_EXECUTE_OPERATION = 5, > - ACPI_EINJ_CHECK_BUSY_STATUS = 6, > - ACPI_EINJ_GET_COMMAND_STATUS = 7, > - ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS = 8, > - ACPI_EINJ_GET_EXECUTE_TIMINGS = 9, > - ACPI_EINJ_ACTION_RESERVED = 10, /* 10 and greater are reserved */ > - ACPI_EINJ_TRIGGER_ERROR = 0xFF /* Except for this value */ > + ACPI_EINJ_BEGIN_OPERATION = 0x0, > + ACPI_EINJ_GET_TRIGGER_TABLE = 0x1, > + ACPI_EINJ_SET_ERROR_TYPE = 0x2, > + ACPI_EINJ_GET_ERROR_TYPE = 0x3, > + ACPI_EINJ_END_OPERATION = 0x4, > + ACPI_EINJ_EXECUTE_OPERATION = 0x5, > + ACPI_EINJ_CHECK_BUSY_STATUS = 0x6, > + ACPI_EINJ_GET_COMMAND_STATUS = 0x7, > + ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS = 0x8, > + ACPI_EINJ_GET_EXECUTE_TIMINGS = 0x9, > + ACPI_EINJ_ACTION_RESERVED = 0xA, /* 0xA and greater are reserved */ > + ACPI_EINJ_TRIGGER_ERROR = 0xFF /* Except for this value */ > }; > > /* Values for Instruction field above */ > -- > 2.43.0 >
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 387fc821703a..c701c434976c 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -1024,18 +1024,18 @@ struct acpi_einj_entry { /* Values for Action field above */ enum acpi_einj_actions { - ACPI_EINJ_BEGIN_OPERATION = 0, - ACPI_EINJ_GET_TRIGGER_TABLE = 1, - ACPI_EINJ_SET_ERROR_TYPE = 2, - ACPI_EINJ_GET_ERROR_TYPE = 3, - ACPI_EINJ_END_OPERATION = 4, - ACPI_EINJ_EXECUTE_OPERATION = 5, - ACPI_EINJ_CHECK_BUSY_STATUS = 6, - ACPI_EINJ_GET_COMMAND_STATUS = 7, - ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS = 8, - ACPI_EINJ_GET_EXECUTE_TIMINGS = 9, - ACPI_EINJ_ACTION_RESERVED = 10, /* 10 and greater are reserved */ - ACPI_EINJ_TRIGGER_ERROR = 0xFF /* Except for this value */ + ACPI_EINJ_BEGIN_OPERATION = 0x0, + ACPI_EINJ_GET_TRIGGER_TABLE = 0x1, + ACPI_EINJ_SET_ERROR_TYPE = 0x2, + ACPI_EINJ_GET_ERROR_TYPE = 0x3, + ACPI_EINJ_END_OPERATION = 0x4, + ACPI_EINJ_EXECUTE_OPERATION = 0x5, + ACPI_EINJ_CHECK_BUSY_STATUS = 0x6, + ACPI_EINJ_GET_COMMAND_STATUS = 0x7, + ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS = 0x8, + ACPI_EINJ_GET_EXECUTE_TIMINGS = 0x9, + ACPI_EINJ_ACTION_RESERVED = 0xA, /* 0xA and greater are reserved */ + ACPI_EINJ_TRIGGER_ERROR = 0xFF /* Except for this value */ }; /* Values for Instruction field above */
ACPI specs[1] define Error Injection Actions in hex values. This commit intends to update values from decimal to hex to be consistent with ACPI specs. This commit and the following one are not to be merged and will come form ACPICA project see pull request[2]. Link: https://uefi.org/specs/ACPI/6.5/18_Platform_Error_Interfaces.html [1] Link: https://github.com/acpica/acpica/pull/977 [2] Signed-off-by: Zaid Alali <zaidal@os.amperecomputing.com> --- include/acpi/actbl1.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)