The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=7dc8a0e5dff4ad4c9c10442bef5228a91a98d5d6
commit 7dc8a0e5dff4ad4c9c10442bef5228a91a98d5d6 Author: Andriy Gapon <[email protected]> AuthorDate: 2021-12-15 08:51:24 +0000 Commit: Andriy Gapon <[email protected]> CommitDate: 2021-12-15 11:15:58 +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. MFC after: 1 week --- 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 55cea8895c43..9db6d8739bbd 100644 --- a/sys/arm64/rockchip/rk_i2c.c +++ b/sys/arm64/rockchip/rk_i2c.c @@ -369,8 +369,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; }
