[src/trunk]: src/sys/arch/arm/nvidia Disallow 0-byte transfers and suppress t...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/170d8ccc3c97
branches:  trunk
changeset: 433655:170d8ccc3c97
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Sep 25 22:23:22 2018 +0000

description:
Disallow 0-byte transfers and suppress timeout messages

diffstat:

 sys/arch/arm/nvidia/tegra_i2c.c |  20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r 3c2faf742836 -r 170d8ccc3c97 sys/arch/arm/nvidia/tegra_i2c.c
--- a/sys/arch/arm/nvidia/tegra_i2c.c   Tue Sep 25 20:55:34 2018 +0000
+++ b/sys/arch/arm/nvidia/tegra_i2c.c   Tue Sep 25 22:23:22 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.21 2018/09/03 16:29:23 riastradh Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.22 2018/09/25 22:23:22 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.21 2018/09/03 16:29:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.22 2018/09/25 22:23:22 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -275,6 +275,9 @@
 
        KASSERT(mutex_owned(&sc->sc_lock));
 
+       if (buflen == 0 && cmdlen == 0)
+               return EINVAL;
+
        if ((flags & I2C_F_POLL) == 0) {
                I2C_WRITE(sc, I2C_INTERRUPT_MASK_REG,
                    I2C_INTERRUPT_MASK_NOACK | I2C_INTERRUPT_MASK_ARB_LOST |
@@ -305,10 +308,12 @@
                }
        }
 
-       if (I2C_OP_READ_P(op)) {
-               error = tegra_i2c_read(sc, addr, buf, buflen, flags);
-       } else {
-               error = tegra_i2c_write(sc, addr, buf, buflen, flags, false);
+       if (buflen > 0) {
+               if (I2C_OP_READ_P(op)) {
+                       error = tegra_i2c_read(sc, addr, buf, buflen, flags);
+               } else {
+                       error = tegra_i2c_write(sc, addr, buf, buflen, flags, false);
+               }
        }
 
 done:
@@ -348,8 +353,9 @@
                }
        }
        if (retry == 0) {
-               stat = I2C_READ(sc, I2C_INTERRUPT_STATUS_REG);
+#ifdef TEGRA_I2C_DEBUG
                device_printf(sc->sc_dev, "timed out, status = %#x\n", stat);
+#endif
                return ETIMEDOUT;
        }