@samitouri / QOSamiQemu / commits / a1a88adb25

hw/misc/imx25_ccm: Replace DPRINTF with trace events

Signed-off-by: jack wang <163wangjack@gmail.com> [PMM: Removed incorrect change to a function prototype; use just "trace.h" for include] Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

jack wang committed Jun 26, 2026 at 00:01 UTC a1a88adb2556226db0eca4e14ebfd7237f8f43bc
2 files changed +18 -23
hw/misc/imx25_ccm.c
+9 -23
@@ -16,18 +16,8 @@
16 #include "migration/vmstate.h"
17 #include "qemu/log.h"
18 #include "qemu/module.h"
19 +#include "hw/misc/trace.h"
20
20 -#ifndef DEBUG_IMX25_CCM
21 -#define DEBUG_IMX25_CCM 0
22 -#endif
23 -
24 -#define DPRINTF(fmt, args...) \
25 - do { \
26 - if (DEBUG_IMX25_CCM) { \
27 - fprintf(stderr, "[%s]%s: " fmt , TYPE_IMX25_CCM, \
28 - __func__, ##args); \
29 - } \
30 - } while (0)
21
22 static const char *imx25_ccm_reg_name(uint32_t reg)
23 {
@@ -118,7 +108,7 @@ static uint32_t imx25_ccm_get_mpll_clk(IMXCCMState *dev)
108 freq = imx_ccm_calc_pll(s->reg[IMX25_CCM_MPCTL_REG], CKIH_FREQ);
109 }
110
121 - DPRINTF("freq = %u\n", freq);
111 + trace_imx25_ccm_get_mpll_clk(freq);
112
113 return freq;
114 }
@@ -136,7 +126,7 @@ static uint32_t imx25_ccm_get_mcu_clk(IMXCCMState *dev)
126
127 freq = freq / (1 + EXTRACT(s->reg[IMX25_CCM_CCTL_REG], ARM_CLK_DIV));
128
139 - DPRINTF("freq = %u\n", freq);
129 + trace_imx25_ccm_get_mcu_clk(freq);
130
131 return freq;
132 }
@@ -149,7 +139,7 @@ static uint32_t imx25_ccm_get_ahb_clk(IMXCCMState *dev)
139 freq = imx25_ccm_get_mcu_clk(dev)
140 / (1 + EXTRACT(s->reg[IMX25_CCM_CCTL_REG], AHB_CLK_DIV));
141
152 - DPRINTF("freq = %u\n", freq);
142 + trace_imx25_ccm_get_ahb_clk(freq);
143
144 return freq;
145 }
@@ -160,7 +150,7 @@ static uint32_t imx25_ccm_get_ipg_clk(IMXCCMState *dev)
150
151 freq = imx25_ccm_get_ahb_clk(dev) / 2;
152
163 - DPRINTF("freq = %u\n", freq);
153 + trace_imx25_ccm_get_ipg_clk(freq);
154
155 return freq;
156 }
@@ -168,7 +158,7 @@ static uint32_t imx25_ccm_get_ipg_clk(IMXCCMState *dev)
158 static uint32_t imx25_ccm_get_clock_frequency(IMXCCMState *dev, IMXClk clock)
159 {
160 uint32_t freq = 0;
171 - DPRINTF("Clock = %d)\n", clock);
161 + trace_imx25_ccm_get_clock_frequency(clock, freq);
162
163 switch (clock) {
164 case CLK_NONE:
@@ -186,7 +176,7 @@ static uint32_t imx25_ccm_get_clock_frequency(IMXCCMState *dev, IMXClk clock)
176 break;
177 }
178
189 - DPRINTF("Clock = %d) = %u\n", clock, freq);
179 + trace_imx25_ccm_get_clock_frequency(clock, freq);
180
181 return freq;
182 }
@@ -195,8 +185,6 @@ static void imx25_ccm_reset(DeviceState *dev)
185 {
186 IMX25CCMState *s = IMX25_CCM(dev);
187
198 - DPRINTF("\n");
199 -
188 memset(s->reg, 0, IMX25_CCM_MAX_REG * sizeof(uint32_t));
189 s->reg[IMX25_CCM_MPCTL_REG] = 0x800b2c01;
190 s->reg[IMX25_CCM_UPCTL_REG] = 0x84042800;
@@ -238,8 +226,7 @@ static uint64_t imx25_ccm_read(void *opaque, hwaddr offset, unsigned size)
226 HWADDR_PRIx "\n", TYPE_IMX25_CCM, __func__, offset);
227 }
228
241 - DPRINTF("reg[%s] => 0x%" PRIx32 "\n", imx25_ccm_reg_name(offset >> 2),
242 - value);
229 + trace_imx25_ccm_read(imx25_ccm_reg_name(offset >> 2), value);
230
231 return value;
232 }
@@ -249,8 +236,7 @@ static void imx25_ccm_write(void *opaque, hwaddr offset, uint64_t value,
236 {
237 IMX25CCMState *s = (IMX25CCMState *)opaque;
238
252 - DPRINTF("reg[%s] <= 0x%" PRIx32 "\n", imx25_ccm_reg_name(offset >> 2),
253 - (uint32_t)value);
239 + trace_imx25_ccm_write(imx25_ccm_reg_name(offset >> 2), value);
240
241 if (offset < 0x70) {
242 /*
hw/misc/trace-events
+9
@@ -275,6 +275,15 @@ imx6_src_reset(void) ""
275 imx7_src_read(const char *reg_name, uint32_t value) "reg[%s] => 0x%" PRIx32
276 imx7_src_write(const char *reg_name, uint32_t value) "reg[%s] <= 0x%" PRIx32
277
278 +# imx25_ccm.c
279 +imx25_ccm_get_mpll_clk(uint32_t freq) "freq = %u"
280 +imx25_ccm_get_mcu_clk(uint32_t freq) "freq = %u"
281 +imx25_ccm_get_ahb_clk(uint32_t freq) "freq = %u"
282 +imx25_ccm_get_ipg_clk(uint32_t freq) "freq = %u"
283 +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 # iotkit-sysinfo.c
288 iotkit_sysinfo_read(uint64_t offset, uint64_t data, unsigned size) "IoTKit SysInfo read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
289 iotkit_sysinfo_write(uint64_t offset, uint64_t data, unsigned size) "IoTKit SysInfo write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"