From: dlg <dlg@openbsd.org>
Date: Sat, 4 Mar 2023 01:23:40 +0000 (+0000)
Subject: handle polling when cold in tipmic_thermal_opreg_handler().
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c67891609a4faadaa2006b7ed8a6ab2ce32358a7;p=openbsd

handle polling when cold in tipmic_thermal_opreg_handler().

this allows me to boot if acpitz is using tipmic instead of getting
stuck. tipmic would spin on tsleep, which returns immediately with
0 when cold, waiting for a value to be set by the tipmic interrupt
handler. cos the box is cold the interrupt is masked, so the tsleep
loop never ended.

patrick@ helped me find this
ok kettenis@
---

diff --git a/sys/dev/acpi/tipmic.c b/sys/dev/acpi/tipmic.c
index afb2eb24250..0b882e594ee 100644
--- a/sys/dev/acpi/tipmic.c
+++ b/sys/dev/acpi/tipmic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tipmic.c,v 1.7 2022/04/06 18:59:27 naddy Exp $	*/
+/*	$OpenBSD: tipmic.c,v 1.8 2023/03/04 01:23:40 dlg Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -276,6 +276,25 @@ struct tipmic_regmap tipmic_thermal_regmap[] = {
 	{ 0x18, TIPMIC_SYSTEMP_HI, TIPMIC_SYSTEMP_LO }
 };
 
+static int
+tipmic_wait_adc(struct tipmic_softc *sc)
+{
+	int i;
+
+	if (!cold) {
+		return (tsleep_nsec(&sc->sc_stat_adc, PRIBIO, "tipmic",
+		    SEC_TO_NSEC(1)));
+	}
+
+	for (i = 0; i < 1000; i++) {
+		delay(1000);
+		if (tipmic_intr(sc) == 1)
+			return (0);
+	}
+
+	return (EWOULDBLOCK);
+}
+
 int
 tipmic_thermal_opreg_handler(void *cookie, int iodir, uint64_t address,
     int size, uint64_t *value)
@@ -333,8 +352,7 @@ tipmic_thermal_opreg_handler(void *cookie, int iodir, uint64_t address,
 	splx(s);
 
 	while (sc->sc_stat_adc == 0) {
-		if (tsleep_nsec(&sc->sc_stat_adc, PRIBIO, "tipmic",
-		    SEC_TO_NSEC(1))) {
+		if (tipmic_wait_adc(sc)) {
 			printf("%s: ADC timeout\n", sc->sc_dev.dv_xname);
 			break;
 		}