[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] i2c: Add asserts for second smbus i2c_start_transfe
From: |
minyard |
Subject: |
[Qemu-devel] [PATCH] i2c: Add asserts for second smbus i2c_start_transfer() |
Date: |
Mon, 24 Oct 2016 10:10:54 -0500 |
From: Corey Minyard <address@hidden>
Some SMBus operations restart the transfer to convert from
write to read mode without an intervening i2c_end_transfer().
The second call cannot fail, so the return code is unchecked,
but this causes Coverity to complain. So add some asserts
and documentation about this.
Signed-off-by: Corey Minyard <address@hidden>
---
hw/i2c/core.c | 5 ++++-
hw/i2c/smbus.c | 6 +++---
2 files changed, 7 insertions(+), 4 deletions(-)
I tested this with the IPMI SMbus driver for a while.
diff --git a/hw/i2c/core.c b/hw/i2c/core.c
index bd8f167..b9dea79 100644
--- a/hw/i2c/core.c
+++ b/hw/i2c/core.c
@@ -88,7 +88,10 @@ int i2c_bus_busy(I2CBus *bus)
return !QLIST_EMPTY(&bus->current_devs);
}
-/* Returns non-zero if the address is not valid. */
+/* Returns non-zero if the address is not valid. If this is called
+ again without an intervening i2c_end_transfer(), like in the SMBus
+ case where the operation is switched from write to read, this
+ function will not rescan the bus and thus cannot fail. */
/* TODO: Make this handle multiple masters. */
int i2c_start_transfer(I2CBus *bus, uint8_t address, int recv)
{
diff --git a/hw/i2c/smbus.c b/hw/i2c/smbus.c
index 3979b3d..bf46d22 100644
--- a/hw/i2c/smbus.c
+++ b/hw/i2c/smbus.c
@@ -248,7 +248,7 @@ int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t
command)
return -1;
}
i2c_send(bus, command);
- i2c_start_transfer(bus, addr, 1);
+ assert(!i2c_start_transfer(bus, addr, 1));
data = i2c_recv(bus);
i2c_nack(bus);
i2c_end_transfer(bus);
@@ -273,7 +273,7 @@ int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t
command)
return -1;
}
i2c_send(bus, command);
- i2c_start_transfer(bus, addr, 1);
+ assert(!i2c_start_transfer(bus, addr, 1));
data = i2c_recv(bus);
data |= i2c_recv(bus) << 8;
i2c_nack(bus);
@@ -302,7 +302,7 @@ int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t
command, uint8_t *data)
return -1;
}
i2c_send(bus, command);
- i2c_start_transfer(bus, addr, 1);
+ assert(!i2c_start_transfer(bus, addr, 1));
len = i2c_recv(bus);
if (len > 32) {
len = 0;
--
2.7.4
- [Qemu-devel] [PATCH] i2c: Add asserts for second smbus i2c_start_transfer(),
minyard <=