From patchwork Thu Feb 14 12:50:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 158369 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1325781jaa; Thu, 14 Feb 2019 04:51:14 -0800 (PST) X-Received: by 2002:a1c:26c1:: with SMTP id m184mr2552235wmm.25.1550148674471; Thu, 14 Feb 2019 04:51:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550148674; cv=none; d=google.com; s=arc-20160816; b=xukRAu0QomLC96iBgjXebEkKb5PvhT01QUslU0h6aB+m6yjjMCRxGGUDb3tX83l6C7 sNiruqmfJsWcD/CA/NckZEhrthR9YwplTK913s98q37AWh7JtGbVmt43a9esTRTxupnX xuwt0ceDu2rCL0+BC6pqndw4wuUhUiEkAj5vhD19niJNN4uuvMtok0v4soLZLTqbvjf0 ZnQnoP0ifJgDvIvPRv8YL+JeWxIKxPfJTyHZ5W07vmB9h6w//HNRxsg/AGXBju70wxCH xqY3cNW9rY3xNOA+dFWa3ZaW9GRx/Tgq+MIsFjJc7zFNvKbp7ce5kiWXmB18W8r0ThCU 0hnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Lin0GiYvYVCL8oSlzJzB40hq7JY2tVdtIrIszLqF2Dw=; b=oMrWbMdrrfSdstUDaFePpUswnSUXxPUNM+3dcv4vTAHEYCn3CYXde8l8/3M+o0y0hU 4ICUgyARL23JLY2bqWHLGdxc4EJVBuEKbjChf53DI2EQCSeyqpriDG/W6FXA4WHVL6m+ PZUw49pBhwS9RI30ZTmxXKcDfETxknm7aiqLajL6xNGnh9sLuQtfumbgcLtvKfcBPhUX 5dkf3vyyeQCu/Qg9NokS20wiSKkyfa4cQpgAsGY72/oUGjbrUCgncbj9i+Du5yv5jiyH z8dHhYB04cxgGWjXsmjwgpSBIdLcU3T6FHzkvFgc2U8rN7pn0PXUViAhXjgBokAEDg4i PbsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hLx2nyUi; spf=pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.maydell@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id w22sor1587305wmi.5.2019.02.14.04.51.14 for (Google Transport Security); Thu, 14 Feb 2019 04:51:14 -0800 (PST) Received-SPF: pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hLx2nyUi; spf=pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.maydell@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lin0GiYvYVCL8oSlzJzB40hq7JY2tVdtIrIszLqF2Dw=; b=hLx2nyUiF8H1HOv9XT4npdod5mk+q9jM6ocePkN15uLeDcj/E1ghPv/MVklrYCPPyy k5oBubbH3BZFEe/R4lZk9b3zlvbm65EMT4raR4fUDdXIhGUXDw810YCAwZXzdNGtZ7PV hQRTCRTJr1BwotR5ioNiWgc6v0tKwd4m9EMsLMN2pjuwhi6n8E0O7gVzPAnhDS3qhGpx 19rKtMX5IEgw5TMsNQZsQEusWD7TWyajq/4u8RU0iGLYmbCYssInDDba52YYsBiPNE0s UQo0SZHRmlCKEbml07UPUIafDH7o3UmBd8DD+iqfAW0Ol0JUcxM17Js2Ls5FgjAlK5bb VLOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lin0GiYvYVCL8oSlzJzB40hq7JY2tVdtIrIszLqF2Dw=; b=YTPeoviPnw+0wzs5hGV0n2Btzssk38hVWtGMAIOn2Oe/IQvQ3f6fp2J8hWO5/Xcoyg Pe8pHAimxwZYJqnty4v7oT/qUOVh59RBlgTrGccksA+lPKiT4Xl/RM8tjxsQs1RDvwR3 XV3gsRTQRO7s8Xz057mZgFC0r7etlR0X2SKeZA+Gf0gH9uKW+C3NrGWNA66SRq2HD74C nRcAjeeDbQRogB1s00r1ZTmNUE3+owd4ZE0MKvUTjDD+h0Ea5AuvwDLtjQMBDb97ctFK o//bCEKlpazK4A3pflEiAkfHZpL8hDcAKB5pp7a93m6TpXu2lmqDszGFEzI0bzKa1os2 Wsaw== X-Gm-Message-State: AHQUAuYTbOf1itdxSMCkya6WZdbKoDKrZiqMXd5QgtN4qMRi6n36KiU6 81A3GLoD4JAkBXu6wObfO+S1Uai+ X-Google-Smtp-Source: AHgI3IYD3t44465u21ZLhxGXLFsJFRQjhiZvKEEPCkifeHVOouEJ+IkXRV5/qVyv8/kwu/VkUJdDSQ== X-Received: by 2002:a1c:9aca:: with SMTP id c193mr2625756wme.2.1550148674017; Thu, 14 Feb 2019 04:51:14 -0800 (PST) Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j3sm1488073wmb.39.2019.02.14.04.51.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 04:51:13 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 04/14] hw/timer/pl031: Convert to using trace events Date: Thu, 14 Feb 2019 12:50:57 +0000 Message-Id: <20190214125107.22178-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214125107.22178-1-peter.maydell@linaro.org> References: <20190214125107.22178-1-peter.maydell@linaro.org> MIME-Version: 1.0 Convert the debug printing in the PL031 device to use trace events, and augment it to cover the interesting parts of device operation. Signed-off-by: Peter Maydell --- hw/timer/pl031.c | 55 +++++++++++++++++++++++-------------------- hw/timer/trace-events | 6 +++++ 2 files changed, 36 insertions(+), 25 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index f774dcd5223..274ad47a33a 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -18,15 +18,7 @@ #include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qemu/log.h" - -//#define DEBUG_PL031 - -#ifdef DEBUG_PL031 -#define DPRINTF(fmt, ...) \ -do { printf("pl031: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while(0) -#endif +#include "trace.h" #define RTC_DR 0x00 /* Data read register */ #define RTC_MR 0x04 /* Match register */ @@ -44,7 +36,10 @@ static const unsigned char pl031_id[] = { static void pl031_update(PL031State *s) { - qemu_set_irq(s->irq, s->is & s->im); + uint32_t flags = s->is & s->im; + + trace_pl031_irq_state(flags); + qemu_set_irq(s->irq, flags); } static void pl031_interrupt(void * opaque) @@ -52,7 +47,7 @@ static void pl031_interrupt(void * opaque) PL031State *s = (PL031State *)opaque; s->is = 1; - DPRINTF("Alarm raised\n"); + trace_pl031_alarm_raised(); pl031_update(s); } @@ -69,7 +64,7 @@ static void pl031_set_alarm(PL031State *s) /* The timer wraps around. This subtraction also wraps in the same way, and gives correct results when alarm < now_ticks. */ ticks = s->mr - pl031_get_count(s); - DPRINTF("Alarm set in %ud ticks\n", ticks); + trace_pl031_set_alarm(ticks); if (ticks == 0) { timer_del(s->timer); pl031_interrupt(s); @@ -83,38 +78,49 @@ static uint64_t pl031_read(void *opaque, hwaddr offset, unsigned size) { PL031State *s = (PL031State *)opaque; - - if (offset >= 0xfe0 && offset < 0x1000) - return pl031_id[(offset - 0xfe0) >> 2]; + uint64_t r; switch (offset) { case RTC_DR: - return pl031_get_count(s); + r = pl031_get_count(s); + break; case RTC_MR: - return s->mr; + r = s->mr; + break; case RTC_IMSC: - return s->im; + r = s->im; + break; case RTC_RIS: - return s->is; + r = s->is; + break; case RTC_LR: - return s->lr; + r = s->lr; + break; case RTC_CR: /* RTC is permanently enabled. */ - return 1; + r = 1; + break; case RTC_MIS: - return s->is & s->im; + r = s->is & s->im; + break; + case 0xfe0 ... 0xfff: + r = pl031_id[(offset - 0xfe0) >> 2]; + break; case RTC_ICR: qemu_log_mask(LOG_GUEST_ERROR, "pl031: read of write-only register at offset 0x%x\n", (int)offset); + r = 0; break; default: qemu_log_mask(LOG_GUEST_ERROR, "pl031_read: Bad offset 0x%x\n", (int)offset); + r = 0; break; } - return 0; + trace_pl031_read(offset, r); + return r; } static void pl031_write(void * opaque, hwaddr offset, @@ -122,6 +128,7 @@ static void pl031_write(void * opaque, hwaddr offset, { PL031State *s = (PL031State *)opaque; + trace_pl031_write(offset, value); switch (offset) { case RTC_LR: @@ -134,7 +141,6 @@ static void pl031_write(void * opaque, hwaddr offset, break; case RTC_IMSC: s->im = value & 1; - DPRINTF("Interrupt mask %d\n", s->im); pl031_update(s); break; case RTC_ICR: @@ -142,7 +148,6 @@ static void pl031_write(void * opaque, hwaddr offset, cleared when bit 0 of the written value is set. However the arm926e documentation (DDI0287B) states that the interrupt is cleared when any value is written. */ - DPRINTF("Interrupt cleared"); s->is = 0; pl031_update(s); break; diff --git a/hw/timer/trace-events b/hw/timer/trace-events index 0144a68951c..12eb505fee7 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -77,3 +77,9 @@ xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" +# hw/timer/pl031.c +pl031_irq_state(int level) "irq state %d" +pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +pl031_alarm_raised(void) "alarm raised" +pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"