From nobody Wed Dec 22 06:51:29 2021 X-Original-To: dev-commits-src-all@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 6C87418F783C; Wed, 22 Dec 2021 06:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJkWQ43FTz3LR7; Wed, 22 Dec 2021 06:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E3A5218C36; Wed, 22 Dec 2021 06:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BM6pTFC036010; Wed, 22 Dec 2021 06:51:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BM6pTiQ036009; Wed, 22 Dec 2021 06:51:29 GMT (envelope-from git) Date: Wed, 22 Dec 2021 06:51:29 GMT Message-Id: <202112220651.1BM6pTiQ036009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 630093d156d9 - stable/13 - rk_i2c: keep sending bytes until all bytes are sent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 630093d156d9a1333f6677fcf99f731098e097e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640155890; 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=HqcqcWvCa+vuw2Yk0Dhma5B+yTSp9kUADfOiETBTkOE=; b=PRHN8FlOEXD1nRMMAS2wyqI2dP0g0MxcZN1YpZqK1gO+HQKRtyGwwi4rtVcx2Aj5E9rZOQ 8zvvI9+MAFuGAIf7e4LmLt82sSaDOVXNCg8q+0TXhdGBulMagIFYFC00xh/PzC5dqd6nFq uz4CYb7xSfc5ym8ed2x+i3kZv6m08NP/u7aRptG5KNOHNkll/0Y7yzoD/ysWWVOpZ6N/UY FXbsuwnAQGVZbXHXwseAIFeIC65qN0zAY7kXXEZcnATw4aYRGnRXFHAzzSLvk1af2maePi b6fy11c9ax1dvQkwtEacOontqOMdYAUkhYmOVoQy9CfmPtFqe+GHWYFkgZQJWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640155890; a=rsa-sha256; cv=none; b=tR+ChNX6hVCXbGMsy/HjEbuHNQpj+zzrL+h8RhYy5tcm/N1l40E3x2ZsLZRiivaHlY7rzB Hsb2HHu1u0e4nbKJOcK4NmOb1ibuj7Mm5PMo/lNclpOFKMEmmfWSnNNUn1p0VGNNSoGGJw hvvN/zUwgNRdtYvCBGL06SiJK9hTcsIaCzNsn7ZT2oJrI7ifF5npP8XdXIyuJm3Jo2Nddw DKgWnZxipch9EWGUcneg1CepaG8aPrzwcM0hLrC7A10HEUcQnTEAER6rmaDhuhkGlMw8nl pa21hCh5ydtK5ueMqxH5hBaYeIBlBgDYdOUt3hQnIZkyMBNiDZs/W4YaI3VKZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=630093d156d9a1333f6677fcf99f731098e097e0 commit 630093d156d9a1333f6677fcf99f731098e097e0 Author: Andriy Gapon AuthorDate: 2021-12-15 08:51:24 +0000 Commit: Andriy Gapon CommitDate: 2021-12-22 06:49:15 +0000 rk_i2c: keep sending bytes until all bytes are sent Previously the code would decalre the transfer complete after sending first 31 bytes (plus the slave address) of a larger I2C write transfer. That was tested using a large write to an EEPROM with 32-byte write page size and a 2-byte address type. Such a transaction needed to send 34 bytes, 2 bytes for an offset and 32 bytes of actual data. (cherry picked from commit 7dc8a0e5dff4ad4c9c10442bef5228a91a98d5d6) --- sys/arm64/rockchip/rk_i2c.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/arm64/rockchip/rk_i2c.c index 71ed2d543069..171b28a8b617 100644 --- a/sys/arm64/rockchip/rk_i2c.c +++ b/sys/arm64/rockchip/rk_i2c.c @@ -346,8 +346,14 @@ rk_i2c_intr_locked(struct rk_i2c_softc *sc) break; case STATE_WRITE: - if (sc->cnt == sc->msg->len && - !(sc->msg->flags & IIC_M_NOSTOP)) { + if (sc->cnt < sc->msg->len) { + /* Keep writing. */ + RK_I2C_WRITE(sc, RK_I2C_IEN, RK_I2C_IEN_MBTFIEN | + RK_I2C_IEN_NAKRCVIEN); + transfer_len = rk_i2c_fill_tx(sc); + RK_I2C_WRITE(sc, RK_I2C_MTXCNT, transfer_len); + break; + } else if (!(sc->msg->flags & IIC_M_NOSTOP)) { rk_i2c_send_stop(sc); break; }