From patchwork Tue Feb 13 04:07:59 2018 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: 872574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z+5rRn5L"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zgTk35j08z9s7v for ; Tue, 13 Feb 2018 15:16:11 +1100 (AEDT) Received: from localhost ([::1]:37417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elS0m-0006gf-L4 for incoming@patchwork.ozlabs.org; Mon, 12 Feb 2018 23:16:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elRuG-0001PQ-1j for qemu-devel@nongnu.org; Mon, 12 Feb 2018 23:09:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elRuF-0008GE-2i for qemu-devel@nongnu.org; Mon, 12 Feb 2018 23:09:24 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:39449) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1elRuE-0008Fr-VV for qemu-devel@nongnu.org; Mon, 12 Feb 2018 23:09:23 -0500 Received: by mail-qk0-x244.google.com with SMTP id z197so4213758qkb.6 for ; Mon, 12 Feb 2018 20:09:22 -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=PRVVrWr1dkuT1tVe6teh0w/edU9ae96q3kRiLd5UG5I=; b=Z+5rRn5L8TP6ZG1ojbUt308C9yG/GGAqhidPxNsF3Z7apNiblwaxzLfgYfwppD2CEK fdJspeT7Yd7jxfx+7a58xizOYaJ7XklQc1NyfWi8ILWkGMYuawuj1Uv+Bi3sw8aRsfG+ Hp3lTCSW9kV1gROKvtWJIYWdbYvRC88/V0Yh/JL9iSIOBOZmNwXrqPZjpkWHqS+1h4gQ 6yH2yHN3og81APabex7jdTrEMVrZfG5y45Hg4XvhwfDj6qj4ckX5wcbxcmCyDh18NuKl zzfLaru3tfnmtSbeJmnQ8NgZO4GFJ6Rm6HZTCdhN95zAw9nAlDk8A1zakvqELULJqlfU wgjQ== 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=PRVVrWr1dkuT1tVe6teh0w/edU9ae96q3kRiLd5UG5I=; b=gqHd4ucAWAmeaZWHHvi4zb4KQAUa+5wadiBeWHumDwjP0UD13GKnbKikESsK/ZyDW4 pV7jJm0whSi6I79SdvmCnbQmVOSLpwXo1kvnyVNvsQGPxnruzDySUFknxAJTMVz+eQ6D qmVqaVvz5lNLrO/tokRRhH4YKbFeF2wXHiBaWIAr/oq6rSakHJEn3XtmpWTuvCFoj6cz 5+4gdwxKxfQVij7ql+T/zLmFnIpaoZTA1MbuOtbamjbTucRZfQPgPhWNb+sIQrYvjWhw ULBAmIXKx+fs5VfC3PHX1IihI/++B8kIfbk2JIR2oSzdzu+fnN4oQM8RJu/DooYAGrbU 2iQw== X-Gm-Message-State: APf1xPCJ7I52xnI/b9Q5DSEY8PoQtwnMdAjUfDTZjO948c1rg/FsIFRO Wzus0IlS7E5tZEmk4EDeLTc9fpJo X-Google-Smtp-Source: AH8x227Y6jY77hHBrInll6owTmdpMJkJTaQaiqbstw++NYidNdVmDCNOv8P2x3Y2d8hWBdGtbnAPqA== X-Received: by 10.55.74.2 with SMTP id x2mr3733175qka.314.1518494962567; Mon, 12 Feb 2018 20:09:22 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q2sm7350435qki.10.2018.02.12.20.09.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 20:09:22 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini Date: Tue, 13 Feb 2018 01:07:59 -0300 Message-Id: <20180213040809.26021-21-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180213040809.26021-1-f4bug@amsat.org> References: <20180213040809.26021-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::244 Subject: [Qemu-devel] [PATCH v13 20/30] 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: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alistair Francis Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/core.c | 14 ++++++++++++-- hw/sd/trace-events | 5 +++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/hw/sd/core.c b/hw/sd/core.c index 295dc44ab7..498284f109 100644 --- a/hw/sd/core.c +++ b/hw/sd/core.c @@ -23,6 +23,12 @@ #include "hw/qdev-core.h" #include "sysemu/block-backend.h" #include "hw/sd/sd.h" +#include "trace.h" + +static inline const char *sdbus_name(SDBus *sdbus) +{ + return sdbus->qbus.name; +} static SDState *get_card(SDBus *sdbus) { @@ -39,6 +45,7 @@ int sdbus_do_command(SDBus *sdbus, SDRequest *req, uint8_t *response) { SDState *card = get_card(sdbus); + trace_sdbus_command(sdbus_name(sdbus), req->cmd, req->arg, req->crc); if (card) { SDCardClass *sc = SD_CARD_GET_CLASS(card); @@ -52,6 +59,7 @@ 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); @@ -62,14 +70,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 78d8707669..ea2746c8b7 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -1,5 +1,10 @@ # 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_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) "CMD%02u ARG[0x%08x]"