Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7709FCDE002 for ; Thu, 25 Jun 2026 16:02:25 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcmWw-0007dG-6m; Thu, 25 Jun 2026 12:02:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <163wangjack@gmail.com>) id 1wcmWu-0007ZO-I0 for qemu-arm@nongnu.org; Thu, 25 Jun 2026 12:02:16 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <163wangjack@gmail.com>) id 1wcmWs-0006Z6-Me for qemu-arm@nongnu.org; Thu, 25 Jun 2026 12:02:16 -0400 Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-c85a2c012e5so19938a12.1 for ; Thu, 25 Jun 2026 09:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782403333; x=1783008133; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GqaVVqTmkp/8EUEqbNbsHQkfMzS6zhGuIkW9Rs9oFcs=; b=l1obKsaHgwqq0qYsLqVj/GFP08/xTSTRNVE98ov+VujXRmUB52s3xjhICfT+iNnsDs LFvDj76zRF2z/R3JNJtVO4HHnqImlpvWGNHWTlpILk/uc1cv0AK6pGM5ePiiswk/+i/6 HX8WBJAw52n6MG+8ObPXjhgJTmbnTG1SkbkiD5qMwt8M9f4tmuhldXbauc/fh4mX2vV0 WIxYUEswDvJfx0iTKxWbGn82oWnwYEgYgJl+eBFHswt+JiZ6lveQakHJK2I8iyEp78X+ C5WiKk4XJGNZ2HAwFk8mZ3CsS35AIB22Ir450gJV1ucDp7aL+o4IT68tND4SP5M6s7Fz SvbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782403333; x=1783008133; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GqaVVqTmkp/8EUEqbNbsHQkfMzS6zhGuIkW9Rs9oFcs=; b=eekn+UX43MaEG/qqWRl8A1uB7g7XDT+OnONtYAl0S4fntpP7V5K302Jr610vSGezE0 tZbZaOTcfh4SzYlrE9Hk39oorMr/xxrlkM+HfA3njfaCAy6VcUYl7ArjGWRqcrGS79gI j0w0LIWXZ+1os+hnAy9/fbDGXqiJ/E4KP6VyNCLxq2A3GVVYN5PXXJR7aDv8D3VkjhAl irhfkWB5Olc9zJ32HWQrhLewAoPGK48GKOE4I/Yp1PhGY2JsF/nT101P25pioQEwf4u1 HBHVVjUTMSDPP1GAF2uBV8DBPc1hlYsZKtw2Yz/R2yefAIqHM6dCczQ5GUoOAGHU7ZgP aDsw== X-Forwarded-Encrypted: i=1; AFNElJ8kcMRrrYKRHXGGRTb9nxhpyNBuMoxZKeuq/M6ONGpYM4ElAzL8niSFLKQd5to6pL88xSOIS5O+rg==@nongnu.org X-Gm-Message-State: AOJu0YwO4dYNxQDQvdIFch6/PLepbI9M3hvCuXc2mFia9WiEE4t4aFno JioYi2SarFcKW5+FeGEjI7oTOxVfftNkcj6T0yfmkaIaMWSZtLZ0AwZd X-Gm-Gg: AfdE7ckmi2et62JsTlIrHUHDJ4Kk3oFyNrRwLJrsNLqElL1c5xJJ8cDSlQ8RwmnZ4vH TWFgpjlxbsrpO09yohWjRo756Cc6zYKtn+VnDLnCUCumsVAt0yDdQ5OqNRhr2c+q5E9hvPuLfcf dy6pSM0CVvfouug33DbwxPztAlCQoz6566QiY/5VQ+RKFUI3lWqkudPBA1/0Ay6WmRMdo1PrjXf UW4HSpZqht/leiryeLQCUa2pq5TE++8M+/ljzbFbUZZGCZ7rwortINzcHTCJJ3LGxb9SnKHwMGX Gj1r8nSfZGZbzbmcNWI8nfs8RdqTyduYWBpVhq7uGTLSXnkrvjsf3w/Xf6/er8S+U6yepd2ofoB af6RbG2A75mJjAnkuqimVmmecEYeuGlm5G/qih29fKswwThtryF4mR/TEEBwyF0f3S+c83Q7VIY ita6Kz92Ra8JcfPhTKRgz7FqjMuYc= X-Received: by 2002:a05:6a20:2324:b0:3b4:8f2c:6805 with SMTP id adf61e73a8af0-3bd4b01a2admr3745697637.42.1782403333122; Thu, 25 Jun 2026 09:02:13 -0700 (PDT) Received: from localhost.localdomain ([212.135.211.99]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c92bcb9c14asm1924522a12.24.2026.06.25.09.02.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 25 Jun 2026 09:02:12 -0700 (PDT) From: jack wang <163wangjack@gmail.com> To: qemu-devel@nongnu.org Cc: jack wang <163wangjack@gmail.com>, Peter Maydell , Jean-Christophe Dubois , qemu-arm@nongnu.org (open list:i.MX25 PDK) Subject: [PATCH v2 3/3] hw/misc/imx31_ccm: Replace DPRINTF with trace events Date: Fri, 26 Jun 2026 00:01:44 +0800 Message-ID: <20260625160144.94565-4-163wangjack@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260625160144.94565-1-163wangjack@gmail.com> References: <20260625160144.94565-1-163wangjack@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=163wangjack@gmail.com; helo=mail-pg1-x529.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, FROM_STARTS_WITH_NUMS=0.738, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Signed-off-by: jack wang <163wangjack@gmail.com> --- hw/misc/imx25_ccm.c | 2 +- hw/misc/imx31_ccm.c | 33 ++++++++++----------------------- hw/misc/trace-events | 10 ++++++++++ 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c index d051e8a2d1..4ca4cb6672 100644 --- a/hw/misc/imx25_ccm.c +++ b/hw/misc/imx25_ccm.c @@ -102,7 +102,7 @@ static uint32_t imx25_ccm_get_mpll_clk(IMXCCMState *dev) uint32_t freq; IMX25CCMState *s = IMX25_CCM(dev); - if (EXTRACT(s->reg[IMX25_CCM_CCTL_REG], MPLL_BYPASS)) { + if (EXTRACT(s->reg[IMX25_CCM_CCTL_REG], MPLL_BYPASS)) freq = CKIH_FREQ; } else { freq = imx_ccm_calc_pll(s->reg[IMX25_CCM_MPCTL_REG], CKIH_FREQ); 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