 @@ -1,680 +1,879 @@
-/*	$NetBSD: i2c.c,v 1.60 2018/06/07 05:56:18 thorpej Exp $	*/
+/*	$NetBSD: i2c.c,v 1.61 2018/06/07 13:30:49 thorpej Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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 the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed for the NetBSD Project by
  *      Wasabi Systems, Inc.
  * 4. The name of Wasabi Systems, Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef _KERNEL_OPT
 #include "opt_i2c.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.60 2018/06/07 05:56:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.61 2018/06/07 13:30:49 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/event.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/module.h>
 #include <sys/once.h>
 #include <sys/mutex.h>
 #include <dev/i2c/i2cvar.h>
 #include "ioconf.h"
 #include "locators.h"
 #ifndef I2C_MAX_ADDR
 #define I2C_MAX_ADDR	0x3ff	/* 10-bit address, max */
 #endif
 struct iic_softc {
 	device_t sc_dev;
 	i2c_tag_t sc_tag;
 	int sc_type;
 	device_t sc_devices[I2C_MAX_ADDR + 1];
 };
 static dev_type_open(iic_open);
 static dev_type_close(iic_close);
 static dev_type_ioctl(iic_ioctl);
 int iic_init(void);
 kmutex_t iic_mtx;
 int iic_refcnt;
 ONCE_DECL(iic_once);
 const struct cdevsw iic_cdevsw = {
 	.d_open = iic_open,
 	.d_close = iic_close,
 	.d_read = noread,
 	.d_write = nowrite,
 	.d_ioctl = iic_ioctl,
 	.d_stop = nostop,
 	.d_tty = notty,
 	.d_poll = nopoll,
 	.d_mmap = nommap,
 	.d_kqfilter = nokqfilter,
 	.d_discard = nodiscard,
 	.d_flag = D_OTHER
 };
 static void	iic_smbus_intr_thread(void *);
 static void	iic_fill_compat(struct i2c_attach_args*, const char*,
 			size_t, char **);
 static int
 iic_print_direct(void *aux, const char *pnp)
+{
 	struct i2c_attach_args *ia = aux;
 	if (pnp != NULL)
 		aprint_normal("%s at %s addr 0x%02x", ia->ia_name, pnp,
 			ia->ia_addr);
 	else
 		aprint_normal(" addr 0x%02x", ia->ia_addr);
 	return UNCONF;
+}
 static int
 iic_print(void *aux, const char *pnp)
+{
 	struct i2c_attach_args *ia = aux;
 	if (ia->ia_addr != (i2c_addr_t)IICCF_ADDR_DEFAULT)
 		aprint_normal(" addr 0x%x", ia->ia_addr);
 	return UNCONF;
+}
 static bool
 iic_is_special_address(i2c_addr_t addr)
+{
 	/*
 	 * See: https://www.i2c-bus.org/addressing/
 	 */
 	/* General Call (read) / Start Byte (write) */
 	if (addr == 0x00)
 		return (true);
 	/* CBUS Addresses */
 	if (addr == 0x01)
 		return (true);
 	/* Reserved for Different Bus Formats */
 	if (addr == 0x02)
 		return (true);
 	/* Reserved for future purposes */
 	if (addr == 0x03)
 		return (true);
 	/* High Speed Master Code */
 	if ((addr & 0x7c) == 0x04)
 		return (true);
 	/* 10-bit Slave Addressing prefix */
 	if ((addr & 0x7c) == 0x78)
 		return (true);
 	/* Reserved for future purposes */
 	if ((addr & 0x7c) == 0x7c)
 		return (true);
 	return (false);
+}
 static int
 iic_probe_none(struct iic_softc *sc,
 	       const struct i2c_attach_args *ia, int flags)
+{
 	return (0);
+}
 static int
 iic_probe_smbus_quick_write(struct iic_softc *sc,
 			    const struct i2c_attach_args *ia, int flags)
+{
 	int error;
 	if ((error = iic_acquire_bus(ia->ia_tag, flags)) == 0) {
 		error = iic_smbus_quick_write(ia->ia_tag, ia->ia_addr, flags);
+	}
 	(void) iic_release_bus(ia->ia_tag, flags);
 	return (error);
+}
 static int
 iic_probe_smbus_receive_byte(struct iic_softc *sc,
 			     const struct i2c_attach_args *ia, int flags)
+{
 	int error;
 	if ((error = iic_acquire_bus(ia->ia_tag, flags)) == 0) {
 		uint8_t dummy;
 		error = iic_smbus_receive_byte(ia->ia_tag, ia->ia_addr,
 					       &dummy, flags);
+	}
 	(void) iic_release_bus(ia->ia_tag, flags);
 	return (error);
+}
 static bool
 iic_indirect_driver_is_whitelisted(struct iic_softc *sc, cfdata_t cf)
+{
 	prop_object_iterator_t iter;
 	prop_array_t whitelist;
 	prop_string_t pstr;
 	prop_type_t ptype;
 	bool rv = false;
 	whitelist = prop_dictionary_get(device_properties(sc->sc_dev),
 					I2C_PROP_INDIRECT_DEVICE_WHITELIST);
 	if (whitelist == NULL) {
 		/* No whitelist -> everything allowed */
 		return (true);
+	}
 	if ((ptype = prop_object_type(whitelist)) != PROP_TYPE_ARRAY) {
 		aprint_error_dev(sc->sc_dev,
 		    "invalid property type (%d) for '%s'; must be array (%d)\n",
 		    ptype, I2C_PROP_INDIRECT_DEVICE_WHITELIST, PROP_TYPE_ARRAY);
 		return (false);
+	}
 	iter = prop_array_iterator(whitelist);
 	while ((pstr = prop_object_iterator_next(iter)) != NULL) {
 		if (prop_string_equals_cstring(pstr, cf->cf_name)) {
 			rv = true;
 			break;
+		}
+	}
 	prop_object_iterator_release(iter);
 	return (rv);
+}
 static int
 iic_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct iic_softc *sc = device_private(parent);
 	struct i2c_attach_args ia;
 	int (*probe_func)(struct iic_softc *,
 			  const struct i2c_attach_args *, int);
 	prop_string_t pstr;
 	i2c_addr_t first_addr, last_addr;
 	/*
-	 * I2C doesn't have any regular probing capability.  If we
+	 * Before we do any more work, consult the allowed-driver
-	 * encounter a cfdata with a wild-carded address or a wild-
+	 * white-list for this bus (if any).
 	 * carded parent spec, we skip them because they can only
 	 * be used for direct-coniguration.
 	 */
-	if (cf->cf_loc[IICCF_ADDR] == IICCF_ADDR_DEFAULT ||
+	if (iic_indirect_driver_is_whitelisted(sc, cf) == false)
-	    cf->cf_pspec->cfp_unit == DVUNIT_ANY)
+		return (0);
 		return 0;
 	/* default to "quick write". */
 	probe_func = iic_probe_smbus_quick_write;
 	pstr = prop_dictionary_get(device_properties(sc->sc_dev),
 				   I2C_PROP_INDIRECT_PROBE_STRATEGY);
 	if (pstr == NULL) {
 		/* Use the default. */
 	} else if (prop_string_equals_cstring(pstr,
 					I2C_PROBE_STRATEGY_QUICK_WRITE)) {
 		probe_func = iic_probe_smbus_quick_write;
 	} else if (prop_string_equals_cstring(pstr,
 					I2C_PROBE_STRATEGY_RECEIVE_BYTE)) {
 		probe_func = iic_probe_smbus_receive_byte;
 	} else if (prop_string_equals_cstring(pstr,
 					I2C_PROBE_STRATEGY_NONE)) {
 		probe_func = iic_probe_none;
 	} else {
 		aprint_error_dev(sc->sc_dev,
 			"unknown probe strategy '%s'; defaulting to '%s'\n",
 			prop_string_cstring_nocopy(pstr),
 			I2C_PROBE_STRATEGY_QUICK_WRITE);
 		/* Use the default. */
+	}
 	ia.ia_tag = sc->sc_tag;
 	ia.ia_size = cf->cf_loc[IICCF_SIZE];
 	ia.ia_type = sc->sc_type;
 	ia.ia_name = NULL;
 	ia.ia_ncompat = 0;
 	ia.ia_compat = NULL;
 	ia.ia_prop = NULL;
-	for (ia.ia_addr = 0; ia.ia_addr <= I2C_MAX_ADDR; ia.ia_addr++) {
+	if (cf->cf_loc[IICCF_ADDR] == IICCF_ADDR_DEFAULT) {
 		/*
 		 * This particular config directive has
 		 * wildcarded the address, so we will
 		 * scan the entire bus for it.
 		 */
 		first_addr = 0;
 		last_addr = I2C_MAX_ADDR;
 	} else {
 		/*
 		 * This config directive hard-wires the i2c
 		 * bus address for the device, so there is
 		 * no need to go poking around at any other
 		 * addresses.
 		 */
 		if (cf->cf_loc[IICCF_ADDR] < 0 ||
 		    cf->cf_loc[IICCF_ADDR] > I2C_MAX_ADDR) {
 			/* Invalid config directive! */
 			return (0);
+		}
 		first_addr = last_addr = cf->cf_loc[IICCF_ADDR];
+	}
 	for (ia.ia_addr = first_addr; ia.ia_addr <= last_addr; ia.ia_addr++) {
 		int error, match_result;
 		/*
 		 * Skip I2C addresses that are reserved for
 		 * special purposes.
 		 */
 		if (iic_is_special_address(ia.ia_addr))
 			continue;
 		/*
 		 * Skip addresses where a device is already attached.
 		 */
 		if (sc->sc_devices[ia.ia_addr] != NULL)
 			continue;
-		if (cf->cf_loc[IICCF_ADDR] != ia.ia_addr)
+		/*
 		 * Call the "match" routine for the device.  If that
 		 * returns success, then call the probe strategy
 		 * function.
+		 *
 		 * We do it in this order because i2c devices tend
 		 * to be found at a small number of possible addresses
 		 * (e.g. read-time clocks that are only ever found at
 		 * 0x68).  This gives the driver a chance to skip any
 		 * address that are not valid for the device, saving
 		 * us from having to poke at the bus to see if anything
 		 * is there.
 		 */
 		match_result = config_match(parent, cf, &ia);
 		if (match_result <= 0)
 			continue;
 		/*
 		 * If the quality of the match by the driver was low
 		 * (i.e. matched on being a valid address only, didn't
 		 * perform any hardware probe), invoke our probe routine
 		 * to see if it looks like something is really there.
 		 */
 		if (match_result == I2C_MATCH_ADDRESS_ONLY &&
 		    (error = (*probe_func)(sc, &ia, I2C_F_POLL)) != 0)
 			continue;
-		if (config_match(parent, cf, &ia) > 0)
+		sc->sc_devices[ia.ia_addr] =
-			sc->sc_devices[ia.ia_addr] =
+		    config_attach(parent, cf, &ia, iic_print);
 			    config_attach(parent, cf, &ia, iic_print);
+	}
 	return 0;
+}
 static void
 iic_child_detach(device_t parent, device_t child)
+{
 	struct iic_softc *sc = device_private(parent);
 	int i;
 	for (i = 0; i <= I2C_MAX_ADDR; i++)
 		if (sc->sc_devices[i] == child) {
 			sc->sc_devices[i] = NULL;
 			break;
+		}
+}
 static int
 iic_rescan(device_t self, const char *ifattr, const int *locators)
+{
 	config_search_ia(iic_search, self, ifattr, NULL);
 	return 0;
+}
 static int
 iic_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 static void
 iic_attach(device_t parent, device_t self, void *aux)
+{
 	struct iic_softc *sc = device_private(self);
 	struct i2cbus_attach_args *iba = aux;
 	prop_array_t child_devices;
 	prop_dictionary_t props;
 	char *buf;
 	i2c_tag_t ic;
 	int rv;
 	bool indirect_config;
 	aprint_naive("\n");
 	aprint_normal(": I2C bus\n");
 	sc->sc_dev = self;
 	sc->sc_tag = iba->iba_tag;
 	sc->sc_type = iba->iba_type;
 	ic = sc->sc_tag;
 	ic->ic_devname = device_xname(self);
 	LIST_INIT(&(sc->sc_tag->ic_list));
 	LIST_INIT(&(sc->sc_tag->ic_proc_list));
 	rv = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN, NULL,
 	    iic_smbus_intr_thread, ic, &ic->ic_intr_thread,
 	    "%s", ic->ic_devname);
 	if (rv)
 		aprint_error_dev(self, "unable to create intr thread\n");
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	if (iba->iba_child_devices) {
 		child_devices = iba->iba_child_devices;
 		indirect_config = false;
 	} else {
 		props = device_properties(parent);
 		if (!prop_dictionary_get_bool(props, "i2c-indirect-config",
 		    &indirect_config))
 			indirect_config = true;
 		child_devices = prop_dictionary_get(props, "i2c-child-devices");
+	}
 	if (child_devices) {
 		unsigned int i, count;
 		prop_dictionary_t dev;
 		prop_data_t cdata;
 		uint32_t addr, size;
 		uint64_t cookie;
 		const char *name;
 		struct i2c_attach_args ia;
 		int loc[IICCF_NLOCS];
 		memset(loc, 0, sizeof loc);
 		count = prop_array_count(child_devices);
 		for (i = 0; i < count; i++) {
 			dev = prop_array_get(child_devices, i);
 			if (!dev) continue;
  			if (!prop_dictionary_get_cstring_nocopy(
 			    dev, "name", &name))
 				continue;
 			if (!prop_dictionary_get_uint32(dev, "addr", &addr))
 				continue;
 			if (!prop_dictionary_get_uint64(dev, "cookie", &cookie))
 				cookie = 0;
 			loc[IICCF_ADDR] = addr;
 			if (prop_dictionary_get_uint32(dev, "size", &size))
 				loc[IICCF_SIZE] = size;
 			else
 				size = loc[IICCF_SIZE] = IICCF_SIZE_DEFAULT;
 			memset(&ia, 0, sizeof ia);
 			ia.ia_addr = addr;
 			ia.ia_type = sc->sc_type;
 			ia.ia_tag = ic;
 			ia.ia_name = name;
 			ia.ia_cookie = cookie;
 			ia.ia_size = size;
 			ia.ia_prop = dev;
 			buf = NULL;
 			cdata = prop_dictionary_get(dev, "compatible");
 			if (cdata)
 				iic_fill_compat(&ia,
 				    prop_data_data_nocopy(cdata),
 				    prop_data_size(cdata), &buf);
 			if (addr > I2C_MAX_ADDR) {
 				aprint_error_dev(self,
 				    "WARNING: ignoring bad device address "
 				    "@ 0x%02x\n", addr);
 			} else if (sc->sc_devices[addr] == NULL) {
 				sc->sc_devices[addr] =
 				    config_found_sm_loc(self, "iic", loc, &ia,
 					iic_print_direct, NULL);
+			}
 			if (ia.ia_compat)
 				free(ia.ia_compat, M_TEMP);
 			if (buf)
 				free(buf, M_TEMP);
+		}
 	} else if (indirect_config) {
 		/*
 		 * Attach all i2c devices described in the kernel
 		 * configuration file.
 		 */
 		iic_rescan(self, "iic", NULL);
+	}
+}
 static int
 iic_detach(device_t self, int flags)
+{
 	struct iic_softc *sc = device_private(self);
 	i2c_tag_t ic = sc->sc_tag;
 	int i, error;
 	void *hdl;
 	for (i = 0; i <= I2C_MAX_ADDR; i++) {
 		if (sc->sc_devices[i]) {
 			error = config_detach(sc->sc_devices[i], flags);
 			if (error)
 				return error;
+		}
+	}
 	if (ic->ic_running) {
 		ic->ic_running = 0;
 		wakeup(ic);
 		kthread_join(ic->ic_intr_thread);
+	}
 	if (!LIST_EMPTY(&ic->ic_list)) {
 		device_printf(self, "WARNING: intr handler list not empty\n");
 		while (!LIST_EMPTY(&ic->ic_list)) {
 			hdl = LIST_FIRST(&ic->ic_list);
 			iic_smbus_intr_disestablish(ic, hdl);
+		}
+	}
 	if (!LIST_EMPTY(&ic->ic_proc_list)) {
 		device_printf(self, "WARNING: proc handler list not empty\n");
 		while (!LIST_EMPTY(&ic->ic_proc_list)) {
 			hdl = LIST_FIRST(&ic->ic_proc_list);
 			iic_smbus_intr_disestablish_proc(ic, hdl);
+		}
+	}
 	pmf_device_deregister(self);
 	return 0;
+}
 static void
 iic_smbus_intr_thread(void *aux)
+{
 	i2c_tag_t ic;
 	struct ic_intr_list *il;
 	ic = (i2c_tag_t)aux;
 	ic->ic_running = 1;
 	ic->ic_pending = 0;
 	while (ic->ic_running) {
 		if (ic->ic_pending == 0)
 			tsleep(ic, PZERO, "iicintr", hz);
 		if (ic->ic_pending > 0) {
 			LIST_FOREACH(il, &(ic->ic_proc_list), il_next) {
 				(*il->il_intr)(il->il_intrarg);
+			}
 			ic->ic_pending--;
+		}
+	}
 	kthread_exit(0);
+}
 void *
 iic_smbus_intr_establish(i2c_tag_t ic, int (*intr)(void *), void *intrarg)
+{
 	struct ic_intr_list *il;
 	il = malloc(sizeof(struct ic_intr_list), M_DEVBUF, M_WAITOK);
 	if (il == NULL)
 		return NULL;
 	il->il_intr = intr;
 	il->il_intrarg = intrarg;
 	LIST_INSERT_HEAD(&(ic->ic_list), il, il_next);
 	return il;
+}
 void
 iic_smbus_intr_disestablish(i2c_tag_t ic, void *hdl)
+{
 	struct ic_intr_list *il;
 	il = (struct ic_intr_list *)hdl;
 	LIST_REMOVE(il, il_next);
 	free(il, M_DEVBUF);
 	return;
+}
 void *
 iic_smbus_intr_establish_proc(i2c_tag_t ic, int (*intr)(void *), void *intrarg)
+{
 	struct ic_intr_list *il;
 	il = malloc(sizeof(struct ic_intr_list), M_DEVBUF, M_WAITOK);
 	if (il == NULL)
 		return NULL;
 	il->il_intr = intr;
 	il->il_intrarg = intrarg;
 	LIST_INSERT_HEAD(&(ic->ic_proc_list), il, il_next);
 	return il;
+}
 void
 iic_smbus_intr_disestablish_proc(i2c_tag_t ic, void *hdl)
+{
 	struct ic_intr_list *il;
 	il = (struct ic_intr_list *)hdl;
 	LIST_REMOVE(il, il_next);
 	free(il, M_DEVBUF);
 	return;
+}
 int
 iic_smbus_intr(i2c_tag_t ic)
+{
 	struct ic_intr_list *il;
 	LIST_FOREACH(il, &(ic->ic_list), il_next) {
 		(*il->il_intr)(il->il_intrarg);
+	}
 	ic->ic_pending++;
 	wakeup(ic);
 	return 1;
+}
 static void
 iic_fill_compat(struct i2c_attach_args *ia, const char *compat, size_t len,
 	char **buffer)
+{
 	int count, i;
 	const char *c, *start, **ptr;
 	*buffer = NULL;
 	for (i = count = 0, c = compat; i < len; i++, c++)
 		if (*c == 0)
 			count++;
 	count += 2;
 	ptr = malloc(sizeof(char*)*count, M_TEMP, M_WAITOK);
 	if (!ptr) return;
 	for (i = count = 0, start = c = compat; i < len; i++, c++) {
 		if (*c == 0) {
 			ptr[count++] = start;
 			start = c+1;
+		}
+	}
 	if (start < compat+len) {
 		/* last string not 0 terminated */
 		size_t l = c-start;
 		*buffer = malloc(l+1, M_TEMP, M_WAITOK);
 		memcpy(*buffer, start, l);
 		(*buffer)[l] = 0;
 		ptr[count++] = *buffer;
+	}
 	ptr[count] = NULL;
 	ia->ia_compat = ptr;
 	ia->ia_ncompat = count;
+}
 int
 iic_compat_match(struct i2c_attach_args *ia, const char ** compats)
+{
 	int i;
 	for (; compats && *compats; compats++) {
 		for (i = 0; i < ia->ia_ncompat; i++) {
 			if (strcmp(*compats, ia->ia_compat[i]) == 0)
 				return 1;
+		}
+	}
 	return 0;
+}
 static int
 iic_open(dev_t dev, int flag, int fmt, lwp_t *l)
+{
 	struct iic_softc *sc = device_lookup_private(&iic_cd, minor(dev));
 	mutex_enter(&iic_mtx);
 	if (sc == NULL) {
 		mutex_exit(&iic_mtx);
 		return ENXIO;
+	}
 	iic_refcnt++;
 	mutex_exit(&iic_mtx);
 	return 0;
+}
 static int
 iic_close(dev_t dev, int flag, int fmt, lwp_t *l)
+{
 	mutex_enter(&iic_mtx);
 	iic_refcnt--;
 	mutex_exit(&iic_mtx);
 	return 0;
+}
 static int
 iic_ioctl_exec(struct iic_softc *sc, i2c_ioctl_exec_t *iie, int flag)
+{
 	i2c_tag_t ic = sc->sc_tag;
 	uint8_t buf[I2C_EXEC_MAX_BUFLEN];
 	void *cmd = NULL;
 	int error;
 	/* Validate parameters */
 	if (iie->iie_addr > I2C_MAX_ADDR)
 		return EINVAL;
 	if (iie->iie_cmdlen > I2C_EXEC_MAX_CMDLEN ||
 	    iie->iie_buflen > I2C_EXEC_MAX_BUFLEN)
 		return EINVAL;
 	if (iie->iie_cmd != NULL && iie->iie_cmdlen == 0)
 		return EINVAL;
 	if (iie->iie_buf != NULL && iie->iie_buflen == 0)
 		return EINVAL;
 	if (I2C_OP_WRITE_P(iie->iie_op) && (flag & FWRITE) == 0)
 		return EBADF;
 #if 0
 	/* Disallow userspace access to devices that have drivers attached. */
 	if (sc->sc_devices[iie->iie_addr] != NULL)
 		return EBUSY;
 #endif
 	if (iie->iie_cmd != NULL) {
 		cmd = kmem_alloc(iie->iie_cmdlen, KM_SLEEP);
 		error = copyin(iie->iie_cmd, cmd, iie->iie_cmdlen);
 		if (error)
 			goto out;
+	}
 	if (iie->iie_buf != NULL && I2C_OP_WRITE_P(iie->iie_op)) {
 		error = copyin(iie->iie_buf, buf, iie->iie_buflen);
 		if (error)
 			goto out;
+	}
 	iic_acquire_bus(ic, 0);
 	error = iic_exec(ic, iie->iie_op, iie->iie_addr, cmd, iie->iie_cmdlen,
 	    buf, iie->iie_buflen, 0);
 	iic_release_bus(ic, 0);
 	/*
 	 * Some drivers return error codes on failure, and others return -1.
 	 */
 	if (error < 0)
 		error = EIO;
 out:
 	if (cmd)
 		kmem_free(cmd, iie->iie_cmdlen);
 	if (error)
 		return error;
 	if (iie->iie_buf != NULL && I2C_OP_READ_P(iie->iie_op))
 		error = copyout(buf, iie->iie_buf, iie->iie_buflen);
 	return error;
+}
 static int
 iic_ioctl(dev_t dev, u_long cmd, void *data, int flag, lwp_t *l)
+{
 	struct iic_softc *sc = device_lookup_private(&iic_cd, minor(dev));
 	if (sc == NULL)
 		return ENXIO;
 	switch (cmd) {
 	case I2C_IOCTL_EXEC:
 		return iic_ioctl_exec(sc, (i2c_ioctl_exec_t *)data, flag);
 	default:
 		return ENODEV;
+	}
+}
 CFATTACH_DECL2_NEW(iic, sizeof(struct iic_softc),
     iic_match, iic_attach, iic_detach, NULL, iic_rescan, iic_child_detach);
 MODULE(MODULE_CLASS_DRIVER, iic, "i2cexec,i2c_bitbang");
 #ifdef _MODULE
 #include "ioconf.c"
 #endif
 int
 iic_init(void)
+{
 	mutex_init(&iic_mtx, MUTEX_DEFAULT, IPL_NONE);
 	iic_refcnt = 0;
 	return 0;
+}
 static int
 iic_modcmd(modcmd_t cmd, void *opaque)
+{
 #ifdef _MODULE
 	int bmajor, cmajor;
 #endif
 	int error;
 	error = 0;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		RUN_ONCE(&iic_once, iic_init);
 #ifdef _MODULE
 		mutex_enter(&iic_mtx);
 		bmajor = cmajor = -1;
 		error = devsw_attach("iic", NULL, &bmajor,
 		    &iic_cdevsw, &cmajor);
 		if (error != 0) {
 			mutex_exit(&iic_mtx);
 			break;
+		}
 		error = config_init_component(cfdriver_ioconf_iic,
 		    cfattach_ioconf_iic, cfdata_ioconf_iic);
 		if (error) {
 			aprint_error("%s: unable to init component\n",
 			    iic_cd.cd_name);
 			(void)devsw_detach(NULL, &iic_cdevsw);
+		}
 		mutex_exit(&iic_mtx);
 #endif
 		break;
 	case MODULE_CMD_FINI:
 		mutex_enter(&iic_mtx);
 		if (iic_refcnt != 0) {
 			mutex_exit(&iic_mtx);
 			return EBUSY;
+		}
 #ifdef _MODULE
 		error = config_fini_component(cfdriver_ioconf_iic,
 		    cfattach_ioconf_iic, cfdata_ioconf_iic);
 		if (error != 0) {
 			mutex_exit(&iic_mtx);
 			break;
+		}
 		error = devsw_detach(NULL, &iic_cdevsw);
 		if (error != 0)
 			config_init_component(cfdriver_ioconf_iic,
 			    cfattach_ioconf_iic, cfdata_ioconf_iic);
 #endif
 		mutex_exit(&iic_mtx);
 		break;
 	default:
 		error = ENOTTY;
+	}
 	return error;
+}

 @@ -1,198 +1,229 @@
-/*	$NetBSD: i2cvar.h,v 1.12 2018/06/07 05:56:18 thorpej Exp $	*/
+/*	$NetBSD: i2cvar.h,v 1.13 2018/06/07 13:30:49 thorpej Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford and Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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 the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed for the NetBSD Project by
  *      Wasabi Systems, Inc.
  * 4. The name of Wasabi Systems, Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _DEV_I2C_I2CVAR_H_
 #define	_DEV_I2C_I2CVAR_H_
 #include <dev/i2c/i2c_io.h>
 #include <prop/proplib.h>
 /* Flags passed to i2c routines. */
 #define	I2C_F_WRITE		0x00	/* new transfer is a write */
 #define	I2C_F_READ		0x01	/* new transfer is a read */
 #define	I2C_F_LAST		0x02	/* last byte of read */
 #define	I2C_F_STOP		0x04	/* send stop after byte */
 #define	I2C_F_POLL		0x08	/* poll, don't sleep */
 #define	I2C_F_PEC		0x10	/* smbus packet error checking */
 /* i2c bus instance properties */
 #define	I2C_PROP_INDIRECT_PROBE_STRATEGY	\
 				"i2c-indirect-probe-strategy"
 #define	I2C_PROBE_STRATEGY_QUICK_WRITE		\
 				"smbus-quick-write"
 #define	I2C_PROBE_STRATEGY_RECEIVE_BYTE		\
 				"smbus-receive-byte"
 #define	I2C_PROBE_STRATEGY_NONE			\
 				"none"
 #define	I2C_PROP_INDIRECT_DEVICE_WHITELIST	\
 				"i2c-indirect-device-whitelist"
 	/* value is a prop_array of prop_strings */
 struct ic_intr_list {
 	LIST_ENTRY(ic_intr_list) il_next;
 	int (*il_intr)(void *);
 	void *il_intrarg;
 };
 /*
  * This structure provides the interface between the i2c framework
  * and the underlying i2c controller.
+ *
  * Note that this structure is designed specifically to allow us
  * to either use the autoconfiguration framework or not.  This
  * allows a driver for a board with a private i2c bus use generic
  * i2c client drivers for chips that might be on that board.
  */
 typedef struct i2c_controller {
 	void	*ic_cookie;		/* controller private */
 	/*
 	 * These provide synchronization in the presence of
 	 * multiple users of the i2c bus.  When a device
 	 * driver wishes to perform transfers on the i2c
 	 * bus, the driver should acquire the bus.  When
 	 * the driver is finished, it should release the
 	 * bus.
+	 *
 	 * This is provided by the back-end since a single
 	 * controller may present e.g. i2c and smbus views
 	 * of the same set of i2c wires.
 	 */
 	int	(*ic_acquire_bus)(void *, int);
 	void	(*ic_release_bus)(void *, int);
 	/*
 	 * The preferred API for clients of the i2c interface
 	 * is the scripted API.  This handles i2c controllers
 	 * that do not provide raw access to the i2c signals.
 	 */
 	int	(*ic_exec)(void *, i2c_op_t, i2c_addr_t, const void *, size_t,
 		    void *, size_t, int);
 	int	(*ic_send_start)(void *, int);
 	int	(*ic_send_stop)(void *, int);
 	int	(*ic_initiate_xfer)(void *, i2c_addr_t, int);
 	int	(*ic_read_byte)(void *, uint8_t *, int);
 	int	(*ic_write_byte)(void *, uint8_t, int);
 	LIST_HEAD(, ic_intr_list) ic_list;
 	LIST_HEAD(, ic_intr_list) ic_proc_list;
 	volatile int	ic_running;
 	volatile int	ic_pending;
 	struct lwp *ic_intr_thread;
 	const char *ic_devname;
 } *i2c_tag_t;
 /* I2C bus types */
 #define	I2C_TYPE_SMBUS	1
 /* Used to attach the i2c framework to the controller. */
 struct i2cbus_attach_args {
 	i2c_tag_t iba_tag;		/* the controller */
 	int iba_type;			/* bus type */
 	prop_array_t iba_child_devices;	/* child devices (direct config) */
 };
 /* Used to attach devices on the i2c bus. */
 struct i2c_attach_args {
 	i2c_tag_t	ia_tag;		/* our controller */
 	i2c_addr_t	ia_addr;	/* address of device */
 	int		ia_size;	/* size (for EEPROMs) */
 	int		ia_type;	/* bus type */
 	/* only set if using direct config */
 	const char *	ia_name;	/* name of the device */
 	int		ia_ncompat;	/* number of pointers in the
 					   ia_compat array */
 	const char **	ia_compat;	/* chip names */
 	prop_dictionary_t ia_prop;	/* dictionnary for this device */
 	/*
 	 * The following is of limited usefulness and should only be used
 	 * in rare cases where we really know what we are doing. Example:
 	 * a machine dependent i2c driver (located in sys/arch/$arch/dev)
 	 * needing to access some firmware properties.
 	 * Depending on the firmware in use, an identifier for the device
 	 * may be present. Example: on OpenFirmware machines the device
 	 * tree OF node - if available. This info is hard to transport
 	 * down to MD drivers through the MI i2c bus otherwise.
+	 *
 	 * On ACPI platforms this is the ACPI_HANDLE of the device.
 	 */
 	uintptr_t	ia_cookie;	/* OF node in openfirmware machines */
 };
 /*
  * API presented to i2c controllers.
  */
 int	iicbus_print(void *, const char *);
 int	iic_compat_match(struct i2c_attach_args*, const char **);
 /*
  * Constants to indicate the quality of a match made by a driver's
  * match routine, from lowest to higest:
+ *
  *	-- Address only; no other checks were made.
+ *
  *	-- Address + device probed and recognized.
+ *
  *	-- Direct-config match by "compatible" string.
+ *
  *	-- Direct-config match by specific driver name.
  */
 #define	I2C_MATCH_ADDRESS_ONLY		1
 #define	I2C_MATCH_ADDRESS_AND_PROBE	2
 #define	I2C_MATCH_DIRECT_COMPATIBLE	10
 #define	I2C_MATCH_DIRECT_SPECIFIC	50
 #ifdef _I2C_PRIVATE
 /*
  * Macros used internally by the i2c framework.
  */
 #define	iic_send_start(ic, flags)					\
 	(*(ic)->ic_send_start)((ic)->ic_cookie, (flags))
 #define	iic_send_stop(ic, flags)					\
 	(*(ic)->ic_send_stop)((ic)->ic_cookie, (flags))
 #define	iic_initiate_xfer(ic, addr, flags)				\
 	(*(ic)->ic_initiate_xfer)((ic)->ic_cookie, (addr), (flags))
 #define	iic_read_byte(ic, bytep, flags)					\
 	(*(ic)->ic_read_byte)((ic)->ic_cookie, (bytep), (flags))
 #define	iic_write_byte(ic, byte, flags)					\
 	(*(ic)->ic_write_byte)((ic)->ic_cookie, (byte), (flags))
 #endif /* _I2C_PRIVATE */
 /*
  * Simplified API for clients of the i2c framework.  Definitions
  * in <dev/i2c/i2c_io.h>.
  */
 #define	iic_acquire_bus(ic, flags)					\
 	(*(ic)->ic_acquire_bus)((ic)->ic_cookie, (flags))
 #define	iic_release_bus(ic, flags)					\
 	(*(ic)->ic_release_bus)((ic)->ic_cookie, (flags))
 int	iic_exec(i2c_tag_t, i2c_op_t, i2c_addr_t, const void *,
 	    size_t, void *, size_t, int);
 int	iic_smbus_write_byte(i2c_tag_t, i2c_addr_t, uint8_t, uint8_t, int);
 int	iic_smbus_write_word(i2c_tag_t, i2c_addr_t, uint8_t, uint16_t, int);
 int	iic_smbus_read_byte(i2c_tag_t, i2c_addr_t, uint8_t, uint8_t *, int);
 int	iic_smbus_read_word(i2c_tag_t, i2c_addr_t, uint8_t, uint16_t *, int);
 int	iic_smbus_receive_byte(i2c_tag_t, i2c_addr_t, uint8_t *, int);
 int	iic_smbus_send_byte(i2c_tag_t, i2c_addr_t, uint8_t, int);
 int	iic_smbus_quick_read(i2c_tag_t, i2c_addr_t, int);
 int	iic_smbus_quick_write(i2c_tag_t, i2c_addr_t, int);
 int	iic_smbus_block_read(i2c_tag_t, i2c_addr_t, uint8_t, uint8_t *,
 	    size_t, int);
 int	iic_smbus_block_write(i2c_tag_t, i2c_addr_t, uint8_t, uint8_t *,
 	    size_t, int);
 void *	iic_smbus_intr_establish(i2c_tag_t, int (*)(void *), void *);
 void *	iic_smbus_intr_establish_proc(i2c_tag_t, int (*)(void *), void *);
 void	iic_smbus_intr_disestablish(i2c_tag_t, void *);
 void	iic_smbus_intr_disestablish_proc(i2c_tag_t, void *);
 int	iic_smbus_intr(i2c_tag_t);
 #endif /* _DEV_I2C_I2CVAR_H_ */