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.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 504F4C73C46 for ; Tue, 9 Jul 2019 17:11:34 +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 D1B9320651 for ; Tue, 9 Jul 2019 17:11:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="p0xwYqJQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1B9320651 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkteM-0005rd-Fq for qemu-devel@archiver.kernel.org; Tue, 09 Jul 2019 13:11:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46954) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hktTe-00005C-SD for qemu-devel@nongnu.org; Tue, 09 Jul 2019 13:00:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hktTQ-0001k8-Ns for qemu-devel@nongnu.org; Tue, 09 Jul 2019 13:00:17 -0400 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]:43574) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hktTI-0001Z5-8b; Tue, 09 Jul 2019 13:00:06 -0400 Received: by mail-lj1-x242.google.com with SMTP id 16so20242536ljv.10; Tue, 09 Jul 2019 10:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=lItc9gAwv9zbMEx6MjHCHOxGakzxL9FxuZYPnMDnwFw=; b=p0xwYqJQ3MaWh8XzIPVAIo7AyaxxtYZCSY+Ox5rMZmYloN7oXMjo/sfmuW/ImRfLEa qtrru3ssk/9qbc7iXHapm3/6qyJaIUKTWI7YBIW7jX9CgjCqerHd8fnprdGzgJlLuQzb Cy1DSgl/gg2FV6CRMeJVyJdnqxItQMg5uwPNZ5LY8u7ySCTW8S+R0/TRDGo1V3QXLTB7 zcOmbaXUmH22a9d86+9d/HUxrZq3R2RJkFbFvlQFqvm9ujcn43mu0LRzvc9Y6DCfuxUi vtE0PC7IigShB+GU1gQQ1rNDDIcqbT8U4Ode1yBe1GMtqav6UWMurXGzj59d1mHANSVJ JgfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=lItc9gAwv9zbMEx6MjHCHOxGakzxL9FxuZYPnMDnwFw=; b=LkEb+yO2w8wT5+9EVyuZpHoVib4t7+8KJmnm2OHy5tNihZB9lZJcIwDFRaF4lkQZCp E4CbVZ8pHVal9yJoIiYyeREd/prf08c/M6fM3nx0AMs74qQ2iq8Q5GuCR4kpXvmD2snB x2wBotz6qWZwhHH1fNz4VCra/8wvXMK/sNwGjph+hRYhpPRw0gxkdx+pwN3JGfftVsHh 8cSOW/oWFCY2EtoB92wVTLsr3ZA/b1hdFhpMrXWdqNS/wr0arugpk8K88kSA2dqqp1rE kHFUGPGW/alKOcUzQh2iyVEzXjDd4ieJmPDOz/eQ7oiO8VPEBCH0+rOp+MdLgcQwWCEP EdRQ== X-Gm-Message-State: APjAAAXPvMPdyhD5KdPl9oHzrfFKZCwmxuKx8U2pGBL6qRdb9/YDNeB3 JtYDUOYk8/QVnq4dXVREqemwDWxzJYNXxn88pokDLG1B X-Google-Smtp-Source: APXvYqwNR10t3FVA4Z0KV3pquxUvr1HMrp9BbBT4xqL0y8rf3fgyfVJwHiYjAksfaiea2utLPwJ4osw8H96xxTzYSRs= X-Received: by 2002:a2e:9158:: with SMTP id q24mr14584240ljg.119.1562691600972; Tue, 09 Jul 2019 10:00:00 -0700 (PDT) MIME-Version: 1.0 References: <20190709113715.7761-1-philmd@redhat.com> <20190709113715.7761-2-philmd@redhat.com> In-Reply-To: <20190709113715.7761-2-philmd@redhat.com> From: Alistair Francis Date: Tue, 9 Jul 2019 09:56:51 -0700 Message-ID: To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::242 Subject: Re: [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 , "qemu-devel@nongnu.org Developers" , Subbaraya Sundeep , qemu-arm , "Edgar E. Iglesias" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Jul 9, 2019 at 4:40 AM Philippe Mathieu-Daud=C3=A9 wrote: > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Alistair > --- > 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" > > -#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) > > #define FIFO_CAPACITY 32 > > @@ -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; > } > > @@ -225,9 +215,9 @@ static void spi_flush_txfifo(MSSSpiState *s) > s->regs[R_SPI_STATUS] &=3D ~(S_TXDONE | S_RXRDY); > > 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); > > 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; > > - 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" > -- > 2.20.1 > >