From patchwork Wed Dec 13 20:44:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10110905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7470360327 for ; Wed, 13 Dec 2017 20:48:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 698E722B39 for ; Wed, 13 Dec 2017 20:48:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D1AC28C5B; Wed, 13 Dec 2017 20:48:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CCB5A22B39 for ; Wed, 13 Dec 2017 20:48:27 +0000 (UTC) Received: from localhost ([::1]:37570 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDx5-0006i9-2m for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Dec 2017 15:48:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDtl-000457-8Z for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDtk-0006Nc-8P for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:01 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:40046) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDtk-0006N8-3o for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:00 -0500 Received: by mail-qk0-x242.google.com with SMTP id b123so3681954qkg.7 for ; Wed, 13 Dec 2017 12:45:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LzruSGOtibsYn69zs/IL5f6FGEdgEjOPPBxHqjKxEw4=; b=upJcd2ubdHLkLqTuAJesrJn4pnxoxCUwHxr4aFbzOwV1Y5dLWVy+fm4mBno1G95vVJ tn6GnInuUbyzADOZaLix89oIH4MIvcv5nwEG5g+SFALIMoep7v9y5UVH9Uxg3658HZos vZ3e4W1rSToTzZ7RJlum59yF9ET8Jo1yDoFPKWCA9MGipBUQLXmmMZ9Ew99nvAwwsNJJ Cw5cQF+dgelYoPNH14NdRZkkcXAPQY7hYQv31iSpSpWZhosR0TFRzDrXn1i9GFtpP/JJ yJdjcRpd703IsSYlN+Q02CsFMm3xz+Muip7/cwmi4FOdWTFQJfYSRTBb/Q3S/kF4BVoF kiUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LzruSGOtibsYn69zs/IL5f6FGEdgEjOPPBxHqjKxEw4=; b=ndcUcyKPAZxfKvTIr0jjxrLBVzCVhFmAwaIp38E17q2IV1BSqrjK7umfpFss56HmE+ Gw4SFYGVBpv3tOn8KIHviPqSdVxiXimk710+eKDK59fsJoGZrSzLegKH4LYoNnGBH174 T7VzrVFwvNzj6WLQuHFnTGWci9P4HsOluhtglyd6FDN2A0iip70rZOw211qeH46+WpNT SCPJ669hO7oVSSkn0iUJPp5EHvJrBnX3dBoUq7f6apsIhtJDdFIrkFWP+XVgCwznMkWs BVcP7kPSPIDs640qfAXjGa/0dlSikp5efBGnLQYpV6jFA+HjWXmH35x9uyXAsSgMmUmN rzDg== X-Gm-Message-State: AKGB3mI0MTkgoVUlsc34E+Af0YdPgBsSxtKrEjZ7wn9NmBd2FCQGNnlg 2DPs2n1E3CF4rZ9HqQyBbIY= X-Google-Smtp-Source: ACJfBot1a53VtmVFYcoqltrRP/d2dvyAn2l86q8vd6saZIYfATYXO5RfSnvHa7JsJbZP6wVIZ7mvkw== X-Received: by 10.55.114.133 with SMTP id n127mr12660167qkc.61.1513197899618; Wed, 13 Dec 2017 12:44:59 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id n64sm1507938qkd.97.2017.12.13.12.44.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 12:44:59 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Prasad J Pandit , Peter Maydell , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky , Clement Deschamps Date: Wed, 13 Dec 2017 17:44:28 -0300 Message-Id: <20171213204436.5379-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213204436.5379-1-f4bug@amsat.org> References: <20171213204436.5379-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH 03/11] sdbus: add 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: , Cc: Sai Pavan Boddu , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/core.c | 25 +++++++++++++++++++++---- hw/sd/trace-events | 6 ++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/hw/sd/core.c b/hw/sd/core.c index bd9350d21c..eda595973b 100644 --- a/hw/sd/core.c +++ b/hw/sd/core.c @@ -21,7 +21,14 @@ #include "qemu/osdep.h" #include "hw/sd/sd.h" +#include "qemu/cutils.h" #include "sd-internal.h" +#include "trace.h" + +static inline const char *sdbus_name(SDBus *sdbus) +{ + return sdbus->qbus.name; +} static SDState *get_card(SDBus *sdbus) { @@ -37,20 +44,28 @@ static SDState *get_card(SDBus *sdbus) int sdbus_do_command(SDBus *sdbus, SDRequest *req, uint8_t *response) { SDState *card = get_card(sdbus); + int sz = 0; + char *hexbuf; + trace_sdbus_command(sdbus_name(sdbus), req->cmd, req->arg, req->crc); if (card) { SDCardClass *sc = SD_CARD_GET_CLASS(card); - return sc->do_command(card, req, response); + sz = sc->do_command(card, req, response); + hexbuf = qemu_hexbuf_strdup(response, sz, NULL, "resp: "); + trace_sdbus_command_response(sdbus_name(sdbus), + req->cmd, req->arg, hexbuf); + g_free(hexbuf); } - return 0; + return sz; } void sdbus_write_data(SDBus *sdbus, uint8_t value) { SDState *card = get_card(sdbus); + trace_sdbus_write(sdbus_name(sdbus), value); if (card) { SDCardClass *sc = SD_CARD_GET_CLASS(card); @@ -61,14 +76,16 @@ void sdbus_write_data(SDBus *sdbus, uint8_t value) uint8_t sdbus_read_data(SDBus *sdbus) { SDState *card = get_card(sdbus); + uint8_t value = 0; if (card) { SDCardClass *sc = SD_CARD_GET_CLASS(card); - return sc->read_data(card); + value = sc->read_data(card); } + trace_sdbus_read(sdbus_name(sdbus), value); - return 0; + return value; } bool sdbus_data_ready(SDBus *sdbus) diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 11f8fa4fc1..6b1dc7380f 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/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_command_response(const char *bus_name, uint8_t cmd, uint32_t arg, const char *hexdump) "@%s CMD%02d arg 0x%08x %s" +sdbus_read(const char *bus_name, uint8_t value) "@%s value 0x%02x" +sdbus_write(const char *bus_name, uint8_t value) "@%s value 0x%02x" + # hw/sd/sdhci.c sdhci_set_inserted(const char *level) "card state changed: %s" sdhci_send_command(uint8_t cmd, uint32_t arg) "sending CMD%02u ARG[0x%08x]"