From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9441CC004EF for ; Tue, 9 Jul 2019 11:41:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 69C8A214AF for ; Tue, 9 Jul 2019 11:41:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69C8A214AF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkoVH-0007KJ-PW for qemu-devel@archiver.kernel.org; Tue, 09 Jul 2019 07:41:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46328) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkoRF-0004Xu-E9 for qemu-devel@nongnu.org; Tue, 09 Jul 2019 07:37:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkoRC-0007Cp-FL for qemu-devel@nongnu.org; Tue, 09 Jul 2019 07:37:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkoR4-00076V-PF; Tue, 09 Jul 2019 07:37:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F77B5D672; Tue, 9 Jul 2019 11:37:24 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-166.brq.redhat.com [10.40.204.166]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4CEF292AEF; Tue, 9 Jul 2019 11:37:22 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 9 Jul 2019 13:37:13 +0200 Message-Id: <20190709113715.7761-2-philmd@redhat.com> In-Reply-To: <20190709113715.7761-1-philmd@redhat.com> References: <20190709113715.7761-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 09 Jul 2019 11:37:24 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] hw/ssi/mss-spi: Convert debug printf()s to trace events 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: , Cc: Peter Maydell , Alistair Francis , Subbaraya Sundeep , qemu-arm@nongnu.org, "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Useful while debugging, can be skipped for next dev cycle. Makefile.objs | 1 + hw/ssi/mss-spi.c | 23 ++++++----------------- hw/ssi/trace-events | 6 ++++++ 3 files changed, 13 insertions(+), 17 deletions(-) create mode 100644 hw/ssi/trace-events diff --git a/Makefile.objs b/Makefile.objs index 6a143dcd57..60ec443091 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -178,6 +178,7 @@ trace-events-subdirs +=3D hw/scsi trace-events-subdirs +=3D hw/sd trace-events-subdirs +=3D hw/sparc trace-events-subdirs +=3D hw/sparc64 +trace-events-subdirs +=3D hw/ssi trace-events-subdirs +=3D hw/timer trace-events-subdirs +=3D hw/tpm trace-events-subdirs +=3D hw/usb diff --git a/hw/ssi/mss-spi.c b/hw/ssi/mss-spi.c index 918b1f3e82..4878279482 100644 --- a/hw/ssi/mss-spi.c +++ b/hw/ssi/mss-spi.c @@ -27,18 +27,8 @@ #include "hw/ssi/mss-spi.h" #include "qemu/log.h" #include "qemu/module.h" +#include "trace.h" =20 -#ifndef MSS_SPI_ERR_DEBUG -#define MSS_SPI_ERR_DEBUG 0 -#endif - -#define DB_PRINT_L(lvl, fmt, args...) do { \ - if (MSS_SPI_ERR_DEBUG >=3D lvl) { \ - qemu_log("%s: " fmt "\n", __func__, ## args); \ - } \ -} while (0) - -#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) =20 #define FIFO_CAPACITY 32 =20 @@ -187,9 +177,9 @@ spi_read(void *opaque, hwaddr addr, unsigned int size= ) } break; } - - DB_PRINT("addr=3D0x%" HWADDR_PRIx " =3D 0x%" PRIx32, addr * 4, ret); + trace_mss_spi_read(addr << 2, ret); spi_update_irq(s); + return ret; } =20 @@ -225,9 +215,9 @@ static void spi_flush_txfifo(MSSSpiState *s) s->regs[R_SPI_STATUS] &=3D ~(S_TXDONE | S_RXRDY); =20 tx =3D fifo32_pop(&s->tx_fifo); - DB_PRINT("data tx:0x%" PRIx32, tx); + trace_mss_spi_flush_fifo("tx", tx); rx =3D ssi_transfer(s->spi, tx); - DB_PRINT("data rx:0x%" PRIx32, rx); + trace_mss_spi_flush_fifo("rx", rx); =20 if (fifo32_num_used(&s->rx_fifo) =3D=3D s->fifo_depth) { s->regs[R_SPI_STATUS] |=3D S_RXCHOVRF; @@ -262,9 +252,8 @@ static void spi_write(void *opaque, hwaddr addr, MSSSpiState *s =3D opaque; uint32_t value =3D val64; =20 - DB_PRINT("addr=3D0x%" HWADDR_PRIx " =3D0x%" PRIx32, addr, value); + trace_mss_spi_write(addr, value); addr >>=3D 2; - switch (addr) { case R_SPI_TX: /* adding to already full FIFO */ diff --git a/hw/ssi/trace-events b/hw/ssi/trace-events new file mode 100644 index 0000000000..6e494b913c --- /dev/null +++ b/hw/ssi/trace-events @@ -0,0 +1,6 @@ +# See docs/devel/tracing.txt for syntax documentation. + +# mss-spi.c +mss_spi_read(uint32_t addr, uint32_t value) "read addr:0x%02x value:0x%0= 8x" +mss_spi_write(uint32_t addr, uint32_t value) "write addr:0x%02x value:0x= %08x" +mss_spi_flush_fifo(const char *name, uint32_t value) "flush fifo:%s valu= e:0x%08x" --=20 2.20.1