From nobody Tue Feb 10 16:22:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516677831410375.2641197530497; Mon, 22 Jan 2018 19:23:51 -0800 (PST) Received: from localhost ([::1]:59018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpBe-0004n6-Hc for importer@patchew.org; Mon, 22 Jan 2018 22:23:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edp9h-0003R0-OD for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:21:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edp9g-0000Q2-GF for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:21:49 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35112) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edp9g-0000PT-Al for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:21:48 -0500 Received: by mail-qt0-x243.google.com with SMTP id g14so17245067qti.2 for ; Mon, 22 Jan 2018 19:21:48 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id x207sm5545567qka.91.2018.01.22.19.21.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 19:21:47 -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=tD7GhYS1sWLlxKudpIsrgAMp8RU0aR/LduWhAQIeT4Q=; b=LnypkBIuBNiXzX0hJh9M+PLLN9e4OjpMuOe06Kyfr1Xzu7P65zj0wPQv2E9Exh85gF NiqZPR1flxSeJQ1kQr5aSfe+RbbjaCd2jZ9iyTkynqkqjG2JbXEP2XdNnXBoJlvxfWXA OxihaOg6BEH9aDTM/suc+uDUg/pOnIBrkclLQLkNahTgGAtWDd0PZ0u7TY7rvSnWdJrF IW+YDf7LYS2cTohenuiuXqRNbXhZbAVhj9BrdnwN3w1qZcZrb96b4ZN8GDxoj0La0V12 D540/7hoEE06Z5PecLMMU2sijVwSin0WlDdFrFn8Fnw9+iZwQ/AY5JsubrB+sjZQkKmQ 1ZaA== 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=tD7GhYS1sWLlxKudpIsrgAMp8RU0aR/LduWhAQIeT4Q=; b=S171y9gMISk1i3TJ/G+7oGZIN2RUbGIxu/ca4zq87wObeR66Ws3HtOimbmKONBhg0+ ugS4iaz/emBzbr1D5sKqxWMemD0dT4BSWQtf5pVF9iNC+SDw8s8J5sMBxxAmgKxEbLi/ c28iJ96upZiXxlD+R/jO6iuOwekcxaPGTAcV7f9/2ntMzGbm9ojZSeDnkcUMPthK3ADR bJBgBYGVZsycJJ5GVXhwqJLZYYDnczLDNmqQIo35uSftFVddkj/bMkCyC8WfLmgMajYV C4gTHhD9jBqkm4e3t3X7GDCsFk0kWY1JCO+NdoXGVs1uqBwLHhG7drBd7uGwprDop4OI MXsg== X-Gm-Message-State: AKwxytcp0NQMTkNkRQkmqkRAjAFEh7It5rVT+FevzcUN7Ggi1rjXOqK4 VewXf52fd54J7AoCRP3VjYU= X-Google-Smtp-Source: AH8x2273wjA6hQymIDqffMVoQppqncjJNyXBmp+ke3FuwWFyXYM/Cpd3E94plPDpflBcPR9Ub6bgiA== X-Received: by 10.237.46.130 with SMTP id k2mr1636569qtd.85.1516677707856; Mon, 22 Jan 2018 19:21:47 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko Date: Tue, 23 Jan 2018 00:21:25 -0300 Message-Id: <20180123032135.28863-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180123032135.28863-1-f4bug@amsat.org> References: <20180123032135.28863-1-f4bug@amsat.org> MIME-Version: 1.0 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: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v3 02/12] sdcard: replace DPRINTF() by 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" , Prasad J Pandit , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 33 ++++++++++++++++++++++++++------- hw/sd/trace-events | 6 ++++++ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 55d2ba2dd7..f876973a2b 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -40,6 +40,7 @@ #include "qemu/error-report.h" #include "qemu/timer.h" #include "qemu/log.h" +#include "trace.h" =20 //#define DEBUG_SD 1 =20 @@ -132,6 +133,25 @@ struct SDState { bool cmd_line; }; =20 +static const char *sd_state_name(enum SDCardStates state) +{ + static const char *state_name[] =3D { + [sd_idle_state] =3D "idle", + [sd_ready_state] =3D "ready", + [sd_identification_state] =3D "identification", + [sd_standby_state] =3D "standby", + [sd_transfer_state] =3D "transfer", + [sd_sendingdata_state] =3D "sendingdata", + [sd_receivingdata_state] =3D "receivingdata", + [sd_programming_state] =3D "programming", + [sd_disconnect_state] =3D "disconnect", + }; + if (state =3D=3D sd_inactive_state) { + return "inactive"; + } + return state_name[state]; +} + static uint8_t sd_get_dat_lines(SDState *sd) { return sd->enable ? sd->dat_lines : 0; @@ -776,6 +796,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, uint32_t rca =3D 0x0000; uint64_t addr =3D (sd->ocr & (1 << 30)) ? (uint64_t) req.arg << 9 : re= q.arg; =20 + trace_sdcard_normal_command(req.cmd, req.arg, sd_state_name(sd->state)= ); + /* Not interpreting this as an app command */ sd->card_status &=3D ~APP_CMD; =20 @@ -790,7 +812,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, sd->multi_blk_cnt =3D 0; } =20 - DPRINTF("CMD%d 0x%08x state %d\n", req.cmd, req.arg, sd->state); switch (req.cmd) { /* Basic commands (Class 0 and Class 1) */ case 0: /* CMD0: GO_IDLE_STATE */ @@ -1310,8 +1331,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, return sd_r1; =20 case 56: /* CMD56: GEN_CMD */ - fprintf(stderr, "SD: GEN_CMD 0x%08x\n", req.arg); - switch (sd->state) { case sd_transfer_state: sd->data_offset =3D 0; @@ -1345,7 +1364,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, static sd_rsp_type_t sd_app_command(SDState *sd, SDRequest req) { - DPRINTF("ACMD%d 0x%08x\n", req.cmd, req.arg); + trace_sdcard_app_command(req.cmd, req.arg); sd->card_status |=3D APP_CMD; switch (req.cmd) { case 6: /* ACMD6: SET_BUS_WIDTH */ @@ -1594,7 +1613,7 @@ send_response: DPRINTF("Response:"); for (i =3D 0; i < rsplen; i++) fprintf(stderr, " %02x", response[i]); - fprintf(stderr, " state %d\n", sd->state); + fputc('\n', stderr); } else { DPRINTF("No response %d\n", sd->state); } @@ -1605,8 +1624,7 @@ send_response: =20 static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) { - DPRINTF("sd_blk_read: addr =3D 0x%08llx, len =3D %d\n", - (unsigned long long) addr, len); + trace_sdcard_read_block(addr, len); if (!sd->blk || blk_pread(sd->blk, addr, sd->data, len) < 0) { fprintf(stderr, "sd_blk_read: read error on host side\n"); } @@ -1614,6 +1632,7 @@ static void sd_blk_read(SDState *sd, uint64_t addr, u= int32_t len) =20 static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) { + trace_sdcard_write_block(addr, len); if (!sd->blk || blk_pwrite(sd->blk, addr, sd->data, len, 0) < 0) { fprintf(stderr, "sd_blk_write: write error on host side\n"); } diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 0f8536db32..75dac5a2cd 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -23,6 +23,12 @@ sdhci_read_dataport(uint16_t data_count) "all %u bytes o= f data have been read fr sdhci_write_dataport(uint16_t data_count) "write buffer filled with %u byt= es of data" sdhci_capareg(const char *desc, uint16_t val) "%s: %u" =20 +# hw/sd/sd.c +sdcard_normal_command(uint8_t cmd, uint32_t arg, const char *state) "CMD%d= arg 0x%08x (state %s)" +sdcard_app_command(uint8_t acmd, uint32_t arg) "ACMD%d arg 0x%08x" +sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x= %x" +sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0= x%x" + # hw/sd/milkymist-memcard.c milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x = value 0x%08x" milkymist_memcard_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x= value 0x%08x" --=20 2.15.1