 @@ -1,33 +1,33 @@
-/*	$NetBSD: si70xx.c,v 1.9 2021/11/11 14:16:04 brad Exp $	*/
+/*	$NetBSD: si70xx.c,v 1.10 2021/11/12 15:12:11 brad Exp $	*/
 /*
  * Copyright (c) 2017 Brad Spencer <brad@anduin.eldar.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: si70xx.c,v 1.9 2021/11/11 14:16:04 brad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: si70xx.c,v 1.10 2021/11/12 15:12:11 brad Exp $");
 /*
   Driver for the Silicon Labs SI7013/SI7020/SI7021, HTU21D and SHT21
 */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
 #include <sys/mutex.h>
 @@ -599,40 +599,41 @@ si70xx_match(device_t parent, cfdata_t m
+}
 static void
 si70xx_attach(device_t parent, device_t self, void *aux)
+{
 	struct si70xx_sc *sc;
 	struct i2c_attach_args *ia;
 	int error, i;
 	int ecount = 0;
 	uint8_t buf[8];
 	uint8_t testcrcpt1[4];
 	uint8_t testcrcpt2[4];
 	uint8_t crc1 = 0, crc2 = 0;
 	bool validcrcpt1, validcrcpt2;
 	uint8_t readcrc1 = 0, readcrc2 = 0;
 	uint8_t fwversion = 0, model, heaterregister;
 	ia = aux;
 	sc = device_private(self);
 	sc->sc_dev = self;
 	sc->sc_tag = ia->ia_tag;
 	sc->sc_addr = ia->ia_addr;
 	sc->sc_si70xxdebug = 0;
 #ifdef HAVE_I2C_EXECV
 	sc->sc_clockstretch = 2048;
 #endif
-	sc->sc_readattempts = 25;
+	sc->sc_readattempts = 40;
 	sc->sc_ignorecrc = false;
 	sc->sc_sme = NULL;
 	sc->sc_noheater = false;
 	sc->sc_nofw = false;
 	aprint_normal("\n");
 	mutex_init(&sc->sc_mutex, MUTEX_DEFAULT, IPL_NONE);
 	sc->sc_numsensors = __arraycount(si70xx_sensors);
 	if ((sc->sc_sme = sysmon_envsys_create()) == NULL) {
 		aprint_error_dev(self,
 		    "Unable to create sysmon structure\n");
 @@ -655,68 +656,95 @@ si70xx_attach(device_t parent, device_t
 	error = si70xx_cmd2(sc, SI70XX_READ_ID_PT1A, SI70XX_READ_ID_PT1B,
 	    buf, 8);
 	if (error) {
 		aprint_error_dev(self, "Failed to read first part of ID: %d\n",
 		    error);
 		ecount++;
+	}
 	testcrcpt1[0] = buf[0];
 	testcrcpt1[1] = buf[2];
 	testcrcpt1[2] = buf[4];
 	testcrcpt1[3] = buf[6];
 	readcrc1 = buf[7];
 	crc1 = si70xx_crc(testcrcpt1, 4);
 	/* A "real" SI70xx has the CRC cover the entire first part of the
 	 * serial number.  An HTU21D has the CRC broken out into each
 	 * part of the serial number.
 	 */
 	validcrcpt1 = (readcrc1 == crc1);
 	if (! validcrcpt1) {
 		validcrcpt1 = (si70xx_crc(&testcrcpt1[0],1) == buf[1] &&
 		    si70xx_crc(&testcrcpt1[1],1) == buf[3] &&
 		    si70xx_crc(&testcrcpt1[2],1) == buf[5] &&
 		    si70xx_crc(&testcrcpt1[3],1) == buf[7]);
 		DPRINTF(sc, 2, ("%s: Part 1 SN CRC was not valid for real type, "
 		    "check clone: %d\n", device_xname(sc->sc_dev), validcrcpt1));
+	}
 	DPRINTF(sc, 2, ("%s: read 1 values: %02x%02x%02x%02x%02x%02x%02x%02x "
-	    "- %02x\n", device_xname(sc->sc_dev), buf[0], buf[1],
+	    "- %02x -- %d\n", device_xname(sc->sc_dev), buf[0], buf[1],
 	    buf[2], buf[3], buf[4], buf[5], buf[6], buf[7],
-	    crc1));
+	    crc1, validcrcpt1));
 	error = si70xx_cmd2(sc, SI70XX_READ_ID_PT2A, SI70XX_READ_ID_PT2B,
 	    buf, 8);
 	if (error != 0) {
 		aprint_error_dev(self, "Failed to read second part of ID: %d\n",
 		    error);
 		ecount++;
+	}
 	model = testcrcpt2[0] = buf[0];
 	testcrcpt2[1] = buf[1];
 	testcrcpt2[2] = buf[3];
 	testcrcpt2[3] = buf[4];
 	readcrc2 = buf[5];
 	crc2 = si70xx_crc(testcrcpt2, 4);
 	/* It is even stranger for this part of the serial number.  A "real"
 	 * SI70XX will have a single CRC for the entire second part, but
 	 * an HTU21D has a CRC for each word in this case.
+	 *
 	 * The datasheet actually agrees with the HTU21D case, and not the "real"
 	 * chip.
 	 */
 	validcrcpt2 = (readcrc2 == crc2);
 	if (! validcrcpt2) {
 		validcrcpt2 = (si70xx_crc(&testcrcpt2[0],2) == buf[2] &&
 		    si70xx_crc(&testcrcpt2[2],2) == buf[5]);
 		DPRINTF(sc, 2, ("%s: Part 2 SN CRC was not valid for real type, "
 		    "check clone: %d\n", device_xname(sc->sc_dev), validcrcpt2));
+	}
-	DPRINTF(sc, 2, ("%s: read 2 values: %02x%02x%02x%02x%02x%02x - %02x\n",
+	DPRINTF(sc, 2, ("%s: read 2 values: %02x%02x%02x%02x%02x%02x - %02x -- %d\n",
 	    device_xname(sc->sc_dev), buf[0], buf[1], buf[2],
-	    buf[3], buf[4], buf[5], crc2));
+	    buf[3], buf[4], buf[5], crc2, validcrcpt2));
 	error = si70xx_cmd2(sc, SI70XX_READ_FW_VERA, SI70XX_READ_FW_VERB,
 	    buf, 8);
 	if (error) {
-		aprint_error_dev(self, "Failed to read firmware version: %d\n",
+		aprint_error_dev(self, "Failed to read firmware version: Error %d\n",
 		    error);
 		sc->sc_nofw = true;
+	}
 	if (! sc->sc_nofw) {
 		fwversion = buf[0];
 		DPRINTF(sc, 2, ("%s: read fw values: %#x\n", device_xname(sc->sc_dev),
 		    fwversion));
+	}
 	error = si70xx_cmd1(sc, SI70XX_READ_HEATER_REG, &heaterregister, 1);
 	if (error) {
-		aprint_error_dev(self, "Failed to read heater register: %d\n",
+		aprint_error_dev(self, "Failed to read heater register: Error %d\n",
 		    error);
 		sc->sc_noheater = true;
+	}
 	error = si70xx_update_status(sc);
 	iic_release_bus(sc->sc_tag, 0);
 	if ((error = si70xx_sysctl_init(sc)) != 0) {
 		aprint_error_dev(self, "Can't setup sysctl tree (%d)\n", error);
 		goto out;
+	}
 @@ -749,31 +777,26 @@ si70xx_attach(device_t parent, device_t
 	sc->sc_sme->sme_name = device_xname(sc->sc_dev);
 	sc->sc_sme->sme_cookie = sc;
 	sc->sc_sme->sme_refresh = si70xx_refresh;
 	DPRINTF(sc, 2, ("si70xx_attach: registering with envsys\n"));
 	if (sysmon_envsys_register(sc->sc_sme)) {
 		aprint_error_dev(self,
 			"unable to register with sysmon\n");
 		sysmon_envsys_destroy(sc->sc_sme);
 		sc->sc_sme = NULL;
 		return;
+	}
 	if (ecount != 0) {
 		aprint_normal_dev(self, "Could not read model, "
 		    "probably an HTU21D\n");
 		return;
 	char modelstr[64];
 	switch (model) {
 	case 0:
 	case 0xff:
 		snprintf(modelstr, sizeof(modelstr), "Engineering Sample");
 		break;
 	case 13:
 	case 20:
 	case 21:
 		snprintf(modelstr, sizeof(modelstr), "SI70%d", model);
 		break;
 	default:
 @@ -790,27 +813,27 @@ si70xx_attach(device_t parent, device_t
 		fwversionstr = "2.0";
 		break;
 	default:
 		fwversionstr = "unknown";
 		break;
+	}
 	aprint_normal_dev(self, "Silicon Labs Model: %s, "
 	    "Firmware version: %s, "
 	    "Serial number: %02x%02x%02x%02x%02x%02x%02x%02x%s",
 	    modelstr, fwversionstr, testcrcpt1[0], testcrcpt1[1],
 	    testcrcpt1[2], testcrcpt1[3], testcrcpt2[0], testcrcpt2[1],
 	    testcrcpt2[2], testcrcpt2[3],
-	    (crc1 == readcrc1 && crc2 == readcrc2) ? "\n" : " (bad crc)\n");
+	    (validcrcpt1 && validcrcpt2) ? "\n" : " (bad crc)\n");
 	return;
 out:
 	sysmon_envsys_destroy(sc->sc_sme);
 	sc->sc_sme = NULL;
+}
 static int
 si70xx_exec(struct si70xx_sc *sc, uint8_t cmd, envsys_data_t *edata)
+{
 	int error;
 	int xdelay;
 	const char *name;
 	int64_t mul, offs;

 @@ -1,14 +1,14 @@
-.\" $NetBSD: si70xxtemp.4,v 1.6 2021/11/11 14:24:24 wiz Exp $
+.\" $NetBSD: si70xxtemp.4,v 1.7 2021/11/12 15:12:11 brad Exp $
 .\"
 .\" Copyright (c) 2017 Brad Spencer <brad@anduin.eldar.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
 .\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 @@ -62,27 +62,27 @@ Some HTU21D chips do not support a heate
 These chips are detected and the heater features of the driver will
 be disabled.
 .It hw.si70xxtemp0.debug
 If the driver is compiled with
 .Dv SI70XX_DEBUG ,
 this node will appear and can be used to set the debugging level.
 .It hw.si70xxtemp0.readattempts
 To read %RH or temperature the driver uses a No Hold Master command.
 This command needs to be sent to the device, a wait must then occur
 and then another read command is sent to read back the values.
 Depending on the resolution, and other factors, the wait time varies.
 The driver will attempt to read back the values readattempts number of
 times.
-The default is 25 which should be more than enough for most purposes.
+The default is 40 which should be enough for most purposes.
 There is an initial wait of 10,500 microseconds followed by
 a additional 1,000 microseconds per read attempt.
 .El
 .Sh SEE ALSO
 .Xr envsys 4 ,
 .Xr iic 4 ,
 .Xr envstat 8 ,
 .Xr sysctl 8
 .Sh HISTORY
 The
 .Nm
 driver first appeared in
 .Nx 8.0 .