[v3] E500 Cleanup

[PATCH v3 11/26] hw/i2c/mpc_i2c: Convert DPRINTF to trace events for register access

Posted by Bernhard Beschow 1 year, 3 months ago

Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/i2c/mpc_i2c.c    | 9 +++++----
 hw/i2c/trace-events | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c
index 2467d1a9aa..3d79c15653 100644
--- a/hw/i2c/mpc_i2c.c
+++ b/hw/i2c/mpc_i2c.c
@@ -24,6 +24,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
+#include "trace.h"
 
 /* #define DEBUG_I2C */
 
@@ -224,8 +225,8 @@ static uint64_t mpc_i2c_read(void *opaque, hwaddr addr, unsigned size)
         break;
     }
 
-    DPRINTF("%s: addr " HWADDR_FMT_plx " %02" PRIx32 "\n", __func__,
-                                         addr, value);
+    trace_mpc_i2c_read(addr, value);
+
     return (uint64_t)value;
 }
 
@@ -234,8 +235,8 @@ static void mpc_i2c_write(void *opaque, hwaddr addr,
 {
     MPCI2CState *s = opaque;
 
-    DPRINTF("%s: addr " HWADDR_FMT_plx " val %08" PRIx64 "\n", __func__,
-                                             addr, value);
+    trace_mpc_i2c_write(addr, value);
+
     switch (addr) {
     case MPC_I2C_ADR:
         s->adr = value & CADR_MASK;
diff --git a/hw/i2c/trace-events b/hw/i2c/trace-events
index 6900e06eda..f708a7ace1 100644
--- a/hw/i2c/trace-events
+++ b/hw/i2c/trace-events
@@ -35,6 +35,11 @@ aspeed_i2c_bus_write(uint32_t busid, uint64_t offset, unsigned size, uint64_t va
 aspeed_i2c_bus_send(const char *mode, int i, int count, uint8_t byte) "%s send %d/%d 0x%02x"
 aspeed_i2c_bus_recv(const char *mode, int i, int count, uint8_t byte) "%s recv %d/%d 0x%02x"
 
+# mpc_i2c.c
+
+mpc_i2c_read(uint64_t addr, uint32_t value) "[0x%" PRIx64 "] -> 0x%02" PRIx32
+mpc_i2c_write(uint64_t addr, uint32_t value) "[0x%" PRIx64 "] <- 0x%02" PRIx32
+
 # npcm7xx_smbus.c
 
 npcm7xx_smbus_read(const char *id, uint64_t offset, uint64_t value, unsigned size) "%s offset: 0x%04" PRIx64 " value: 0x%02" PRIx64 " size: %u"
-- 
2.47.0

Re: [PATCH v3 11/26] hw/i2c/mpc_i2c: Convert DPRINTF to trace events for register access

Posted by Corey Minyard 1 year, 3 months ago

On Sat, Nov 02, 2024 at 02:17:00PM +0100, Bernhard Beschow wrote:
> Reviewed-by: Cédric Le Goater <clg@redhat.com>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>

Signed-off-by: Corey Minyard <cminyard@mvista.com>

> ---
>  hw/i2c/mpc_i2c.c    | 9 +++++----
>  hw/i2c/trace-events | 5 +++++
>  2 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c
> index 2467d1a9aa..3d79c15653 100644
> --- a/hw/i2c/mpc_i2c.c
> +++ b/hw/i2c/mpc_i2c.c
> @@ -24,6 +24,7 @@
>  #include "hw/sysbus.h"
>  #include "migration/vmstate.h"
>  #include "qom/object.h"
> +#include "trace.h"
>  
>  /* #define DEBUG_I2C */
>  
> @@ -224,8 +225,8 @@ static uint64_t mpc_i2c_read(void *opaque, hwaddr addr, unsigned size)
>          break;
>      }
>  
> -    DPRINTF("%s: addr " HWADDR_FMT_plx " %02" PRIx32 "\n", __func__,
> -                                         addr, value);
> +    trace_mpc_i2c_read(addr, value);
> +
>      return (uint64_t)value;
>  }
>  
> @@ -234,8 +235,8 @@ static void mpc_i2c_write(void *opaque, hwaddr addr,
>  {
>      MPCI2CState *s = opaque;
>  
> -    DPRINTF("%s: addr " HWADDR_FMT_plx " val %08" PRIx64 "\n", __func__,
> -                                             addr, value);
> +    trace_mpc_i2c_write(addr, value);
> +
>      switch (addr) {
>      case MPC_I2C_ADR:
>          s->adr = value & CADR_MASK;
> diff --git a/hw/i2c/trace-events b/hw/i2c/trace-events
> index 6900e06eda..f708a7ace1 100644
> --- a/hw/i2c/trace-events
> +++ b/hw/i2c/trace-events
> @@ -35,6 +35,11 @@ aspeed_i2c_bus_write(uint32_t busid, uint64_t offset, unsigned size, uint64_t va
>  aspeed_i2c_bus_send(const char *mode, int i, int count, uint8_t byte) "%s send %d/%d 0x%02x"
>  aspeed_i2c_bus_recv(const char *mode, int i, int count, uint8_t byte) "%s recv %d/%d 0x%02x"
>  
> +# mpc_i2c.c
> +
> +mpc_i2c_read(uint64_t addr, uint32_t value) "[0x%" PRIx64 "] -> 0x%02" PRIx32
> +mpc_i2c_write(uint64_t addr, uint32_t value) "[0x%" PRIx64 "] <- 0x%02" PRIx32
> +
>  # npcm7xx_smbus.c
>  
>  npcm7xx_smbus_read(const char *id, uint64_t offset, uint64_t value, unsigned size) "%s offset: 0x%04" PRIx64 " value: 0x%02" PRIx64 " size: %u"
> -- 
> 2.47.0
> 
>

Re: [PATCH v3 11/26] hw/i2c/mpc_i2c: Convert DPRINTF to trace events for register access

Posted by BALATON Zoltan 1 year, 3 months ago

On Sat, 2 Nov 2024, Corey Minyard wrote:
> On Sat, Nov 02, 2024 at 02:17:00PM +0100, Bernhard Beschow wrote:
>> Reviewed-by: Cédric Le Goater <clg@redhat.com>
>> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>
> Signed-off-by: Corey Minyard <cminyard@mvista.com>

Did you mean Reviewed-by or was it your patch that Bernhard picked up?

Regards,
BALATON Zoltan

Re: [PATCH v3 11/26] hw/i2c/mpc_i2c: Convert DPRINTF to trace events for register access

Posted by Corey Minyard 1 year, 3 months ago

On Sun, Nov 03, 2024 at 12:08:22AM +0100, BALATON Zoltan wrote:
> On Sat, 2 Nov 2024, Corey Minyard wrote:
> > On Sat, Nov 02, 2024 at 02:17:00PM +0100, Bernhard Beschow wrote:
> > > Reviewed-by: Cédric Le Goater <clg@redhat.com>
> > > Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> > 
> > Signed-off-by: Corey Minyard <cminyard@mvista.com>
> 
> Did you mean Reviewed-by or was it your patch that Bernhard picked up?

Sorry, that should be:

Acked-by: Corey Minyard <cminyard@mvista.com>

> 
> Regards,
> BALATON Zoltan