 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_ec.c,v 1.94 2023/07/18 10:04:40 riastradh Exp $	*/
+/*	$NetBSD: acpi_ec.c,v 1.95 2023/07/18 10:04:50 riastradh Exp $	*/
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
 @@ -47,27 +47,27 @@
  * working and the handlers just busy loop.
+ *
  * A callout is scheduled to compensate for missing interrupts on some
  * hardware.  If the EC doesn't process a request for 5s, it is most likely
  * in a wedged state.  No method to reset the EC is currently known.
+ *
  * Special care has to be taken to not poll the EC in a busy loop without
  * delay.  This can prevent processing of Power Button events. At least some
  * Lenovo Thinkpads seem to be implement the Power Button Override in the EC
  * and the only option to recover on those models is to cut off all power.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.94 2023/07/18 10:04:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.95 2023/07/18 10:04:50 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_acpi_ec.h"
 #endif
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/condvar.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 @@ -685,37 +685,41 @@ acpiec_read(device_t dv, uint8_t addr, u
 	if (cold || acpiec_cold) {
 		while (sc->sc_state != EC_STATE_FREE && timeo-- > 0) {
 			delay(1000);
 			acpiec_gpe_state_machine(dv);
+		}
 		if (sc->sc_state != EC_STATE_FREE) {
 			mutex_exit(&sc->sc_mtx);
 			acpiec_unlock(dv);
 			aprint_error_dev(dv, "command timed out, state %d\n",
 			    sc->sc_state);
 			return AE_ERROR;
+		}
-	} else if (cv_timedwait(&sc->sc_cv, &sc->sc_mtx, EC_CMD_TIMEOUT * hz)) {
+	} else {
-		/*
+		const unsigned deadline = getticks() + EC_CMD_TIMEOUT*hz;
-		 * XXX while (sc->sc_state != EC_STATE_FREE)
+		unsigned delta;
 		 *	cv_timedwait(...),
-		 * plus deadline
+		while (sc->sc_state != EC_STATE_FREE &&
-		 */
+		    (delta = deadline - getticks()) < INT_MAX)
-		mutex_exit(&sc->sc_mtx);
+			(void)cv_timedwait(&sc->sc_cv, &sc->sc_mtx, delta);
-		acpiec_unlock(dv);
+		if (sc->sc_state != EC_STATE_FREE) {
-		aprint_error_dev(dv,
+			mutex_exit(&sc->sc_mtx);
-		    "command takes over %d sec...\n", EC_CMD_TIMEOUT);
+			acpiec_unlock(dv);
-		return AE_ERROR;
+			aprint_error_dev(dv,
 			    "command takes over %d sec...\n",
 			    EC_CMD_TIMEOUT);
 			return AE_ERROR;
+		}
+	}
 done:
 	DPRINTF(ACPIEC_DEBUG_RW, sc,
 	    "pid %ld %s, lid %ld%s%s: read addr 0x%"PRIx8": 0x%"PRIx8"\n",
 	    (long)curproc->p_pid, curproc->p_comm,
 	    (long)curlwp->l_lid, curlwp->l_name ? " " : "",
 	    curlwp->l_name ? curlwp->l_name : "",
 	    addr, sc->sc_cur_val);
 	*val = sc->sc_cur_val;
 	mutex_exit(&sc->sc_mtx);
 @@ -754,37 +758,41 @@ acpiec_write(device_t dv, uint8_t addr,
 	if (cold || acpiec_cold) {
 		while (sc->sc_state != EC_STATE_FREE && timeo-- > 0) {
 			delay(1000);
 			acpiec_gpe_state_machine(dv);
+		}
 		if (sc->sc_state != EC_STATE_FREE) {
 			mutex_exit(&sc->sc_mtx);
 			acpiec_unlock(dv);
 			aprint_error_dev(dv, "command timed out, state %d\n",
 			    sc->sc_state);
 			return AE_ERROR;
+		}
-	} else if (cv_timedwait(&sc->sc_cv, &sc->sc_mtx, EC_CMD_TIMEOUT * hz)) {
+	} else {
-		/*
+		const unsigned deadline = getticks() + EC_CMD_TIMEOUT*hz;
-		 * XXX while (sc->sc_state != EC_STATE_FREE)
+		unsigned delta;
 		 *	cv_timedwait(...),
-		 * plus deadline
+		while (sc->sc_state != EC_STATE_FREE &&
-		 */
+		    (delta = deadline - getticks()) < INT_MAX)
-		mutex_exit(&sc->sc_mtx);
+			(void)cv_timedwait(&sc->sc_cv, &sc->sc_mtx, delta);
-		acpiec_unlock(dv);
+		if (sc->sc_state != EC_STATE_FREE) {
-		aprint_error_dev(dv,
+			mutex_exit(&sc->sc_mtx);
-		    "command takes over %d sec...\n", EC_CMD_TIMEOUT);
+			acpiec_unlock(dv);
-		return AE_ERROR;
+			aprint_error_dev(dv,
 			    "command takes over %d sec...\n",
 			    EC_CMD_TIMEOUT);
 			return AE_ERROR;
+		}
+	}
 done:
 	DPRINTF(ACPIEC_DEBUG_RW, sc,
 	    "pid %ld %s, lid %ld%s%s: write addr 0x%"PRIx8": 0x%"PRIx8
 	    " done\n",
 	    (long)curproc->p_pid, curproc->p_comm,
 	    (long)curlwp->l_lid, curlwp->l_name ? " " : "",
 	    curlwp->l_name ? curlwp->l_name : "",
 	    addr, val);
 	mutex_exit(&sc->sc_mtx);
 	acpiec_unlock(dv);