diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2021-12-15 08:51:24 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2021-12-22 06:49:15 +0000 |
| commit | 630093d156d9a1333f6677fcf99f731098e097e0 (patch) | |
| tree | 7bb8b41c618ce1c1cab8a9000d51afb7525a9176 | |
| parent | f8258670cab5249d2755686b048adbaff726e833 (diff) | |
| download | src-630093d156d9a1333f6677fcf99f731098e097e0.tar.gz src-630093d156d9a1333f6677fcf99f731098e097e0.zip | |
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)
| -rw-r--r-- | sys/arm64/rockchip/rk_i2c.c | 10 |
1 files 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; } |