Commit d0efdc16 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Peter Maydell
Browse files

aspeed/i2c: handle LAST command under the RX command 



Today, the LAST command is handled with the STOP command but this is
incorrect. Also nack the I2C bus when a LAST is issued.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Message-id: 1494827476-1487-3-git-send-email-clg@kaod.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent ddabca75

hw/i2c/aspeed_i2c.c

+6 −3
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void aspeed_i2c_bus_handle_cmd(AspeedI2CBus *bus, uint64_t value) 
        bus->cmd &= ~I2CD_M_TX_CMD;

    }



    if (bus->cmd & I2CD_M_RX_CMD) {

    if (bus->cmd & (I2CD_M_RX_CMD | I2CD_M_S_RX_CMD_LAST)) {

        int ret = i2c_recv(bus->bus);

        if (ret < 0) {

            qemu_log_mask(LOG_GUEST_ERROR, "%s: read failed\n", __func__);
@@ -212,10 +212,13 @@ static void aspeed_i2c_bus_handle_cmd(AspeedI2CBus *bus, uint64_t value) 
            bus->intr_status |= I2CD_INTR_RX_DONE;

        }

        bus->buf = (ret & I2CD_BYTE_BUF_RX_MASK) << I2CD_BYTE_BUF_RX_SHIFT;

        bus->cmd &= ~I2CD_M_RX_CMD;

        if (bus->cmd & I2CD_M_S_RX_CMD_LAST) {

            i2c_nack(bus->bus);

        }

        bus->cmd &= ~(I2CD_M_RX_CMD | I2CD_M_S_RX_CMD_LAST);

    }



    if (bus->cmd & (I2CD_M_STOP_CMD | I2CD_M_S_RX_CMD_LAST)) {

    if (bus->cmd & I2CD_M_STOP_CMD) {

        if (!i2c_bus_busy(bus->bus)) {

            bus->intr_status |= I2CD_INTR_ABNORMAL;

        } else {