Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpiec(4): Factor out if (state == FREE) cv_signal(sc_cv). 

In principle this could have a functional change, but at worst, it is
to signal more wakeups than needed, which should always be safe.
This commit is contained in:
riastradh 2023-07-18 10:10:49 +00:00
parent 7951f6ea6b
commit aa3033d429
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/acpi/acpi_ec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_ec.c,v 1.105 2023/07/18 10:06:55 riastradh Exp $ */ /* $NetBSD: acpi_ec.c,v 1.106 2023/07/18 10:10:49 riastradh Exp $ */
/*- /*-
* Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@ -57,7 +57,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.105 2023/07/18 10:06:55 riastradh Exp $"); __KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.106 2023/07/18 10:10:49 riastradh Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_acpi_ec.h" #include "opt_acpi_ec.h"
@ -967,7 +967,6 @@ acpiec_gpe_state_machine(struct acpiec_softc *sc)
break; /* Nothing of interest here. */ break; /* Nothing of interest here. */
sc->sc_cur_val = acpiec_read_data(sc); sc->sc_cur_val = acpiec_read_data(sc);
sc->sc_state = EC_STATE_FREE; sc->sc_state = EC_STATE_FREE;
cv_signal(&sc->sc_cv);
break; break;
case EC_STATE_READ: case EC_STATE_READ:
@ -989,7 +988,6 @@ acpiec_gpe_state_machine(struct acpiec_softc *sc)
break; /* Nothing of interest here. */ break; /* Nothing of interest here. */
sc->sc_cur_val = acpiec_read_data(sc); sc->sc_cur_val = acpiec_read_data(sc);
sc->sc_state = EC_STATE_FREE; sc->sc_state = EC_STATE_FREE;
cv_signal(&sc->sc_cv);
break; break;
case EC_STATE_WRITE: case EC_STATE_WRITE:
@ -1009,9 +1007,8 @@ acpiec_gpe_state_machine(struct acpiec_softc *sc)
case EC_STATE_WRITE_VAL: case EC_STATE_WRITE_VAL:
if ((reg & EC_STATUS_IBF) != 0) if ((reg & EC_STATUS_IBF) != 0)
break; /* Nothing of interest here. */ break; /* Nothing of interest here. */
sc->sc_state = EC_STATE_FREE;
cv_signal(&sc->sc_cv);
acpiec_write_data(sc, sc->sc_cur_val); acpiec_write_data(sc, sc->sc_cur_val);
sc->sc_state = EC_STATE_FREE;
break; break;
case EC_STATE_FREE: case EC_STATE_FREE:
@ -1022,10 +1019,12 @@ acpiec_gpe_state_machine(struct acpiec_softc *sc)
} }
/* /*
* If we just ended a transaction, and an SCI was requested, * If we are not in a transaction, wake anyone waiting to start
* notify the SCI thread. * one. If an SCI was requested, notify the SCI thread that it
* needs to handle the SCI.
*/ */
if (sc->sc_state == EC_STATE_FREE) { if (sc->sc_state == EC_STATE_FREE) {
cv_signal(&sc->sc_cv);
if (reg & EC_STATUS_SCI) { if (reg & EC_STATUS_SCI) {
DPRINTF(ACPIEC_DEBUG_TRANSITION, sc, DPRINTF(ACPIEC_DEBUG_TRANSITION, sc,
"wake SCI thread\n"); "wake SCI thread\n");