From patchwork Mon Mar 19 16:15:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 132060 Delivered-To: patches@linaro.org Received: by 10.80.152.129 with SMTP id j1csp2998394edb; Mon, 19 Mar 2018 09:16:04 -0700 (PDT) X-Google-Smtp-Source: AG47ELtwachwKHOYB4q6APA+8ntkOSwyYdkbkMAS/ZW54hHTTOBNRgM/Io5b1wpKN7lPxXtPKdfh X-Received: by 10.101.85.9 with SMTP id f9mr9578049pgr.189.1521476164524; Mon, 19 Mar 2018 09:16:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521476164; cv=none; d=google.com; s=arc-20160816; b=bxFuDgH5bNJsO/LCRMQI1sJ5Cm1F1iLazT7On1XqkOiaTOt+ORDU63GgG4JjINXTcA w4Z0oIiYl4FT0D23g6eDSypqrutCJH5MqPgSQi0ldou4nrmzKEl43LSJqox/rjawo/5s 1gx7z9ENCzGzeKyVNC2Oeie28grwLFKMOVMK8v4lfzSbudPZXLpWGJK/1GK2hBRwsdkK g0Lpa5zJXmF8HqIHz80R/Xg3wTwsh4EDTfUNI6QdGbS5lvajtSazIcmvS63/TZ/XDud5 fTVYxBStBFW5SyjEvSsJz2UXAqbzsmd/bzEyCEdh/mAV1WTEZSXjOBa+TH+8IxD9DujV J77g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=2yyeuJhdOVM+FOJOFnBEmcjxH5sBrZjgcXaR+HEfOGw=; b=tHdhbRAEZ+zf69+CwhxYP6vIBG9KJD5He9iDuTSVIEJe6dMEP1b3GFg4QIkf+3fvxt WJqMrqFKQ7mus/OClazmfFP6XcpKNbccUELVaAg7BsOZ48fy7NUqmcrrZaqhmpszPqgP Q1g0hNVx4QMl9mZ15LnNOVsArJw570wXMl2wvDqhNOkPHG4509hksuVjO4w05/q3NTLF yV6oZEVUrEGAPkZDADUVqk3wtuofvUp7bK5kTGLL5g1LMeNEK8DFb9RP81+0raQGhNBH T4xiO3Ym5PKhfEc8Ejvp8Q1eaWO3dMOkyfHr0VKn4X+phNf0XMBkBO0cYaxLZwlSb+AD 6inA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id a1si178513pgf.657.2018.03.19.09.16.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Mar 2018 09:16:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1exxS2-0002tW-TY; Mon, 19 Mar 2018 16:15:58 +0000 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org, Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Pekka Enberg , Andrew Baumann Subject: [PATCH for-2.12 1/2] hw/sd/bcm2835_sdhost: Add tracepoints Date: Mon, 19 Mar 2018 16:15:55 +0000 Message-Id: <20180319161556.16446-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319161556.16446-1-peter.maydell@linaro.org> References: <20180319161556.16446-1-peter.maydell@linaro.org> Add some tracepoints to the bcm2835_sdhost driver, to assist debugging. Signed-off-by: Peter Maydell --- hw/sd/bcm2835_sdhost.c | 10 ++++++++++ hw/sd/trace-events | 6 ++++++ 2 files changed, 16 insertions(+) -- 2.16.2 Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/sd/bcm2835_sdhost.c b/hw/sd/bcm2835_sdhost.c index f7f4e656df..79f3c5ceeb 100644 --- a/hw/sd/bcm2835_sdhost.c +++ b/hw/sd/bcm2835_sdhost.c @@ -15,6 +15,7 @@ #include "qemu/log.h" #include "sysemu/blockdev.h" #include "hw/sd/bcm2835_sdhost.h" +#include "trace.h" #define TYPE_BCM2835_SDHOST_BUS "bcm2835-sdhost-bus" #define BCM2835_SDHOST_BUS(obj) \ @@ -99,6 +100,7 @@ static void bcm2835_sdhost_update_irq(BCM2835SDHostState *s) { uint32_t irq = s->status & (SDHSTS_BUSY_IRPT | SDHSTS_BLOCK_IRPT | SDHSTS_SDIO_IRPT); + trace_bcm2835_sdhost_update_irq(irq); qemu_set_irq(s->irq, !!irq); } @@ -211,6 +213,7 @@ static void bcm2835_sdhost_fifo_run(BCM2835SDHostState *s) s->edm &= ~0xf; s->edm |= SDEDM_FSM_DATAMODE; + trace_bcm2835_sdhost_edm_change("datacnt 0", s->edm); if (s->config & SDHCFG_DATA_IRPT_EN) { s->status |= SDHSTS_SDIO_IRPT; @@ -229,6 +232,7 @@ static void bcm2835_sdhost_fifo_run(BCM2835SDHostState *s) s->edm &= ~(0x1f << 4); s->edm |= ((s->fifo_len & 0x1f) << 4); + trace_bcm2835_sdhost_edm_change("fifo run", s->edm); } static uint64_t bcm2835_sdhost_read(void *opaque, hwaddr offset, @@ -280,6 +284,8 @@ static uint64_t bcm2835_sdhost_read(void *opaque, hwaddr offset, break; } + trace_bcm2835_sdhost_read(offset, res, size); + return res; } @@ -288,6 +294,8 @@ static void bcm2835_sdhost_write(void *opaque, hwaddr offset, { BCM2835SDHostState *s = (BCM2835SDHostState *)opaque; + trace_bcm2835_sdhost_write(offset, value, size); + switch (offset) { case SDCMD: s->cmd = value; @@ -314,6 +322,7 @@ static void bcm2835_sdhost_write(void *opaque, hwaddr offset, value &= ~0xf; } s->edm = value; + trace_bcm2835_sdhost_edm_change("guest register write", s->edm); break; case SDHCFG: s->config = value; @@ -390,6 +399,7 @@ static void bcm2835_sdhost_reset(DeviceState *dev) s->cmd = 0; s->cmdarg = 0; s->edm = 0x0000c60f; + trace_bcm2835_sdhost_edm_change("device reset", s->edm); s->config = 0; s->hbct = 0; s->hblc = 0; diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 2059ace61f..bfd1d62efc 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -1,5 +1,11 @@ # See docs/devel/tracing.txt for syntax documentation. +# hw/sd/bcm2835_sdhost.c +bcm2835_sdhost_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" +bcm2835_sdhost_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" +bcm2835_sdhost_edm_change(const char *why, uint32_t edm) "(%s) EDM now 0x%x" +bcm2835_sdhost_update_irq(uint32_t irq) "IRQ bits 0x%x\n" + # hw/sd/core.c sdbus_command(const char *bus_name, uint8_t cmd, uint32_t arg, uint8_t crc) "@%s CMD%02d arg 0x%08x crc 0x%02x" sdbus_read(const char *bus_name, uint8_t value) "@%s value 0x%02x"