@samitouri / QOSamiQemu / commits / b649e02058

hw/misc/imx31_ccm: Replace DPRINTF with trace events

Signed-off-by: jack wang <163wangjack@gmail.com> [PMM: Remove stray loss of a brace; use trace.h] Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Peter Maydell committed Jul 3, 2026 at 10:52 UTC b649e02058d442649c5fad657f6846a10a4ff94a
2 files changed +19 -24
hw/misc/imx31_ccm.c
+9 -24
@@ -16,21 +16,10 @@
16 #include "migration/vmstate.h"
17 #include "qemu/log.h"
18 #include "qemu/module.h"
19 +#include "trace.h"
20
21 #define CKIH_FREQ 26000000 /* 26MHz crystal input */
22
22 -#ifndef DEBUG_IMX31_CCM
23 -#define DEBUG_IMX31_CCM 0
24 -#endif
25 -
26 -#define DPRINTF(fmt, args...) \
27 - do { \
28 - if (DEBUG_IMX31_CCM) { \
29 - fprintf(stderr, "[%s]%s: " fmt , TYPE_IMX31_CCM, \
30 - __func__, ##args); \
31 - } \
32 - } while (0)
33 -
23 static const char *imx31_ccm_reg_name(uint32_t reg)
24 {
25 static char unknown[20];
@@ -120,7 +109,7 @@ static uint32_t imx31_ccm_get_pll_ref_clk(IMXCCMState *dev)
109 freq = CKIH_FREQ;
110 }
111
123 - DPRINTF("freq = %u\n", freq);
112 + trace_imx31_ccm_get_pll_ref_clk(freq);
113
114 return freq;
115 }
@@ -133,7 +122,7 @@ static uint32_t imx31_ccm_get_mpll_clk(IMXCCMState *dev)
122 freq = imx_ccm_calc_pll(s->reg[IMX31_CCM_MPCTL_REG],
123 imx31_ccm_get_pll_ref_clk(dev));
124
136 - DPRINTF("freq = %u\n", freq);
125 + trace_imx31_ccm_get_mpll_clk(freq);
126
127 return freq;
128 }
@@ -150,7 +139,7 @@ static uint32_t imx31_ccm_get_mcu_main_clk(IMXCCMState *dev)
139 freq = imx31_ccm_get_mpll_clk(dev);
140 }
141
153 - DPRINTF("freq = %u\n", freq);
142 + trace_imx31_ccm_get_mcu_main_clk(freq);
143
144 return freq;
145 }
@@ -163,7 +152,7 @@ static uint32_t imx31_ccm_get_hclk_clk(IMXCCMState *dev)
152 freq = imx31_ccm_get_mcu_main_clk(dev)
153 / (1 + EXTRACT(s->reg[IMX31_CCM_PDR0_REG], MAX));
154
166 - DPRINTF("freq = %u\n", freq);
155 + trace_imx31_ccm_get_hclk_clk(freq);
156
157 return freq;
158 }
@@ -176,7 +165,7 @@ static uint32_t imx31_ccm_get_ipg_clk(IMXCCMState *dev)
165 freq = imx31_ccm_get_hclk_clk(dev)
166 / (1 + EXTRACT(s->reg[IMX31_CCM_PDR0_REG], IPG));
167
179 - DPRINTF("freq = %u\n", freq);
168 + trace_imx31_ccm_get_ipg_clk(freq);
169
170 return freq;
171 }
@@ -201,7 +190,7 @@ static uint32_t imx31_ccm_get_clock_frequency(IMXCCMState *dev, IMXClk clock)
190 break;
191 }
192
204 - DPRINTF("Clock = %d) = %u\n", clock, freq);
193 + trace_imx31_ccm_get_clock_frequency(clock, freq);
194
195 return freq;
196 }
@@ -210,8 +199,6 @@ static void imx31_ccm_reset(DeviceState *dev)
199 {
200 IMX31CCMState *s = IMX31_CCM(dev);
201
213 - DPRINTF("()\n");
214 -
202 memset(s->reg, 0, sizeof(uint32_t) * IMX31_CCM_MAX_REG);
203
204 s->reg[IMX31_CCM_CCMR_REG] = 0x074b0b7d;
@@ -244,8 +231,7 @@ static uint64_t imx31_ccm_read(void *opaque, hwaddr offset, unsigned size)
231 HWADDR_PRIx "\n", TYPE_IMX31_CCM, __func__, offset);
232 }
233
247 - DPRINTF("reg[%s] => 0x%" PRIx32 "\n", imx31_ccm_reg_name(offset >> 2),
248 - value);
234 + trace_imx31_ccm_read(imx31_ccm_reg_name(offset >> 2), value);
235
236 return (uint64_t)value;
237 }
@@ -255,8 +241,7 @@ static void imx31_ccm_write(void *opaque, hwaddr offset, uint64_t value,
241 {
242 IMX31CCMState *s = (IMX31CCMState *)opaque;
243
258 - DPRINTF("reg[%s] <= 0x%" PRIx32 "\n", imx31_ccm_reg_name(offset >> 2),
259 - (uint32_t)value);
244 + trace_imx31_ccm_write(imx31_ccm_reg_name(offset >> 2), value);
245
246 switch (offset >> 2) {
247 case IMX31_CCM_CCMR_REG:
hw/misc/trace-events
+10
@@ -284,6 +284,16 @@ imx25_ccm_get_clock_frequency(unsigned clock, uint32_t freq) "(clock = %d) = %u"
284 imx25_ccm_read(const char *reg, uint32_t value) "reg[%s] => 0x%" PRIx32
285 imx25_ccm_write(const char *reg, uint32_t value) "reg[%s] <= 0x%" PRIx32
286
287 +# imx31_ccm.c
288 +imx31_ccm_get_mpll_clk(uint32_t freq) "freq = %u"
289 +imx31_ccm_get_pll_ref_clk(uint32_t freq) "freq = %u"
290 +imx31_ccm_get_mcu_main_clk(uint32_t freq) "freq = %u"
291 +imx31_ccm_get_hclk_clk(uint32_t freq) "freq = %u"
292 +imx31_ccm_get_ipg_clk(uint32_t freq) "freq = %u"
293 +imx31_ccm_get_clock_frequency(unsigned clock, uint32_t freq) "(clock = %u) = %u"
294 +imx31_ccm_read(const char *reg, uint32_t value) "reg[%s] => 0x%" PRIx32
295 +imx31_ccm_write(const char *reg, uint32_t value) "reg[%s] <= 0x%" PRIx32
296 +
297 # iotkit-sysinfo.c
298 iotkit_sysinfo_read(uint64_t offset, uint64_t data, unsigned size) "IoTKit SysInfo read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
299 iotkit_sysinfo_write(uint64_t offset, uint64_t data, unsigned size) "IoTKit SysInfo write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"