* [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert to trace events @ 2019-06-26 12:20 Philippe Mathieu-Daudé 2019-06-26 12:20 ` [Qemu-devel] [PATCH 1/2] MAINTAINERS: Add missing m48t59 files to the PReP section Philippe Mathieu-Daudé ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: Philippe Mathieu-Daudé @ 2019-06-26 12:20 UTC (permalink / raw) To: qemu-trivial, qemu-devel Cc: Hervé Poussineau, qemu-ppc, Philippe Mathieu-Daudé Another trivial cleanup series. Philippe Mathieu-Daudé (2): MAINTAINERS: Add missing m48t59 files to the PReP section hw/timer/m48t59: Convert debug printf()s to trace events MAINTAINERS | 2 ++ hw/timer/m48t59-internal.h | 5 ----- hw/timer/m48t59.c | 11 +++++------ hw/timer/trace-events | 6 ++++++ 4 files changed, 13 insertions(+), 11 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 1/2] MAINTAINERS: Add missing m48t59 files to the PReP section 2019-06-26 12:20 [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert to trace events Philippe Mathieu-Daudé @ 2019-06-26 12:20 ` Philippe Mathieu-Daudé 2019-06-26 12:20 ` [Qemu-devel] [PATCH 2/2] hw/timer/m48t59: Convert debug printf()s to trace events Philippe Mathieu-Daudé 2019-07-04 10:33 ` [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert " Philippe Mathieu-Daudé 2 siblings, 0 replies; 6+ messages in thread From: Philippe Mathieu-Daudé @ 2019-06-26 12:20 UTC (permalink / raw) To: qemu-trivial, qemu-devel Cc: Hervé Poussineau, qemu-ppc, Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index cad58b9487..fbe89c0812 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1047,6 +1047,8 @@ F: hw/pci-host/prep.[hc] F: hw/isa/i82378.c F: hw/isa/pc87312.c F: hw/dma/i82374.c +F: hw/timer/m48t59.c +F: hw/timer/m48t59-internal.h F: hw/timer/m48t59-isa.c F: include/hw/isa/pc87312.h F: include/hw/timer/m48t59.h -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 2/2] hw/timer/m48t59: Convert debug printf()s to trace events 2019-06-26 12:20 [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert to trace events Philippe Mathieu-Daudé 2019-06-26 12:20 ` [Qemu-devel] [PATCH 1/2] MAINTAINERS: Add missing m48t59 files to the PReP section Philippe Mathieu-Daudé @ 2019-06-26 12:20 ` Philippe Mathieu-Daudé 2019-07-04 10:33 ` [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert " Philippe Mathieu-Daudé 2 siblings, 0 replies; 6+ messages in thread From: Philippe Mathieu-Daudé @ 2019-06-26 12:20 UTC (permalink / raw) To: qemu-trivial, qemu-devel Cc: Hervé Poussineau, qemu-ppc, Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/timer/m48t59-internal.h | 5 ----- hw/timer/m48t59.c | 11 +++++------ hw/timer/trace-events | 6 ++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/timer/m48t59-internal.h b/hw/timer/m48t59-internal.h index 4d4f2a6fed..cd648241e9 100644 --- a/hw/timer/m48t59-internal.h +++ b/hw/timer/m48t59-internal.h @@ -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 diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 030c8872a2..d50b4ddea2 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -33,6 +33,7 @@ #include "exec/address-spaces.h" #include "qemu/bcd.h" #include "qemu/module.h" +#include "trace.h" #include "m48t59-internal.h" @@ -189,8 +190,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) || @@ -447,8 +447,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; } @@ -459,7 +458,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; @@ -491,7 +490,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; } diff --git a/hw/timer/trace-events b/hw/timer/trace-events index dcaf3d6da6..66ccdd0974 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -83,3 +83,9 @@ pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" pl031_alarm_raised(void) "alarm raised" pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks" + +# 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" -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert to trace events 2019-06-26 12:20 [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert to trace events Philippe Mathieu-Daudé 2019-06-26 12:20 ` [Qemu-devel] [PATCH 1/2] MAINTAINERS: Add missing m48t59 files to the PReP section Philippe Mathieu-Daudé 2019-06-26 12:20 ` [Qemu-devel] [PATCH 2/2] hw/timer/m48t59: Convert debug printf()s to trace events Philippe Mathieu-Daudé @ 2019-07-04 10:33 ` Philippe Mathieu-Daudé 2019-11-21 15:28 ` Markus Armbruster 2 siblings, 1 reply; 6+ messages in thread From: Philippe Mathieu-Daudé @ 2019-07-04 10:33 UTC (permalink / raw) To: qemu-trivial, qemu-devel; +Cc: Hervé Poussineau, qemu-ppc ping? On 6/26/19 2:20 PM, Philippe Mathieu-Daudé wrote: > Another trivial cleanup series. > > Philippe Mathieu-Daudé (2): > MAINTAINERS: Add missing m48t59 files to the PReP section > hw/timer/m48t59: Convert debug printf()s to trace events > > MAINTAINERS | 2 ++ > hw/timer/m48t59-internal.h | 5 ----- > hw/timer/m48t59.c | 11 +++++------ > hw/timer/trace-events | 6 ++++++ > 4 files changed, 13 insertions(+), 11 deletions(-) > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert to trace events 2019-07-04 10:33 ` [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert " Philippe Mathieu-Daudé @ 2019-11-21 15:28 ` Markus Armbruster 2019-11-21 16:21 ` Philippe Mathieu-Daudé 0 siblings, 1 reply; 6+ messages in thread From: Markus Armbruster @ 2019-11-21 15:28 UTC (permalink / raw) To: Philippe Mathieu-Daudé Cc: qemu-trivial, qemu-ppc, Hervé Poussineau, qemu-devel Philippe Mathieu-Daudé <philmd@redhat.com> writes: > ping? Did this fall through the cracks? > On 6/26/19 2:20 PM, Philippe Mathieu-Daudé wrote: >> Another trivial cleanup series. >> >> Philippe Mathieu-Daudé (2): >> MAINTAINERS: Add missing m48t59 files to the PReP section >> hw/timer/m48t59: Convert debug printf()s to trace events >> >> MAINTAINERS | 2 ++ >> hw/timer/m48t59-internal.h | 5 ----- >> hw/timer/m48t59.c | 11 +++++------ >> hw/timer/trace-events | 6 ++++++ >> 4 files changed, 13 insertions(+), 11 deletions(-) >> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert to trace events 2019-11-21 15:28 ` Markus Armbruster @ 2019-11-21 16:21 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 6+ messages in thread From: Philippe Mathieu-Daudé @ 2019-11-21 16:21 UTC (permalink / raw) To: Markus Armbruster Cc: qemu-trivial, qemu-ppc, Hervé Poussineau, qemu-devel On 11/21/19 4:28 PM, Markus Armbruster wrote: > Philippe Mathieu-Daudé <philmd@redhat.com> writes: > >> ping? > > Did this fall through the cracks? Certainly =) Thanks for noticing. This now need a (trivial) rebase. I'll respin for 5.0. >> On 6/26/19 2:20 PM, Philippe Mathieu-Daudé wrote: >>> Another trivial cleanup series. >>> >>> Philippe Mathieu-Daudé (2): >>> MAINTAINERS: Add missing m48t59 files to the PReP section >>> hw/timer/m48t59: Convert debug printf()s to trace events >>> >>> MAINTAINERS | 2 ++ >>> hw/timer/m48t59-internal.h | 5 ----- >>> hw/timer/m48t59.c | 11 +++++------ >>> hw/timer/trace-events | 6 ++++++ >>> 4 files changed, 13 insertions(+), 11 deletions(-) >>> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-11-21 16:23 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-06-26 12:20 [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert to trace events Philippe Mathieu-Daudé 2019-06-26 12:20 ` [Qemu-devel] [PATCH 1/2] MAINTAINERS: Add missing m48t59 files to the PReP section Philippe Mathieu-Daudé 2019-06-26 12:20 ` [Qemu-devel] [PATCH 2/2] hw/timer/m48t59: Convert debug printf()s to trace events Philippe Mathieu-Daudé 2019-07-04 10:33 ` [Qemu-devel] [PATCH 0/2] hw/timer/m48t59: Convert " Philippe Mathieu-Daudé 2019-11-21 15:28 ` Markus Armbruster 2019-11-21 16:21 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).