From nobody Sun Oct 5 21:00:34 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489436223584180.44483439443582; Mon, 13 Mar 2017 13:17:03 -0700 (PDT) Received: from localhost ([::1]:54218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnWOs-0000hC-DD for importer@patchew.org; Mon, 13 Mar 2017 16:17:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnW4s-0000y0-ON for qemu-devel@nongnu.org; Mon, 13 Mar 2017 15:56:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnW4q-0002e1-O2 for qemu-devel@nongnu.org; Mon, 13 Mar 2017 15:56:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45510) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnW4q-0002dm-FV for qemu-devel@nongnu.org; Mon, 13 Mar 2017 15:56:20 -0400 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 63D9F2976D; Mon, 13 Mar 2017 19:56:20 +0000 (UTC) Received: from red.redhat.com (unknown [10.10.121.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 650DF2D5C1; Mon, 13 Mar 2017 19:56:18 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 13 Mar 2017 14:55:43 -0500 Message-Id: <20170313195547.21466-27-eblake@redhat.com> In-Reply-To: <20170313195547.21466-1-eblake@redhat.com> References: <20170313195547.21466-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 13 Mar 2017 19:56:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 26/30] trace: Fix parameter types in hw/timer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabien Chouteau , stefanha@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" An upcoming patch will let the compiler warn us when we are silently losing precision in traces; update the trace definitions to pass through the full value at the callsite, as well as updating callers to use a consistent type. Signed-off-by: Eric Blake --- hw/timer/grlib_gptimer.c | 6 +++--- hw/timer/trace-events | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 4ed96e9..96a5864 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -235,19 +235,19 @@ static void grlib_gptimer_write(void *opaque, hwaddr = addr, case SCALER_OFFSET: value &=3D 0xFFFF; /* clean up the value */ unit->scaler =3D value; - trace_grlib_gptimer_writel(-1, addr, unit->scaler); + trace_grlib_gptimer_writel(-1, addr, (uint64_t) unit->scaler); return; case SCALER_RELOAD_OFFSET: value &=3D 0xFFFF; /* clean up the value */ unit->reload =3D value; - trace_grlib_gptimer_writel(-1, addr, unit->reload); + trace_grlib_gptimer_writel(-1, addr, (uint64_t) unit->reload); grlib_gptimer_set_scaler(unit, value); return; case CONFIG_OFFSET: /* Read Only (disable timer freeze not supported) */ - trace_grlib_gptimer_writel(-1, addr, 0); + trace_grlib_gptimer_writel(-1, addr, (uint64_t) 0); return; default: diff --git a/hw/timer/trace-events b/hw/timer/trace-events index d17cfe6..dc4c89c 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -5,7 +5,7 @@ slavio_timer_get_out(uint64_t limit, uint32_t counthigh, ui= nt32_t count) "limit slavio_timer_irq(uint32_t counthigh, uint32_t count) "callback: count %x%0= 8x" slavio_timer_mem_readl_invalid(uint64_t addr) "invalid read address %"PRIx= 64 slavio_timer_mem_readl(uint64_t addr, uint32_t ret) "read %"PRIx64" =3D %0= 8x" -slavio_timer_mem_writel(uint64_t addr, uint32_t val) "write %"PRIx64" =3D = %08x" +slavio_timer_mem_writel(uint64_t addr, uint64_t val) "write %"PRIx64" =3D = %08" PRIx64 slavio_timer_mem_writel_limit(unsigned int timer_index, uint64_t count) "p= rocessor %d user timer set to %016"PRIx64 slavio_timer_mem_writel_counter_invalid(void) "not user timer" slavio_timer_mem_writel_status_start(unsigned int timer_index) "processor = %d user timer started" @@ -22,17 +22,17 @@ grlib_gptimer_restart(int id, uint32_t reload) "timer:%= d reload val: 0x%x" grlib_gptimer_set_scaler(uint32_t scaler, uint32_t freq) "scaler:0x%x freq= : 0x%x" grlib_gptimer_hit(int id) "timer:%d HIT" grlib_gptimer_readl(int id, uint64_t addr, uint32_t val) "timer:%d addr 0x= %"PRIx64" 0x%x" -grlib_gptimer_writel(int id, uint64_t addr, uint32_t val) "timer:%d addr 0= x%"PRIx64" 0x%x" +grlib_gptimer_writel(int id, uint64_t addr, uint64_t val) "timer:%d addr 0= x%"PRIx64" 0x%" PRIx64 # hw/timer/lm32_timer.c -lm32_timer_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x value = 0x%08x" -lm32_timer_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0= x%08x" +lm32_timer_memory_write(hwaddr addr, uint64_t value) "addr 0x%08" HWADDR_P= RIx " value 0x%08" PRIx64 +lm32_timer_memory_read(hwaddr addr, uint32_t value) "addr 0x%08" HWADDR_PR= Ix " value 0x%08x" lm32_timer_hit(void) "timer hit" lm32_timer_irq_state(int level) "irq state %d" # hw/timer/milkymist-sysctl.c -milkymist_sysctl_memory_read(uint32_t addr, uint32_t value) "addr %08x val= ue %08x" -milkymist_sysctl_memory_write(uint32_t addr, uint32_t value) "addr %08x va= lue %08x" +milkymist_sysctl_memory_read(hwaddr addr, uint32_t value) "addr %08" HWADD= R_PRIx " value %08x" +milkymist_sysctl_memory_write(hwaddr addr, uint64_t value) "addr %08" HWAD= DR_PRIx " value %08" PRIx64 milkymist_sysctl_icap_write(uint32_t value) "value %08x" milkymist_sysctl_start_timer0(void) "Start timer0" milkymist_sysctl_stop_timer0(void) "Stop timer0" @@ -54,4 +54,4 @@ aspeed_timer_read(uint64_t offset, unsigned size, uint64_= t value) "From 0x%" PRI systick_reload(void) "systick reload" systick_timer_tick(void) "systick reload" systick_read(uint64_t addr, uint32_t value, unsigned size) "systick read a= ddr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" -systick_write(uint64_t addr, uint32_t value, unsigned size) "systick write= addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" +systick_write(uint64_t addr, uint64_t value, unsigned size) "systick write= addr 0x%" PRIx64 " data 0x%" PRIx64 " size %u" --=20 2.9.3