From patchwork Thu Feb 21 18:57:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 158939 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp842344jaa; Thu, 21 Feb 2019 11:07:45 -0800 (PST) X-Google-Smtp-Source: AHgI3IbwxOh7zC7JJuKFfNj69mlXbjxhteVvc6yimzNM7uKVvFOpyM1BVMjKSoDmBGfPsg+IXyCF X-Received: by 2002:a0d:d98f:: with SMTP id b137mr9265ywe.327.1550776064985; Thu, 21 Feb 2019 11:07:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550776064; cv=none; d=google.com; s=arc-20160816; b=Ezo3rYe4kCzEoovLaOkxsqapjOQB+piOirRNuY9nko+gWQj0brlnx3T8mWBNrtxI/z sPDshyhQ7l5YTBTxCi1Xn0LJu2jrdRGwT08lLbBzVy78W8EPxbVMx6SFCNKrRmnzQQQm Wccpu6JoixLfLqE2URy+7kKysnkeAwKnyPYNwBXD17pfv3Mqc/eiJyDjN6vqQShEkYxw dDBeh5J/ubAdW2Jago8/NSof1KJilcmNR9+gN7KZHF/aqOwdvLDBXQPbD0bmBcPXrmyB oT7m/DTEirUUgUzyTYUJC+PBq8x13R0lbXamFl2oZqyF0w5QwQ8OytpAImM3WXoBPsdZ n2Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=HI6U23/7J1J+W2Bgp+QyoxIJfvLjcjyO30TGVCDuwiI=; b=bubET68Pas15Ft1s4rSrn7Jpz+WmYWZlkysRjbAAtJuSsRQ8qjJTNAXTnjNetBcRpX QRGyDldKodZV4yj6M1PnAmMsKtD00/9Qra9Mhc0fTPg7eAdNdNdexo5aFsw1Ij1Ljj4o xV7lT+YMWTSdfqay3m8rCbs4eJryygFG2XVqBbSuLiIbvZ95ERd2B2zUDR3PQcVg0sS0 u4n6IAmCsFEAA8nMNNnWr1lpio0YpPkMjnpXj237W2RnBqV50DohcXYwIT52A3PVJvPJ RCJO2lHhH6B+JQXCVGX6kaZm8vnxb/S+A0WYvN68v9gmX2/xX9WKCq0INhKwEXI6dEx1 XVhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IcQO8PXO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x84si13675850ywa.79.2019.02.21.11.07.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Feb 2019 11:07:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IcQO8PXO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:36996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwthA-0008CT-CA for patch@linaro.org; Thu, 21 Feb 2019 14:07:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwtXn-0008QJ-17 for qemu-devel@nongnu.org; Thu, 21 Feb 2019 13:58:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwtXl-0007PS-5B for qemu-devel@nongnu.org; Thu, 21 Feb 2019 13:58:02 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:42053) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gwtXj-0007Mn-7t for qemu-devel@nongnu.org; Thu, 21 Feb 2019 13:58:01 -0500 Received: by mail-wr1-x42b.google.com with SMTP id r5so18445437wrg.9 for ; Thu, 21 Feb 2019 10:57:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HI6U23/7J1J+W2Bgp+QyoxIJfvLjcjyO30TGVCDuwiI=; b=IcQO8PXOOTuGWF+4w//kxLDiTgie3/SXcV3eZFulIhtSd1xZNW6gxxVF1NYqHsU2YB 3CrtOusCx8HHx9LUuHBlucUa2JHVgOQJIz6deq8Rt+qlPKbXlt3eBJCCsvkWGaLw2QVM YnSTdMwnVarDa7dG9wORJ+MBCWo4x0PhXafDSqg8cZNbfj3PZuwJkpRsXzKnuZcmM2Va wY+apaA7DhLGFPDT/x/1l6Vnul3InKpaIvZv9U48o285s0Xjh0mgbvfP0pTXI8eDKJzA L1V62gMXA9nCPhiUKs79x6SnWMdaW+KnFyanT+qb5FPoakkhhZbxDvHsRE0Hfqd+wH2v hdLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HI6U23/7J1J+W2Bgp+QyoxIJfvLjcjyO30TGVCDuwiI=; b=g52Upp5OQe8EpvZiCP0aZ7GB1tGIcLlshBFypwjvGSxa8/QiZ1BOd12+kMbCf7nA7/ wxY4+ujvSqkpalXRijrOmu1TDI2f8Ma2sZmDIdzkGcOB+SVTV8brRM2rcYm2zU0x4S7Y Ijq4kjWnPqt6ShxaqoHvnaV49wpoqsfKsJGoIrRvAbsxTOKXKXaU7sSV56r6ZRniOHaN MdofgadXCUkbJxch1qyPVLZ/yoKAcWhGEPaAh0eCgWxlw+ECHl8mLj3xH53Z2gJruxJZ TI8nlfST9EGloVbWoF+99oHrkWrmrqcOQmcDhpK5yBBLpt1wXmWN82/QOnhLIS6hareO HUTw== X-Gm-Message-State: AHQUAubwEmt0BwqkbSf3L+1rUUWJyBQ2kquJil+ND3D6ApBS3MjHuPZF 5cSHR4Ll/fKemhhygPzyfTLVT142+T0= X-Received: by 2002:adf:fa0d:: with SMTP id m13mr29205999wrr.93.1550775475642; Thu, 21 Feb 2019 10:57:55 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c18sm29065085wre.32.2019.02.21.10.57.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 10:57:54 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 21 Feb 2019 18:57:28 +0000 Message-Id: <20190221185739.25362-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221185739.25362-1-peter.maydell@linaro.org> References: <20190221185739.25362-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 10/21] hw/timer/pl031: Convert to using trace events 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/timer/pl031.c | 55 +++++++++++++++++++++++-------------------- hw/timer/trace-events | 6 +++++ 2 files changed, 36 insertions(+), 25 deletions(-) -- 2.20.1 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"