From nobody Sun Sep 14 17:47:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cPwbl62Krz68Bs1; Sun, 14 Sep 2025 17:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cPwbl4vRFz3cd7; Sun, 14 Sep 2025 17:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757872051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yGj+mfEPTnJO5YO6kFFvuu/YbmtP3Mpl1LD1YQTw7Qc=; b=WBVS5qLKTZLLH7T6py3Zhz4VD93+SUP3E7QjZCRqQ91Ue4k53sI3zakIKa2b4jtimeVmRO /cviUjPIQOQCCW6KFoni8BlzoKYAHHSIskBynzc7lHyGEJQzQ22oQh8dUZgAM1d3Z71Jdc uOpCLLgSmlcVZ+H6zDJN79Q6RVKeYyKiQaIvPHRqS9nNiooxMFHZXFHkWczetMHG48Gu8N QVPzLApNs1r+c5mlPQzBjCWe9IdYBXba0a9OaSztErPiOzophrk8E2j2qzlm/ZXmK4nxCJ G28PHE0ApfJuumQuN/m5qQoSG2mcx/k7kefdl2hX1ymVxbuHH72Uaew5zXKM0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757872051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yGj+mfEPTnJO5YO6kFFvuu/YbmtP3Mpl1LD1YQTw7Qc=; b=EHEDWU9C1A9EzCErzkO9A5VCUTHg36MfOIyf5JJZEfUXmDw9ky7kTTJvaDJQoLwXoY7GTK jnGw6eff1kbfaUwTK0ikqPQOaCuANQMJCII2hBLEkK2bMBmkG6VNHyE96P6gtZQBmD0fEE goWZ1uvTbO4mMgPdTJDSr1UK7dryKyQksdW/G6TVmEZ9j+3zsdgfdF1C0MiKpLIe0Oh9ln x9BuifbWt5/FGxx+MjgHs4eW3PcV/WcV7eUBGqqlGnOjh8H4kommZzhIshzElcsp/t7PgU xV1rbmSfHhGadmtZsbYPHsu3GyV/OwCJt1P6r0cWI98Vd20vHuOIPVSu+ANy7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757872051; a=rsa-sha256; cv=none; b=w0mbBrmR7eVxpqy0Dyj/1EGR6/3Xp4vogW38jrRq5WIYw0I9LDoTbJVrFxMIeJtnBKkxXm /LaRY1EUhSP1fZOrFcZsKXBlUqLpDnh8fvOUFDtxHJnoGfE1b/ZiglUVNM4n/geXRe4WrF wskTHl3HaZ0tzQ1LnyWOZ4YZm47tzLu72t7+LgYDlBr6M70XVznhJm6pdhrB20afUl4dEF 1BzdyJpG3S6z5dtOvZBNbD4+VqqhqcLMJM+OVWyMiGnNK9oztiB/TCVY83GMJVU9kDc8sY tEczQLqQmLv+7bLohpb+niVsyBTTHJlKIejexgSKOsvR6h91DzMYclaaE6CeMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cPwbl4Bx6z46r; Sun, 14 Sep 2025 17:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58EHlVNv084664; Sun, 14 Sep 2025 17:47:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58EHlV6s084661; Sun, 14 Sep 2025 17:47:31 GMT (envelope-from git) Date: Sun, 14 Sep 2025 17:47:31 GMT Message-Id: <202509141747.58EHlV6s084661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4b301f7e7ab4 - main - iicbb: Fix gcc12 complaint List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b301f7e7ab43bb61561786c2ab33f3a3c4a725d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4b301f7e7ab43bb61561786c2ab33f3a3c4a725d commit 4b301f7e7ab43bb61561786c2ab33f3a3c4a725d Author: Warner Losh AuthorDate: 2025-09-14 17:12:38 +0000 Commit: Warner Losh CommitDate: 2025-09-14 17:12:38 +0000 iicbb: Fix gcc12 complaint So gcc12 doesn't understand that t->udelay is >= 1, so thinks that noack might be unset sometimes. While we specifically constrain this on direct assignment, there's a sysctl that might not. This is likely also a bug. Instead of uglifying everything by using MAX(1, sc->udelay), I rewrote the for loop as a do-while loop (which arguably dictates intent better because this code clearly assumes it will be executed once). Sponsored by: Netflix --- sys/dev/iicbus/iicbb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c index c344bda930b0..5f6423135f46 100644 --- a/sys/dev/iicbus/iicbb.c +++ b/sys/dev/iicbus/iicbb.c @@ -331,7 +331,7 @@ iicbb_getack(device_t dev) { struct iicbb_softc *sc = device_get_softc(dev); int noack, err; - int t; + int t = 0; /* Release SDA so that the slave can drive it. */ err = iicbb_clockin(dev, 1); @@ -341,12 +341,13 @@ iicbb_getack(device_t dev) } /* Sample SDA until ACK (low) or udelay runs out. */ - for (t = 0; t < sc->udelay; t++) { + do { noack = I2C_GETSDA(dev); if (!noack) break; DELAY(1); - } + t++; + } while(t < sc->udelay); DELAY(sc->udelay - t); iicbb_clockout(dev);