Skip to content

Commit bf7fc0c

Browse files
axiqiarafaeljw
authored andcommitted
ACPI: APEI: EINJ: Relax platform response timeout to 1 second
When injecting an error into the platform, the OSPM executes an EXECUTE_OPERATION action to instruct the platform to begin the injection operation. And then, the OSPM busy waits for a while by continually executing CHECK_BUSY_STATUS action until the platform indicates that the operation is complete. More specifically, the platform is limited to respond within 1 millisecond right now. This is too strict for some platforms. For example, in Arm platform, when injecting a Processor Correctable error, the OSPM will warn: Firmware does not respond in time. And a message is printed on the console: echo: write error: Input/output error We observe that the waiting time for DDR error injection is about 10 ms and that for PCIe error injection is about 500 ms in Arm platform. In this patch, we relax the response timeout to 1 second. Signed-off-by: Shuai Xue <[email protected]> Reviewed-by: Tony Luck <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 3906fe9 commit bf7fc0c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

drivers/acpi/apei/einj.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
#undef pr_fmt
2929
#define pr_fmt(fmt) "EINJ: " fmt
3030

31-
#define SPIN_UNIT 100 /* 100ns */
32-
/* Firmware should respond within 1 milliseconds */
33-
#define FIRMWARE_TIMEOUT (1 * NSEC_PER_MSEC)
31+
#define SLEEP_UNIT_MIN 1000 /* 1ms */
32+
#define SLEEP_UNIT_MAX 5000 /* 5ms */
33+
/* Firmware should respond within 1 seconds */
34+
#define FIRMWARE_TIMEOUT (1 * USEC_PER_SEC)
3435
#define ACPI5_VENDOR_BIT BIT(31)
3536
#define MEM_ERROR_MASK (ACPI_EINJ_MEMORY_CORRECTABLE | \
3637
ACPI_EINJ_MEMORY_UNCORRECTABLE | \
@@ -171,13 +172,13 @@ static int einj_get_available_error_type(u32 *type)
171172

172173
static int einj_timedout(u64 *t)
173174
{
174-
if ((s64)*t < SPIN_UNIT) {
175+
if ((s64)*t < SLEEP_UNIT_MIN) {
175176
pr_warn(FW_WARN "Firmware does not respond in time\n");
176177
return 1;
177178
}
178-
*t -= SPIN_UNIT;
179-
ndelay(SPIN_UNIT);
180-
touch_nmi_watchdog();
179+
*t -= SLEEP_UNIT_MIN;
180+
usleep_range(SLEEP_UNIT_MIN, SLEEP_UNIT_MAX);
181+
181182
return 0;
182183
}
183184

0 commit comments

Comments
 (0)