Browse Source

hw/sensor/tmp105: Convert printf() to trace event, add tracing for read/write access

printf() unconditionally prints to the console which disturbs `-serial stdio`.
Fix that by converting into a trace event. While at it, add some tracing for
read and write access.

Fixes: 7e7c5e4c1ba5 "Nokia N800 machine support (ARM)."
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20241103143330.123596-5-shentey@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Bernhard Beschow 9 months ago
parent
commit
3647dca9fb
4 changed files with 14 additions and 1 deletions
  1. 6 1
      hw/sensor/tmp105.c
  2. 6 0
      hw/sensor/trace-events
  3. 1 0
      hw/sensor/trace.h
  4. 1 0
      meson.build

+ 6 - 1
hw/sensor/tmp105.c

@@ -27,6 +27,7 @@
 #include "qapi/visitor.h"
 #include "qapi/visitor.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
 #include "hw/registerfields.h"
 #include "hw/registerfields.h"
+#include "trace.h"
 
 
 FIELD(CONFIG, SHUTDOWN_MODE,        0, 1)
 FIELD(CONFIG, SHUTDOWN_MODE,        0, 1)
 FIELD(CONFIG, THERMOSTAT_MODE,      1, 1)
 FIELD(CONFIG, THERMOSTAT_MODE,      1, 1)
@@ -150,17 +151,21 @@ static void tmp105_read(TMP105State *s)
         s->buf[s->len++] = ((uint16_t) s->limit[1]) >> 0;
         s->buf[s->len++] = ((uint16_t) s->limit[1]) >> 0;
         break;
         break;
     }
     }
+
+    trace_tmp105_read(s->i2c.address, s->pointer);
 }
 }
 
 
 static void tmp105_write(TMP105State *s)
 static void tmp105_write(TMP105State *s)
 {
 {
+    trace_tmp105_write(s->i2c.address, s->pointer);
+
     switch (s->pointer & 3) {
     switch (s->pointer & 3) {
     case TMP105_REG_TEMPERATURE:
     case TMP105_REG_TEMPERATURE:
         break;
         break;
 
 
     case TMP105_REG_CONFIG:
     case TMP105_REG_CONFIG:
         if (FIELD_EX8(s->buf[0] & ~s->config, CONFIG, SHUTDOWN_MODE)) {
         if (FIELD_EX8(s->buf[0] & ~s->config, CONFIG, SHUTDOWN_MODE)) {
-            printf("%s: TMP105 shutdown\n", __func__);
+            trace_tmp105_write_shutdown(s->i2c.address);
         }
         }
         s->config = FIELD_DP8(s->buf[0], CONFIG, ONE_SHOT, 0);
         s->config = FIELD_DP8(s->buf[0], CONFIG, ONE_SHOT, 0);
         s->faults = tmp105_faultq[FIELD_EX8(s->config, CONFIG, FAULT_QUEUE)];
         s->faults = tmp105_faultq[FIELD_EX8(s->config, CONFIG, FAULT_QUEUE)];

+ 6 - 0
hw/sensor/trace-events

@@ -0,0 +1,6 @@
+# See docs/devel/tracing.rst for syntax documentation.
+
+# tmp105.c
+tmp105_read(uint8_t dev, uint8_t addr) "device: 0x%02x, addr: 0x%02x"
+tmp105_write(uint8_t dev, uint8_t addr) "device: 0x%02x, addr 0x%02x"
+tmp105_write_shutdown(uint8_t dev) "device: 0x%02x"

+ 1 - 0
hw/sensor/trace.h

@@ -0,0 +1 @@
+#include "trace/trace-hw_sensor.h"

+ 1 - 0
meson.build

@@ -3484,6 +3484,7 @@ if have_system
     'hw/s390x',
     'hw/s390x',
     'hw/scsi',
     'hw/scsi',
     'hw/sd',
     'hw/sd',
+    'hw/sensor',
     'hw/sh4',
     'hw/sh4',
     'hw/sparc',
     'hw/sparc',
     'hw/sparc64',
     'hw/sparc64',