---
hw/misc/imx31_ccm.c | 33 ++++++++++-----------------------
hw/misc/trace-events | 10 ++++++++++
2 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c
index 339458e859..e3edd6df8f 100644
--- a/hw/misc/imx31_ccm.c
+++ b/hw/misc/imx31_ccm.c
@@ -16,21 +16,10 @@
#include "migration/vmstate.h"
#include "qemu/log.h"
#include "qemu/module.h"
+#include "hw/misc/trace.h"
#define CKIH_FREQ 26000000 /* 26MHz crystal input */
-#ifndef DEBUG_IMX31_CCM
-#define DEBUG_IMX31_CCM 0
-#endif
-
-#define DPRINTF(fmt, args...) \
- do { \
- if (DEBUG_IMX31_CCM) { \
- fprintf(stderr, "[%s]%s: " fmt , TYPE_IMX31_CCM, \
- __func__, ##args); \
- } \
- } while (0)
-
static const char *imx31_ccm_reg_name(uint32_t reg)
{
static char unknown[20];
@@ -120,7 +109,7 @@ static uint32_t imx31_ccm_get_pll_ref_clk(IMXCCMState *dev)
freq = CKIH_FREQ;
}
- DPRINTF("freq = %u\n", freq);
+ trace_imx31_ccm_get_pll_ref_clk(freq);
return freq;
}
@@ -133,7 +122,7 @@ static uint32_t imx31_ccm_get_mpll_clk(IMXCCMState *dev)
freq = imx_ccm_calc_pll(s->reg[IMX31_CCM_MPCTL_REG],
imx31_ccm_get_pll_ref_clk(dev));
- DPRINTF("freq = %u\n", freq);
+ trace_imx31_ccm_get_mpll_clk(freq);
return freq;
}
@@ -150,7 +139,7 @@ static uint32_t imx31_ccm_get_mcu_main_clk(IMXCCMState *dev)
freq = imx31_ccm_get_mpll_clk(dev);
}
- DPRINTF("freq = %u\n", freq);
+ trace_imx31_ccm_get_mcu_main_clk(freq);
return freq;
}
@@ -163,7 +152,7 @@ static uint32_t imx31_ccm_get_hclk_clk(IMXCCMState *dev)
freq = imx31_ccm_get_mcu_main_clk(dev)
/ (1 + EXTRACT(s->reg[IMX31_CCM_PDR0_REG], MAX));
- DPRINTF("freq = %u\n", freq);
+ trace_imx31_ccm_get_hclk_clk(freq);
return freq;
}
@@ -176,7 +165,7 @@ static uint32_t imx31_ccm_get_ipg_clk(IMXCCMState *dev)
freq = imx31_ccm_get_hclk_clk(dev)
/ (1 + EXTRACT(s->reg[IMX31_CCM_PDR0_REG], IPG));
- DPRINTF("freq = %u\n", freq);
+ trace_imx31_ccm_get_ipg_clk(freq);
return freq;
}
@@ -201,7 +190,7 @@ static uint32_t imx31_ccm_get_clock_frequency(IMXCCMState
*dev, IMXClk clock)
break;
}
- DPRINTF("Clock = %d) = %u\n", clock, freq);
+ trace_imx31_ccm_get_clock_frequency(clock, freq);
return freq;
}
@@ -210,7 +199,7 @@ static void imx31_ccm_reset(DeviceState *dev)
{
IMX31CCMState *s = IMX31_CCM(dev);
- DPRINTF("()\n");
+
memset(s->reg, 0, sizeof(uint32_t) * IMX31_CCM_MAX_REG);
@@ -244,8 +233,7 @@ static uint64_t imx31_ccm_read(void *opaque, hwaddr offset,
unsigned size)
HWADDR_PRIx "\n", TYPE_IMX31_CCM, __func__, offset);
}
- DPRINTF("reg[%s] => 0x%" PRIx32 "\n", imx31_ccm_reg_name(offset >> 2),
- value);
+ trace_imx31_ccm_read(imx31_ccm_reg_name(offset >> 2), value);
return (uint64_t)value;
}
@@ -255,8 +243,7 @@ static void imx31_ccm_write(void *opaque, hwaddr offset,
uint64_t value,
{
IMX31CCMState *s = (IMX31CCMState *)opaque;
- DPRINTF("reg[%s] <= 0x%" PRIx32 "\n", imx31_ccm_reg_name(offset >> 2),
- (uint32_t)value);
+ trace_imx31_ccm_write(imx31_ccm_reg_name(offset >> 2), value);
switch (offset >> 2) {
case IMX31_CCM_CCMR_REG:
diff --git a/hw/misc/trace-events b/hw/misc/trace-events
index ebe9b4fb22..0c2565ddb8 100644
--- a/hw/misc/trace-events
+++ b/hw/misc/trace-events
@@ -282,6 +282,16 @@ imx25_ccm_get_clock_frequency(unsigned clock, uint32_t
freq) "(clock = %d) = %u"
imx25_ccm_read(const char *reg, uint32_t value) "reg[%s] => 0x%" PRIx32
imx25_ccm_write(const char *reg, uint32_t value) "reg[%s] <= 0x%" PRIx32
+# imx31_ccm.c
+imx31_ccm_get_mpll_clk(uint32_t freq) "freq = %u"
+imx31_ccm_get_pll_ref_clk(uint32_t freq) "freq = %u"
+imx31_ccm_get_mcu_main_clk(uint32_t freq) "freq = %u"
+imx31_ccm_get_hclk_clk(uint32_t freq) "freq = %u"
+imx31_ccm_get_ipg_clk(uint32_t freq) "freq = %u"
+imx31_ccm_get_clock_frequency(unsigned clock, uint32_t freq) "(clock = %u) =
%u"
+imx31_ccm_read(const char *reg, uint32_t value) "reg[%s] => 0x%" PRIx32
+imx31_ccm_write(const char *reg, uint32_t value) "reg[%s] <= 0x%" PRIx32
+
# iotkit-sysinfo.c
iotkit_sysinfo_read(uint64_t offset, uint64_t data, unsigned size) "IoTKit
SysInfo read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
iotkit_sysinfo_write(uint64_t offset, uint64_t data, unsigned size) "IoTKit
SysInfo write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
--
2.53.0
