From nobody Tue Oct 28 12:33:11 2025 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 1515014814628645.8149444150565; Wed, 3 Jan 2018 13:26:54 -0800 (PST) Received: from localhost ([::1]:37619 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqYn-0003H8-JT for importer@patchew.org; Wed, 03 Jan 2018 16:26:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqWv-0001u0-Eh for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWqWu-0007XN-27 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:24:57 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:41732) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWqWt-0007Wq-Sy for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:24:55 -0500 Received: by mail-qk0-x243.google.com with SMTP id a8so3250339qkb.8 for ; Wed, 03 Jan 2018 13:24:55 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a19sm1104402qtj.74.2018.01.03.13.24.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 13:24:54 -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=UYmynfAXMAMnxLSD/cb47+6heKkgM3WT1ccKjQPEJSc=; b=GhrZ/+GZ+Rhc3x1fHNjKVF2kOGBtQbJeHzHvvcV65t49mmSf9nf/kdCTyu0Qi874O7 vmrV73TAExoBO11u+1WYiixknqTFjVFt4uBdmVQ2eU7qm6p2AbpLm6Li7gVcs3jYaGi8 vU7Kk7h+YEcIU6x9MonxYSH40j1w25W+8LyZd0pqYIex1J17x0aIRhC65lhR0xM+Fjpc NL57RMUYsj9MIXftEeR2w0+DQU6F9DtmTlZvoa+7nO83/0/82TEdvLJ4qX2SXFF3BrM9 3VY7CPJy92kELX7nZQJiV6K/z2gLJ23h0pwW3WKbi35NvXBIIGeki1vlYs/NG4K+TT1o EkTg== 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=UYmynfAXMAMnxLSD/cb47+6heKkgM3WT1ccKjQPEJSc=; b=suEwLhD3g5KAAdEgiWZjtGVzrllciYN3fBIJmhc251h3jbIfstRoQgfJcUsb6A2GgW F27CgL7nX1NLNO2AKuxaHeWXRXGyfePwyw+rN7yhzXvEATQ7qH9knQYjwV/MgaW2UrG1 tIlB+Mh11A8W+ghFXpmGRNnt13E1ux+qoitAaPxVWA5G3K8YhHOiS6etBLhyugn9UCNt 2UIPXh1j5ivNAwIU1UIEzW10EQGRiv6rJa61C8uURR7W4DJWJRLNSwgZHcwx7lQKYh28 9Xg/zAUz3EJOpSjPMHBXsPSYD4ulPrGGTXJwqAkVmyJ4HpDNMXsN+99eNFf3NKWFS0N3 jfWw== X-Gm-Message-State: AKGB3mIcM0AloEJQw5fBQ3mhxklEwGKK6YAT7PhGslMV6Ob1FuBSsLlv zzS6m9K7DgzvXCpskiBS6E2A1E/h X-Google-Smtp-Source: ACJfBovzK1+1/laveJ+aJqZfxtcyddBj7Izf/N6P1+M19uMnLe0qQBBeiaciHKLV8x2Bf4RMhbbozA== X-Received: by 10.55.143.131 with SMTP id r125mr3621849qkd.215.1515014695399; Wed, 03 Jan 2018 13:24:55 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko , Andrew Baumann , Olbrich , Andrzej Zaborowski Date: Wed, 3 Jan 2018 18:24:13 -0300 Message-Id: <20180103212436.15762-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103212436.15762-1-f4bug@amsat.org> References: <20180103212436.15762-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:c09::243 Subject: [Qemu-devel] [PATCH v2 02/25] 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, Paul Brook , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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 | 31 +++++++++++++++++++++++++------ hw/sd/trace-events | 6 ++++++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 180c43e218..df2e099151 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -41,6 +41,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 enable; }; =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 void sd_set_mode(SDState *sd) { switch (sd->state) { @@ -752,6 +772,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 @@ -766,7 +788,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 */ @@ -1286,8 +1307,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; @@ -1321,7 +1340,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 */ @@ -1581,8 +1600,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"); } @@ -1590,6 +1608,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 e9f0ea6044..86c1687572 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -15,6 +15,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_led(bool state) "LED: %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