]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ACPI: APEI: EINJ: warn on invalid argument when explicitly indicated by platform
authorShuai Xue <xueshuai@linux.alibaba.com>
Thu, 23 Mar 2023 01:53:57 +0000 (09:53 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 27 Mar 2023 18:46:08 +0000 (20:46 +0200)
OSPM executes an EXECUTE_OPERATION action to instruct the platform to begin
the injection operation, then executes a GET_COMMAND_STATUS action to
determine the status of the completed operation. The ACPI Specification
documented error codes[1] are:

0 = Success (Linux #define EINJ_STATUS_SUCCESS)
1 = Unknown failure (Linux #define EINJ_STATUS_FAIL)
2 = Invalid Access (Linux #define EINJ_STATUS_INVAL)

The original code report -EBUSY for both "Unknown Failure" and "Invalid
Access" cases. Actually, firmware could do some platform dependent sanity
checks and returns different error codes, e.g. "Invalid Access" to indicate
to the user that the parameters they supplied cannot be used for injection.

To this end, fix to return -EINVAL in the __einj_error_inject() error
handling case instead of always -EBUSY, when explicitly indicated by the
platform in the status of the completed operation.

[1] ACPI Specification 6.5 18.6.1. Error Injection Table

Signed-off-by: Shuai Xue <xueshuai@linux.alibaba.com>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/apei/einj.c

index 39bee5a067ccd4dfa95211acf64ef7377c1e0b7a..013eb621dc92a7c11b00577a890c06fc64453a2c 100644 (file)
@@ -489,9 +489,15 @@ static int __einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,
        if (rc)
                return rc;
        val = apei_exec_ctx_get_output(&ctx);
-       if (val != EINJ_STATUS_SUCCESS)
+       if (val == EINJ_STATUS_FAIL)
                return -EBUSY;
+       else if (val == EINJ_STATUS_INVAL)
+               return -EINVAL;
 
+       /*
+        * The error is injected into the platform successfully, then it needs
+        * to trigger the error.
+        */
        rc = apei_exec_run(&ctx, ACPI_EINJ_GET_TRIGGER_TABLE);
        if (rc)
                return rc;