I2C libqos and tmp105 qtest support

hw/tmp105.c +8 -0

+static void tmp105_initfn(Object *obj)
+{
+    object_property_add(obj, "temperature", "int",
+                        tmp105_get_temperature,
+                        tmp105_set_temperature, NULL, NULL, NULL);
+}
+
 static void tmp105_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);

@@ -234,6 +258,7 @@ static const TypeInfo tmp105_info = {
     .name          = TYPE_TMP105,
     .parent        = TYPE_I2C_SLAVE,
     .instance_size = sizeof(TMP105State),
+    .instance_init = tmp105_initfn,
     .class_init    = tmp105_class_init,
 };
 

hw/tmp105.h +0 -4

index c21396f..d218919 100644
@@ -44,19 +44,4 @@ typedef struct TMP105State {
     uint8_t alarm;
 } TMP105State;
 
-/**
- * tmp105_set:
- * @i2c: dispatcher to TMP105 hardware model
- * @temp: temperature with 0.001 centigrades units in the range -40 C to +125 C

This obsoletes tmp105_set() and allows for better error handling.

Signed-off-by Andreas Färber <[email protected]>

---
 hw/tmp105.c |   39 ++++++++++++++++++++++++++++++++-------
 hw/tmp105.h |   15 ---------------

2 Dateien geändert, 32 Zeilen hinzugefügt(+), 22 Zeilen entfernt(-)

hw/tmp105.c +32 -7

index a16f538..34c7d24 100644
@@ -21,6 +21,7 @@
 #include "hw.h"
 #include "i2c.h"
 #include "tmp105.h"
+#include "qapi/qapi-visit-core.h"
 
 static void tmp105_interrupt_update(TMP105State *s)
 {

@@ -51,18 +52,34 @@ static void tmp105_alarm_update(TMP105State *s)
     tmp105_interrupt_update(s);
 }
 
+static void tmp105_get_temperature(Object *obj, Visitor *v, void *opaque,
+                                   const char *name, Error **errp)
+{
+    TMP105State *s = TMP105(obj);
+    int64_t value = s->temperature;
+
+    visit_type_int(v, &value, name, errp);
+}
+
 /* Units are 0.001 centigrades relative to 0 C.  */
-void tmp105_set(I2CSlave *i2c, int temp)
+static void tmp105_set_temperature(Object *obj, Visitor *v, void *opaque,
+                                   const char *name, Error **errp)
 {
-    TMP105State *s = TMP105(i2c);
+    TMP105State *s = TMP105(obj);
 
-    if (temp >= 128000 || temp < -128000) {
-        fprintf(stderr, "%s: values is out of range (%i.%03i C)\n",
-                        __FUNCTION__, temp / 1000, temp % 1000);
-        exit(-1);
+    int64_t value;
+
+    visit_type_int(v, &value, name, errp);
+    if (error_is_set(errp)) {
+        return;
+    }
+    if (value >= 128000 || value < -128000) {
+        error_setg(errp, "value %" PRId64 ".%03" PRIu64 " °C is out of range",
+                   value / 1000, value % 1000);
+        return;
     }
 
-    s->temperature = ((int16_t) (temp * 0x800 / 128000)) << 4;
+    s->temperature = ((int16_t) (value * 0x800 / 128000)) << 4;
 
     tmp105_alarm_update(s);
 }

@@ -218,6 +235,13 @@ static int tmp105_init(I2CSlave *i2c)
     return 0;
 }
 
+static void tmp105_initfn(Object *obj)
+{
+    object_property_add(obj, "temperature", "int",
+                        tmp105_get_temperature,
+                        tmp105_set_temperature, NULL, NULL, NULL);
+}
+
 static void tmp105_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);

@@ -234,6 +258,7 @@ static const TypeInfo tmp105_info = {
     .name          = TYPE_TMP105,
     .parent        = TYPE_I2C_SLAVE,
     .instance_size = sizeof(TMP105State),
+    .instance_init = tmp105_initfn,
     .class_init    = tmp105_class_init,
 };
 

hw/tmp105.h +0 -16

index c21396f..d218919 100644
@@ -44,19 +44,4 @@ typedef struct TMP105State {
     uint8_t alarm;
 } TMP105State;
 
-/**
- * tmp105_set:
- * @i2c: dispatcher to TMP105 hardware model
- * @temp: temperature with 0.001 centigrades units in the range -40 C to +125 C
- *
- * Sets the temperature of the TMP105 hardware model.
- *
- * Bits 5 and 6 (value 32 and 64) in the register indexed by TMP105_REG_CONFIG
- * determine the precision of the temperature. See Table 8 in the data sheet.
- *
- * @see_also: I2C_SLAVE macro
- * @see_also: http://www.ti.com/lit/gpn/tmp105
- */
-void tmp105_set(I2CSlave *i2c, int temp);
-
 #endif
--

1.7.10.4

Quoted 37 lines

hw/tmp105.c +8 -0

+static void tmp105_initfn(Object *obj)
+{
+    object_property_add(obj, "temperature", "int",
+                        tmp105_get_temperature,
+                        tmp105_set_temperature, NULL, NULL, NULL);
+}
+
 static void tmp105_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);

@@ -234,6 +258,7 @@ static const TypeInfo tmp105_info = {
     .name          = TYPE_TMP105,
     .parent        = TYPE_I2C_SLAVE,
     .instance_size = sizeof(TMP105State),
+    .instance_init = tmp105_initfn,
     .class_init    = tmp105_class_init,
 };
 

hw/tmp105.h +0 -11

index c21396f..d218919 100644
@@ -44,19 +44,4 @@ typedef struct TMP105State {
     uint8_t alarm;
 } TMP105State;
 
-/**
- * tmp105_set:
- * @i2c: dispatcher to TMP105 hardware model
- * @temp: temperature with 0.001 centigrades units in the range -40 C to +125 C
- *
- * Sets the temperature of the TMP105 hardware model.
- *
- * Bits 5 and 6 (value 32 and 64) in the register indexed by TMP105_REG_CONFIG
- * determine the precision of the temperature. See Table 8 in the data sheet.
- *
- * @see_also: I2C_SLAVE macro

hw/tmp105.h typedef struct TMP105State { · line 60

Quoted 3 lines

hw/tmp105.h +0 -3

- * @see_also: http://www.ti.com/lit/gpn/tmp105
- */
-void tmp105_set(I2CSlave *i2c, int temp);

Would it be possible to keep the C API? The traditional C API is useful when a project cannot support QOM. These C APIs also simplify unit testing and allow QEMU hardware models to be more easily reused as standalone modules.

Hello,

Here's I2C support for the libqos framework and an OMAP driver. The design was inspired by QEMU's i2c_bus and Linux' i2c_adapter. Seems like low hanging fruit (while we're still waiting for PCI support :)), hopefully motivating more people to contribute qtests for new devices or bug fixes.

I found a bug in omap_i2c related to the SBD bit not getting cleared after a single-byte read; the patch has been dropped as we were not able to verify it against a TRM or hardware. The driver was therefore changed to ignore the SBD bit, like the Linux driver does.

I've split up the proposed tmp105.h header further to facilitate reuse of the register enum in qtest.

The test case itself initially fails; in lack of a v2 patch by Alex I'm appending my own fix proposal that makes the test pass.

I'm also appending a QOM'ish cleanup of the file, replacing the current API with a QOM property.
To do a qom-set for testing a non-zero temperature reading, we'll need either a canonical path for the TMP105 or Jason's qtest_qmp_resp() to iterate over qom-list /machine/unassigned output looking for type "tmp105" with qom-get.

v1 -> v2:
* Factor out libqos API for I2C and an OMAP driver
* Avoid casts by using uint8_t* in API, suggested by Blue
* Ignore SBD bit in omap_i2c driver
* Drop omap_i2c patch clearing SBD
* Incorporate Alex' tmp105.h patch
* Split out tmp105_regs.h for qtest, inspired by rtc-test
* Append replacement for Alex' fix
* Append QOM cleanup and turn setter function into QOM property

Alex Horn (1):
tmp105: Create API for TMP105 temperature sensor

Andreas Färber (6):
libqtest: Prepare I2C libqos
tmp105: Split out I2C message constants from header
tests: Add tmp105 qtest test case
tmp105: Fix I2C protocol bug
tmp105: QOM'ify
tmp105: Add temperature QOM property

 hw/i2c.h            |    3 -
 hw/tmp105.c         |  101 ++++++++++++++++++-------------
 hw/tmp105.h         |   47 +++++++++++++++
 hw/tmp105_regs.h    |   50 ++++++++++++++++
 tests/Makefile      |    3 +
 tests/libi2c-omap.c |  166 +++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/libi2c.c      |   22 +++++++
 tests/libi2c.h      |   30 ++++++++++
 tests/tmp105-test.c |   76 +++++++++++++++++++++++
 9 Dateien geändert, 453 Zeilen hinzugefügt(+), 45 Zeilen entfernt(-)
 create mode 100644 hw/tmp105.h
 create mode 100644 hw/tmp105_regs.h
 create mode 100644 tests/libi2c-omap.c
 create mode 100644 tests/libi2c.c
 create mode 100644 tests/libi2c.h
 create mode 100644 tests/tmp105-test.c

Hello,

Here's I2C support for the libqos framework and an OMAP driver. The design was inspired by QEMU's i2c_bus and Linux' i2c_adapter. Seems like low hanging fruit (while we're still waiting for PCI support :)), hopefully motivating more people to contribute qtests for new devices or bug fixes.

I found a bug in omap_i2c related to the SBD bit not getting cleared after a single-byte read; the patch has been dropped as we were not able to verify it against a TRM or hardware. The driver was therefore changed to ignore the SBD bit, like the Linux driver does.

I've split up the proposed tmp105.h header further to facilitate reuse of the register enum in qtest.

The test case itself initially fails; in lack of a v2 patch by Alex I'm appending my own fix proposal that makes the test pass.

I'm also appending a QOM'ish cleanup of the file, replacing the current API with a QOM property.
To do a qom-set for testing a non-zero temperature reading, we'll need either a canonical path for the TMP105 or Jason's qtest_qmp_resp() to iterate over qom-list /machine/unassigned output looking for type "tmp105" with qom-get.

Alex, if you could add a Tested-by (using object_property_set_int()) that would be appreciated.

Regards,
Andreas

v1 -> v2:
* Factor out libqos API for I2C and an OMAP driver
* Avoid casts by using uint8_t* in API, suggested by Blue
* Ignore SBD bit in omap_i2c driver
* Drop omap_i2c patch clearing SBD
* Incorporate Alex' tmp105.h patch
* Split out tmp105_regs.h for qtest, inspired by rtc-test
* Append replacement for Alex' fix
* Append QOM cleanup and turn setter function into QOM property

Cc Anthony Liguori <[email protected]>

Cc Alex Horn <[email protected]>

Cc Andrzej Zaborowski <[email protected]>

Cc Peter Maydell <[email protected]>

Cc Blue Swirl <[email protected]>

Cc Jason Baron <[email protected]>

Cc Paolo Bonzini <[email protected]>

Alex Horn (1):
tmp105: Create API for TMP105 temperature sensor

Andreas Färber (6):
libqtest: Prepare I2C libqos
tmp105: Split out I2C message constants from header
tests: Add tmp105 qtest test case
tmp105: Fix I2C protocol bug
tmp105: QOM'ify
tmp105: Add temperature QOM property

 hw/i2c.h            |    3 -
 hw/tmp105.c         |  101 ++++++++++++++++++-------------
 hw/tmp105.h         |   47 +++++++++++++++
 hw/tmp105_regs.h    |   50 ++++++++++++++++
 tests/Makefile      |    3 +
 tests/libi2c-omap.c |  166 +++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/libi2c.c      |   22 +++++++
 tests/libi2c.h      |   30 ++++++++++
 tests/tmp105-test.c |   76 +++++++++++++++++++++++
 9 Dateien geändert, 453 Zeilen hinzugefügt(+), 45 Zeilen entfernt(-)
 create mode 100644 hw/tmp105.h
 create mode 100644 hw/tmp105_regs.h
 create mode 100644 tests/libi2c-omap.c
 create mode 100644 tests/libi2c.c
 create mode 100644 tests/libi2c.h
 create mode 100644 tests/tmp105-test.c

Signature · 1 line

1.7.10.4

Hello,

Here's I2C support for the libqos framework and an OMAP driver. The design was inspired by QEMU's i2c_bus and Linux' i2c_adapter. Seems like low hanging fruit (while we're still waiting for PCI support :)), hopefully motivating more people to contribute qtests for new devices or bug fixes.

I found a bug in omap_i2c related to the SBD bit not getting cleared after a single-byte read; the patch has been dropped as we were not able to verify it against a TRM or hardware. The driver was therefore changed to ignore the SBD bit, like the Linux driver does.

I've split up the proposed tmp105.h header further to facilitate reuse of the register enum in qtest.

The test case itself initially fails; in lack of a v2 patch by Alex I'm appending my own fix proposal that makes the test pass.

I'm also appending a QOM'ish cleanup of the file, replacing the current API with a QOM property.
To do a qom-set for testing a non-zero temperature reading, we'll need either a canonical path for the TMP105 or Jason's qtest_qmp_resp() to iterate over qom-list /machine/unassigned output looking for type "tmp105" with qom-get.

Alex, if you could add a Tested-by (using object_property_set_int()) that would be appreciated.

Regards,
Andreas

v1 -> v2:
* Factor out libqos API for I2C and an OMAP driver
* Avoid casts by using uint8_t* in API, suggested by Blue
* Ignore SBD bit in omap_i2c driver
* Drop omap_i2c patch clearing SBD
* Incorporate Alex' tmp105.h patch
* Split out tmp105_regs.h for qtest, inspired by rtc-test
* Append replacement for Alex' fix
* Append QOM cleanup and turn setter function into QOM property

Cc Anthony Liguori <[email protected]>

Cc Alex Horn <[email protected]>

Cc Andrzej Zaborowski <[email protected]>

Cc Peter Maydell <[email protected]>

Cc Blue Swirl <[email protected]>

Cc Jason Baron <[email protected]>

Cc Paolo Bonzini <[email protected]>

Alex Horn (1):
tmp105: Create API for TMP105 temperature sensor

Andreas Färber (6):
libqtest: Prepare I2C libqos
tmp105: Split out I2C message constants from header
tests: Add tmp105 qtest test case
tmp105: Fix I2C protocol bug
tmp105: QOM'ify
tmp105: Add temperature QOM property

 hw/i2c.h            |    3 -
 hw/tmp105.c         |  101 ++++++++++++++++++-------------
 hw/tmp105.h         |   47 +++++++++++++++
 hw/tmp105_regs.h    |   50 ++++++++++++++++
 tests/Makefile      |    3 +
 tests/libi2c-omap.c |  166 +++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/libi2c.c      |   22 +++++++
 tests/libi2c.h      |   30 ++++++++++
 tests/tmp105-test.c |   76 +++++++++++++++++++++++
 9 Dateien geändert, 453 Zeilen hinzugefügt(+), 45 Zeilen entfernt(-)
 create mode 100644 hw/tmp105.h
 create mode 100644 hw/tmp105_regs.h
 create mode 100644 tests/libi2c-omap.c
 create mode 100644 tests/libi2c.c
 create mode 100644 tests/libi2c.h
 create mode 100644 tests/tmp105-test.c

Signature · 1 line

1.7.10.4