Module Name: src
Committed By: riastradh
Date: Tue Jul 18 10:03:59 UTC 2023
Modified Files:
src/sys/dev/acpi: acpi_ec.c
Log Message:
acpiec(4): Assert state is free when we start a transaction.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/acpi/acpi_ec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.90 src/sys/dev/acpi/acpi_ec.c:1.91
--- src/sys/dev/acpi/acpi_ec.c:1.90 Tue Jul 18 10:03:46 2023
+++ src/sys/dev/acpi/acpi_ec.c Tue Jul 18 10:03:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.90 2023/07/18 10:03:46 riastradh Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.91 2023/07/18 10:03:59 riastradh Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <[email protected]>.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.90 2023/07/18 10:03:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.91 2023/07/18 10:03:59 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_acpi_ec.h"
@@ -671,6 +671,8 @@ acpiec_read(device_t dv, uint8_t addr, u
curlwp->l_name ? curlwp->l_name : "",
addr);
+ KASSERT(sc->sc_state == EC_STATE_FREE);
+
sc->sc_cur_addr = addr;
sc->sc_state = EC_STATE_READ;
@@ -737,6 +739,8 @@ acpiec_write(device_t dv, uint8_t addr,
curlwp->l_name ? curlwp->l_name : "",
addr, val);
+ KASSERT(sc->sc_state == EC_STATE_FREE);
+
sc->sc_cur_addr = addr;
sc->sc_cur_val = val;
sc->sc_state = EC_STATE_WRITE;
@@ -899,6 +903,8 @@ loop:
DPRINTF(ACPIEC_DEBUG_QUERY, sc, "SCI query\n");
+ KASSERT(sc->sc_state == EC_STATE_FREE);
+
/* The Query command can always be issued, so be defensive here. */
sc->sc_got_sci = false;
sc->sc_state = EC_STATE_QUERY;
