From patchwork Mon Oct 14 16:04:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 176319 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4760470ill; Mon, 14 Oct 2019 09:55:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqyKZowI+y4whrNHwURcU9QDBDX7oaEe3N+GTn2wBQS4yh0p7RvJKKnAMkIeF/Xh7CBe3mmR X-Received: by 2002:ae9:e316:: with SMTP id v22mr30318058qkf.122.1571072153278; Mon, 14 Oct 2019 09:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571072153; cv=none; d=google.com; s=arc-20160816; b=fVjPWyWLiiQMFc+MMUKElSLq6OSxwEag3kSg8pa8q9HWZJDr2tA6dguLFXt9KZ0vYb xIwHCJkFNZryu3YsAa1lllvgr5nP0xFXGj66l4ycPguoh+A2Ds0nxhtvfSqSFsRvPO+9 +QFZhQ42f6h+ddsti545ruFxuM8JNWaH8tftDUWrgW5eiQD1F0XqLUw+SgY0J0icI7hr D6rovlCq3PCqjR1QeELB31Exr/sxUWcjGJXugloXMM0us5x8CQGFXAdODcq/13yObdJy OnR0IFH08Z03gNq9AwIDKT/RpLpn5SSahuH5+yLoZI7+x+BtvRzxagpL8OFCUdfSPAGh PQ/A== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=C6hx9VEDPUQFFEw9ZY8vKZMPEGQy47fWl3oWJsaPD+Q=; b=JaIPa7rAz4DYxhDfvpYFUo+pEjDpQm0QEz3Vn0ndVgkzStJI3vGkGvCynHPxWHAayh j+ajyi0cw2CWYhXHUxs35NQUyTTPZKOx5RcHJR/67FkeRtL8RSk0qxVDlpYGaX/QPsl/ ueq29tOpDjg5V7NhiIytR6aJqi96FSW4h32cxG6JBcyMwjr/H0wr+Rb1UzkwWPDTH5Zd rpUpto0JaI1bCYCDXT0JBADkLv/dfdf3B8ZytgWWSq61zGAx03oaQ3nUV0JUCVcayfhd w/Ra86fmzQD0j+REKjRJTzJMUbqetpTSah8Hcp2lllHbNjYPCwF325JVhkhzoL2U9Spj E62A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DUaB6jCJ; 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=pass (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 m9si17965319qvh.13.2019.10.14.09.55.53 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Oct 2019 09:55:53 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=DUaB6jCJ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK3dQ-00021v-D4 for patch@linaro.org; Mon, 14 Oct 2019 12:55:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37608) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK2r4-0005j7-8z for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:05:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK2r2-0008N2-Cy for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:05:54 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:39956) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iK2r2-0008Ly-3E for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:05:52 -0400 Received: by mail-wm1-x32f.google.com with SMTP id b24so17302664wmj.5 for ; Mon, 14 Oct 2019 09:05:51 -0700 (PDT) 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=C6hx9VEDPUQFFEw9ZY8vKZMPEGQy47fWl3oWJsaPD+Q=; b=DUaB6jCJeW3ao7ijQf5WSwKmMZoUDYF7Sr+aD1vbhd7NqhfKgZG6pdQln7yRn/A1/B DBY4aZrdh1a8D6e/qXTQJjIUKpzjCGc1U6GKbxUbiYQx21qzFIJ7kr9Pr+dma75B0cSg jLDs/vwCoA0ZTgiQWfbF0iCoIXaCnO5g4jF1zZVPup1q9M2U2WRpw+0sljGQQAAfDfXj PSUlaBri5noXlkKKzO9jiei9I36hfDLlwkJQ874veiePppBH7xBLF4h6oLN7DrJ6Xcqk bbBNJbTC3/WmulxQusCeTZ/uy4/fkIjR7KZ6ZkUGsiNASpeXOVym9DAhSBoo+scC5I82 41Ng== 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=C6hx9VEDPUQFFEw9ZY8vKZMPEGQy47fWl3oWJsaPD+Q=; b=QZxelIxhw1G/Uz4NmJkkUvtujhNGEfuJpXreAVISK7oShnDGe+Ke0pn0RU6ydLAfKK Pd/eoIpu86Z1SMErl+2qp+bEZifM53sUW/2NbRd0nM01C83etIRtkdp7uE0CGMRk/s4L IBY3ZxiCoiiilCOx+XsQcSrshXz+eZV5eJtfqBX7Ru2yEtU+Vu1e/mLd8cH96IwFqOik 7GpMNnIWvUJrI2nPY16fbXylLd+Q+gaN7Eot4sp16jgs85V4dv8B2h/Az9DJ26T0ZdT5 9vjyPUNCGrdaOPCg9YqDDM4cdfc+gxC3qS5K4UlRmk/sekSSlaLXtns5zthFg8K3zaI6 nOAg== X-Gm-Message-State: APjAAAUgsrIsQnZqSKJcE7TJsnjJShUY9HQ/oJjdNz7LaMyDjR1PczO/ 521fLmuGS2mvmU0JR0TanbRHHiVWPH28pQ== X-Received: by 2002:a7b:c3cf:: with SMTP id t15mr15238503wmj.85.1571069150558; Mon, 14 Oct 2019 09:05:50 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 5sm18029779wrk.86.2019.10.14.09.05.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 09:05:49 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 68/68] hw/misc/bcm2835_mbox: Add trace events Date: Mon, 14 Oct 2019 17:04:04 +0100 Message-Id: <20191014160404.19553-69-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191014160404.19553-1-peter.maydell@linaro.org> References: <20191014160404.19553-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::32f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" From: Philippe Mathieu-Daudé Add trace events for read/write accesses and IRQ. Properties are structures used for the ARM particular MBOX. Since one call in bcm2835_property.c concerns the mbox block, name this trace event in the same bcm2835_mbox* namespace. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-id: 20190926173428.10713-8-f4bug@amsat.org Signed-off-by: Peter Maydell --- hw/misc/bcm2835_mbox.c | 5 +++++ hw/misc/bcm2835_property.c | 2 ++ hw/misc/trace-events | 6 ++++++ 3 files changed, 13 insertions(+) -- 2.20.1 diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c index 77285624c9f..77d2d80706c 100644 --- a/hw/misc/bcm2835_mbox.c +++ b/hw/misc/bcm2835_mbox.c @@ -15,6 +15,7 @@ #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" +#include "trace.h" #define MAIL0_PEEK 0x90 #define MAIL0_SENDER 0x94 @@ -123,6 +124,7 @@ static void bcm2835_mbox_update(BCM2835MboxState *s) set = true; } } + trace_bcm2835_mbox_irq(set); qemu_set_irq(s->arm_irq, set); } @@ -178,8 +180,10 @@ static uint64_t bcm2835_mbox_read(void *opaque, hwaddr offset, unsigned size) default: qemu_log_mask(LOG_UNIMP, "%s: Unsupported offset 0x%"HWADDR_PRIx"\n", __func__, offset); + trace_bcm2835_mbox_read(size, offset, res); return 0; } + trace_bcm2835_mbox_read(size, offset, res); bcm2835_mbox_update(s); @@ -195,6 +199,7 @@ static void bcm2835_mbox_write(void *opaque, hwaddr offset, offset &= 0xff; + trace_bcm2835_mbox_write(size, offset, value); switch (offset) { case MAIL0_SENDER: break; diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index 43a5465c5dc..0eea2e20f79 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -13,6 +13,7 @@ #include "sysemu/dma.h" #include "qemu/log.h" #include "qemu/module.h" +#include "trace.h" /* https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface */ @@ -283,6 +284,7 @@ static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value) break; } + trace_bcm2835_mbox_property(tag, bufsize, resplen); if (tag == 0) { break; } diff --git a/hw/misc/trace-events b/hw/misc/trace-events index 74276225f81..1deb1d08c19 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -143,3 +143,9 @@ armsse_mhu_write(uint64_t offset, uint64_t data, unsigned size) "SSE-200 MHU wri # aspeed_xdma.c aspeed_xdma_write(uint64_t offset, uint64_t data) "XDMA write: offset 0x%" PRIx64 " data 0x%" PRIx64 + +# bcm2835_mbox.c +bcm2835_mbox_write(unsigned int size, uint64_t addr, uint64_t value) "mbox write sz:%u addr:0x%"PRIx64" data:0x%"PRIx64 +bcm2835_mbox_read(unsigned int size, uint64_t addr, uint64_t value) "mbox read sz:%u addr:0x%"PRIx64" data:0x%"PRIx64 +bcm2835_mbox_irq(unsigned level) "mbox irq:ARM level:%u" +bcm2835_mbox_property(uint32_t tag, uint32_t bufsize, size_t resplen) "mbox property tag:0x%08x in_sz:%u out_sz:%zu"