Skip to contentSkip to conversation

hw/timer/m48t59: Convert to trace events

PATCH Applied Philippe Mathieu-Daudé 4 participants 9 messages Jan 17, 2020 – Feb 6, 2020

lore
Share & tools
lore
#0 lore raw

v3 cover hw/timer/m48t59: Convert to trace events

Another trivial cleanup series.

v2: Rebased on 4.2

Philippe Mathieu-Daudé (2):
MAINTAINERS: Add missing m48t59 files to the PReP section hw/timer/m48t59: Convert debug printf()s to trace events

 hw/rtc/m48t59-internal.h |  5 -----
 hw/rtc/m48t59.c          | 11 +++++------
 MAINTAINERS              |  2 ++
 hw/rtc/trace-events      |  6 ++++++
 4 files changed, 13 insertions(+), 11 deletions(-)
Signature · 1 line
2.21.1
#1 lore raw

PATCH v3 1/2 MAINTAINERS: Add missing m48t59 files to the PReP section

---
 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)
MAINTAINERS +2 -0
index 4b425d030d..c162145bd0 100644
@@ -1084,6 +1084,8 @@ F: hw/pci-host/prep.[hc]
 F: hw/isa/i82378.c
 F: hw/isa/pc87312.c
 F: hw/dma/i82374.c
+F: hw/rtc/m48t59.c
+F: hw/rtc/m48t59-internal.h
 F: hw/rtc/m48t59-isa.c
 F: include/hw/isa/pc87312.h
 F: include/hw/rtc/m48t59.h
Signature · 1 line
2.21.1
#2 lore raw

Re: [PATCH v3 1/2] MAINTAINERS: Add missing m48t59 files to the PReP section

Quoted 10 lines · Philippe Mathieu-Daudé
---
 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)
MAINTAINERS +0 -0
index 4b425d030d..c162145bd0 100644

MAINTAINERS F: hw/pci-host/prep.[hc] · line 1091

Quoted 8 lines
MAINTAINERS +2 -0
@@ -1084,6 +1084,8 @@ F: hw/pci-host/prep.[hc]
 F: hw/isa/i82378.c
 F: hw/isa/pc87312.c
 F: hw/dma/i82374.c
+F: hw/rtc/m48t59.c
+F: hw/rtc/m48t59-internal.h
 F: hw/rtc/m48t59-isa.c
 F: include/hw/isa/pc87312.h
 F: include/hw/rtc/m48t59.h

Why only PReP? The device seems also to be used by Sparc machines...?

Thomas

#3 lore raw

Re: [PATCH v3 1/2] MAINTAINERS: Add missing m48t59 files to the PReP section

Quoted 6 lines · Thomas Huth
Quoted 5 lines · Philippe Mathieu-Daudé
---
  MAINTAINERS | 2 ++
  1 file changed, 2 insertions(+)
Quoted 15 lines

MAINTAINERS F: hw/pci-host/prep.[hc] · line 1091

Quoted 13 lines
MAINTAINERS +2 -0
index 4b425d030d..c162145bd0 100644
@@ -1084,6 +1084,8 @@ F: hw/pci-host/prep.[hc]
  F: hw/isa/i82378.c
  F: hw/isa/pc87312.c
  F: hw/dma/i82374.c
+F: hw/rtc/m48t59.c
+F: hw/rtc/m48t59-internal.h
  F: hw/rtc/m48t59-isa.c
  F: include/hw/isa/pc87312.h
  F: include/hw/rtc/m48t59.h

Why only PReP? The device seems also to be used by Sparc machines...?

Indeed, and also the PowerPC405 evaluation boards, so I'll simply drop this patch.

#4 lore raw

Re: [PATCH v3 1/2] MAINTAINERS: Add missing m48t59 files to the PReP section

In reply to Philippe Mathieu-Daudé
Quoted 10 lines · Philippe Mathieu-Daudé
---
 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)
MAINTAINERS +0 -0
index 4b425d030d..c162145bd0 100644

MAINTAINERS F: hw/pci-host/prep.[hc] · line 1089

Quoted 6 lines
MAINTAINERS +2 -0
@@ -1084,6 +1084,8 @@ F: hw/pci-host/prep.[hc]
 F: hw/isa/i82378.c
 F: hw/isa/pc87312.c
 F: hw/dma/i82374.c
+F: hw/rtc/m48t59.c
+F: hw/rtc/m48t59-internal.h
 F: hw/rtc/m48t59-isa.c

You could also use a wildcard instead of the three lines:

F: hw/rtc/m48t59*

Thomas

#5 lore raw

PATCH v3 2/2 hw/timer/m48t59: Convert debug printf()s to trace events

In reply to Philippe Mathieu-Daudé
---
 hw/rtc/m48t59-internal.h |  5 -----
 hw/rtc/m48t59.c          | 11 +++++------
 hw/rtc/trace-events      |  6 ++++++
 3 files changed, 11 insertions(+), 11 deletions(-)
hw/rtc/m48t59-internal.h +0 -5
index 4d4f2a6fed..cd648241e9 100644
@@ -26,11 +26,6 @@
 #ifndef HW_M48T59_INTERNAL_H
 #define HW_M48T59_INTERNAL_H
 
-#define M48T59_DEBUG 0
-
-#define NVRAM_PRINTF(fmt, ...) do { \
-    if (M48T59_DEBUG) { printf(fmt , ## __VA_ARGS__); } } while (0)
-
 /*
  * The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has
  * alarm and a watchdog timer and related control registers. In the
hw/rtc/m48t59.c +5 -6
index fc592b9fb1..ecc92ca476 100644
@@ -35,6 +35,7 @@
 #include "exec/address-spaces.h"
 #include "qemu/bcd.h"
 #include "qemu/module.h"
+#include "trace.h"
 
 #include "m48t59-internal.h"
 #include "migration/vmstate.h"
@@ -192,8 +193,7 @@ void m48t59_write(M48t59State *NVRAM, uint32_t addr, uint32_t val)
     struct tm tm;
     int tmp;
 
-    if (addr > 0x1FF8 && addr < 0x2000)
-	NVRAM_PRINTF("%s: 0x%08x => 0x%08x\n", __func__, addr, val);
+    trace_m48txx_nvram_mem_write(addr, val);
 
     /* check for NVRAM access */
     if ((NVRAM->model == 2 && addr < 0x7f8) ||
@@ -450,8 +450,7 @@ uint32_t m48t59_read(M48t59State *NVRAM, uint32_t addr)
 	}
         break;
     }
-    if (addr > 0x1FF9 && addr < 0x2000)
-       NVRAM_PRINTF("%s: 0x%08x <= 0x%08x\n", __func__, addr, retval);
+    trace_m48txx_nvram_mem_read(addr, retval);
 
     return retval;
 }
@@ -462,7 +461,7 @@ static void NVRAM_writeb(void *opaque, hwaddr addr, uint64_t val,
 {
     M48t59State *NVRAM = opaque;
 
-    NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" => 0x%"PRIx64"\n", __func__, addr, val);
+    trace_m48txx_nvram_io_write(addr, val);
     switch (addr) {
     case 0:
         NVRAM->addr &= ~0x00FF;
@@ -494,7 +493,7 @@ static uint64_t NVRAM_readb(void *opaque, hwaddr addr, unsigned size)
         retval = -1;
         break;
     }
-    NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" <= 0x%08x\n", __func__, addr, retval);
+    trace_m48txx_nvram_io_read(addr, retval);
 
     return retval;
 }
hw/rtc/trace-events +6 -0
index d6749f4616..52c1566198 100644
@@ -17,3 +17,9 @@ pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"
 # aspeed-rtc.c
 aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
 aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
+
+# m48t59.c
+m48txx_nvram_io_read(uint64_t addr, uint64_t value) "io read addr:0x%04" PRIx64 " value:0x%02" PRIx64
+m48txx_nvram_io_write(uint64_t addr, uint64_t value) "io write addr:0x%04" PRIx64 " value:0x%02" PRIx64
+m48txx_nvram_mem_read(uint32_t addr, uint32_t value) "mem read addr:0x%04x value:0x%02x"
+m48txx_nvram_mem_write(uint32_t addr, uint32_t value) "mem write addr:0x%04x value:0x%02x"
Signature · 1 line
2.21.1
#6 lore raw

Re: [PATCH v3 2/2] hw/timer/m48t59: Convert debug printf()s to trace events

Quoted 79 lines · Philippe Mathieu-Daudé
---
  hw/rtc/m48t59-internal.h |  5 -----
  hw/rtc/m48t59.c          | 11 +++++------
  hw/rtc/trace-events      |  6 ++++++
  3 files changed, 11 insertions(+), 11 deletions(-)
hw/rtc/m48t59-internal.h +0 -5
index 4d4f2a6fed..cd648241e9 100644
@@ -26,11 +26,6 @@
  #ifndef HW_M48T59_INTERNAL_H
  #define HW_M48T59_INTERNAL_H
 
-#define M48T59_DEBUG 0
-
-#define NVRAM_PRINTF(fmt, ...) do { \
-    if (M48T59_DEBUG) { printf(fmt , ## __VA_ARGS__); } } while (0)
-
  /*
   * The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has
   * alarm and a watchdog timer and related control registers. In the
hw/rtc/m48t59.c +5 -6
index fc592b9fb1..ecc92ca476 100644
@@ -35,6 +35,7 @@
  #include "exec/address-spaces.h"
  #include "qemu/bcd.h"
  #include "qemu/module.h"
+#include "trace.h"
 
  #include "m48t59-internal.h"
  #include "migration/vmstate.h"
@@ -192,8 +193,7 @@ void m48t59_write(M48t59State *NVRAM, uint32_t addr, uint32_t val)
      struct tm tm;
      int tmp;
 
-    if (addr > 0x1FF8 && addr < 0x2000)
-	NVRAM_PRINTF("%s: 0x%08x => 0x%08x\n", __func__, addr, val);
+    trace_m48txx_nvram_mem_write(addr, val);
 
      /* check for NVRAM access */
      if ((NVRAM->model == 2 && addr < 0x7f8) ||
@@ -450,8 +450,7 @@ uint32_t m48t59_read(M48t59State *NVRAM, uint32_t addr)
  	}
          break;
      }
-    if (addr > 0x1FF9 && addr < 0x2000)
-       NVRAM_PRINTF("%s: 0x%08x <= 0x%08x\n", __func__, addr, retval);
+    trace_m48txx_nvram_mem_read(addr, retval);
 
      return retval;
  }
@@ -462,7 +461,7 @@ static void NVRAM_writeb(void *opaque, hwaddr addr, uint64_t val,
  {
      M48t59State *NVRAM = opaque;
 
-    NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" => 0x%"PRIx64"\n", __func__, addr, val);
+    trace_m48txx_nvram_io_write(addr, val);
      switch (addr) {
      case 0:
          NVRAM->addr &= ~0x00FF;
@@ -494,7 +493,7 @@ static uint64_t NVRAM_readb(void *opaque, hwaddr addr, unsigned size)
          retval = -1;
          break;
      }
-    NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" <= 0x%08x\n", __func__, addr, retval);
+    trace_m48txx_nvram_io_read(addr, retval);
 
      return retval;
  }
hw/rtc/trace-events +0 -0
index d6749f4616..52c1566198 100644

hw/rtc/trace-events pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks" · line 25

Quoted 9 lines
hw/rtc/trace-events +6 -0
@@ -17,3 +17,9 @@ pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"
  # aspeed-rtc.c
  aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
  aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
+
+# m48t59.c
+m48txx_nvram_io_read(uint64_t addr, uint64_t value) "io read addr:0x%04" PRIx64 " value:0x%02" PRIx64
+m48txx_nvram_io_write(uint64_t addr, uint64_t value) "io write addr:0x%04" PRIx64 " value:0x%02" PRIx64
+m48txx_nvram_mem_read(uint32_t addr, uint32_t value) "mem read addr:0x%04x value:0x%02x"
+m48txx_nvram_mem_write(uint32_t addr, uint32_t value) "mem write addr:0x%04x value:0x%02x"

I dropped the other patch from this series.

Since Hervé already reviewed it:
https://www.mail-archive.com/[email protected]/msg671652.html
and it applies properly, can it get queued?

Thanks,

Phil.

#7 lore raw

Re: [PATCH v3 2/2] hw/timer/m48t59: Convert debug printf()s to trace events

In reply to Philippe Mathieu-Daudé

Le 17/01/2020 à 17:58, Philippe Mathieu-Daudé a écrit :

Quoted 79 lines
---
 hw/rtc/m48t59-internal.h |  5 -----
 hw/rtc/m48t59.c          | 11 +++++------
 hw/rtc/trace-events      |  6 ++++++
 3 files changed, 11 insertions(+), 11 deletions(-)
hw/rtc/m48t59-internal.h +0 -5
index 4d4f2a6fed..cd648241e9 100644
@@ -26,11 +26,6 @@
 #ifndef HW_M48T59_INTERNAL_H
 #define HW_M48T59_INTERNAL_H
 
-#define M48T59_DEBUG 0
-
-#define NVRAM_PRINTF(fmt, ...) do { \
-    if (M48T59_DEBUG) { printf(fmt , ## __VA_ARGS__); } } while (0)
-
 /*
  * The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has
  * alarm and a watchdog timer and related control registers. In the
hw/rtc/m48t59.c +5 -6
index fc592b9fb1..ecc92ca476 100644
@@ -35,6 +35,7 @@
 #include "exec/address-spaces.h"
 #include "qemu/bcd.h"
 #include "qemu/module.h"
+#include "trace.h"
 
 #include "m48t59-internal.h"
 #include "migration/vmstate.h"
@@ -192,8 +193,7 @@ void m48t59_write(M48t59State *NVRAM, uint32_t addr, uint32_t val)
     struct tm tm;
     int tmp;
 
-    if (addr > 0x1FF8 && addr < 0x2000)
-	NVRAM_PRINTF("%s: 0x%08x => 0x%08x\n", __func__, addr, val);
+    trace_m48txx_nvram_mem_write(addr, val);
 
     /* check for NVRAM access */
     if ((NVRAM->model == 2 && addr < 0x7f8) ||
@@ -450,8 +450,7 @@ uint32_t m48t59_read(M48t59State *NVRAM, uint32_t addr)
 	}
         break;
     }
-    if (addr > 0x1FF9 && addr < 0x2000)
-       NVRAM_PRINTF("%s: 0x%08x <= 0x%08x\n", __func__, addr, retval);
+    trace_m48txx_nvram_mem_read(addr, retval);
 
     return retval;
 }
@@ -462,7 +461,7 @@ static void NVRAM_writeb(void *opaque, hwaddr addr, uint64_t val,
 {
     M48t59State *NVRAM = opaque;
 
-    NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" => 0x%"PRIx64"\n", __func__, addr, val);
+    trace_m48txx_nvram_io_write(addr, val);
     switch (addr) {
     case 0:
         NVRAM->addr &= ~0x00FF;
@@ -494,7 +493,7 @@ static uint64_t NVRAM_readb(void *opaque, hwaddr addr, unsigned size)
         retval = -1;
         break;
     }
-    NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" <= 0x%08x\n", __func__, addr, retval);
+    trace_m48txx_nvram_io_read(addr, retval);
 
     return retval;
 }
hw/rtc/trace-events +0 -0
index d6749f4616..52c1566198 100644

hw/rtc/trace-events pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks" · line 25

Quoted 9 lines
hw/rtc/trace-events +6 -0
@@ -17,3 +17,9 @@ pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"
 # aspeed-rtc.c
 aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
 aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
+
+# m48t59.c
+m48txx_nvram_io_read(uint64_t addr, uint64_t value) "io read addr:0x%04" PRIx64 " value:0x%02" PRIx64
+m48txx_nvram_io_write(uint64_t addr, uint64_t value) "io write addr:0x%04" PRIx64 " value:0x%02" PRIx64
+m48txx_nvram_mem_read(uint32_t addr, uint32_t value) "mem read addr:0x%04x value:0x%02x"
+m48txx_nvram_mem_write(uint32_t addr, uint32_t value) "mem write addr:0x%04x value:0x%02x"

Applied to my trivial-patches branch.

Thanks,
Laurent

Reviewed-by on the v3 series
#8 lore raw
In reply to Philippe Mathieu-Daudé

Le 17/01/2020 à 17:58, Philippe Mathieu-Daudé a écrit :

Quoted 8 lines

Another trivial cleanup series.

v2: Rebased on 4.2

Philippe Mathieu-Daudé (2):
MAINTAINERS: Add missing m48t59 files to the PReP section hw/timer/m48t59: Convert debug printf()s to trace events

Quoted 6 lines
  hw/rtc/m48t59-internal.h |  5 -----
  hw/rtc/m48t59.c          | 11 +++++------
  MAINTAINERS              |  2 ++
  hw/rtc/trace-events      |  6 ++++++
  4 files changed, 13 insertions(+), 11 deletions(-)