[PATCH v2 1/4] platform/x86: dell: dcdbas: Actually wait for the host control SMI
From: Rosen Penev
Date: Mon Nov 16 2026 - 15:41:06 EST
For SMI types 2 and 3, host_control_smi() writes the command status as
-1, raises the SMI and then waits for the BIOS to change the status:
while (apm_cmd->status == ESM_STATUS_CMD_UNSUCCESSFUL) {
apm_cmd->status is a plain memory read, and neither outb() nor inb()
tells the compiler that memory may have changed, so the compiler
assumes status is still -1. The loop then has no side effects and its
return value is not used, so it is removed entirely: in the generated
code, the read of the control port is followed directly by the return.
The kernel goes on to power off right after raising the host control
SMI, without waiting for the BIOS to accept it.
The type 1 wait polls the APM status port instead, in a loop that
counts down TIMEOUT_USEC_SHORT_SEMA_BLOCKING iterations and relies on
each inb() taking about a microsecond.
Convert both waits to read_poll_timeout_atomic(), using READ_ONCE() for
the status in memory and inb() for the status port, 1us apart for up to
TIMEOUT_USEC_SHORT_SEMA_BLOCKING microseconds as the name suggests, and
return its error. That is -ETIMEDOUT rather than -ETIME, but both
callers ignore the return value. With the delay plus the port read, the
type 1 worst-case wait grows from about 10ms to about 20ms, which only
matters when the BIOS never answers.
This removes the last users of num_ticks and EXPIRED_TIMER.
Fixes: 90563ec4129f ("[PATCH] dcdbas: add Dell Systems Management Base Driver with sysfs support")
Signed-off-by: Rosen Penev <rosenp@xxxxxxxxx>
---
drivers/platform/x86/dell/dcdbas.c | 28 ++++++++++++++--------------
drivers/platform/x86/dell/dcdbas.h | 1 -
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/platform/x86/dell/dcdbas.c b/drivers/platform/x86/dell/dcdbas.c
index 678f44252a45..69365627fd8f 100644
--- a/drivers/platform/x86/dell/dcdbas.c
+++ b/drivers/platform/x86/dell/dcdbas.c
@@ -20,7 +20,7 @@
#include <linux/cpu.h>
#include <linux/gfp.h>
#include <linux/init.h>
-#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/kernel.h>
#include <linux/mc146818rtc.h>
#include <linux/module.h>
@@ -377,9 +377,9 @@ static int host_control_smi(void)
struct apm_cmd *apm_cmd;
u8 *data;
unsigned long flags;
- u32 num_ticks;
s8 cmd_status;
u8 index;
+ int ret;
apm_cmd = (struct apm_cmd *)smi_buf.virt;
apm_cmd->status = ESM_STATUS_CMD_UNSUCCESSFUL;
@@ -407,12 +407,12 @@ static int host_control_smi(void)
spin_unlock_irqrestore(&rtc_lock, flags);
/* wait a few to see if it executed */
- num_ticks = TIMEOUT_USEC_SHORT_SEMA_BLOCKING;
- while ((s8)inb(PCAT_APM_STATUS_PORT) == ESM_STATUS_CMD_UNSUCCESSFUL) {
- num_ticks--;
- if (num_ticks == EXPIRED_TIMER)
- return -ETIME;
- }
+ ret = read_poll_timeout_atomic(inb, cmd_status,
+ cmd_status != ESM_STATUS_CMD_UNSUCCESSFUL,
+ 1, TIMEOUT_USEC_SHORT_SEMA_BLOCKING,
+ false, PCAT_APM_STATUS_PORT);
+ if (ret)
+ return ret;
break;
case HC_SMITYPE_TYPE2:
@@ -441,12 +441,12 @@ static int host_control_smi(void)
cmd_status = inb(PE1400_APM_CONTROL_PORT);
/* wait a few to see if it executed */
- num_ticks = TIMEOUT_USEC_SHORT_SEMA_BLOCKING;
- while (apm_cmd->status == ESM_STATUS_CMD_UNSUCCESSFUL) {
- num_ticks--;
- if (num_ticks == EXPIRED_TIMER)
- return -ETIME;
- }
+ ret = read_poll_timeout_atomic(READ_ONCE, cmd_status,
+ cmd_status != ESM_STATUS_CMD_UNSUCCESSFUL,
+ 1, TIMEOUT_USEC_SHORT_SEMA_BLOCKING,
+ false, apm_cmd->status);
+ if (ret)
+ return ret;
break;
default:
diff --git a/drivers/platform/x86/dell/dcdbas.h b/drivers/platform/x86/dell/dcdbas.h
index a05d7f667586..d5ad2363dd9e 100644
--- a/drivers/platform/x86/dell/dcdbas.h
+++ b/drivers/platform/x86/dell/dcdbas.h
@@ -42,7 +42,6 @@
#define MAX_SYSMGMT_LONGCMD_SGENTRY_NUM (16)
#define TIMEOUT_USEC_SHORT_SEMA_BLOCKING (10000)
-#define EXPIRED_TIMER (0)
#define SMI_CMD_MAGIC (0x534D4931)
#define SMM_EPS_SIG "$SCB"
--
2.56.1